diff --git a/app/models/pager_tree/integrations/elast_alert/v3.rb b/app/models/pager_tree/integrations/elast_alert/v3.rb index 36ff156..44725af 100644 --- a/app/models/pager_tree/integrations/elast_alert/v3.rb +++ b/app/models/pager_tree/integrations/elast_alert/v3.rb @@ -45,24 +45,24 @@ def adapter_process_create # elastalert will raise an error for any 4xx or 5xx response and then retry for a default of 2 days # https://github.com/Yelp/elastalert/blob/master/elastalert/alerts.py#L1496 # we don't want to get spammy with retries, so we'll just return a 200 - def adapter_response_rate_limit - adapter_controller&.head(:ok) + def adapter_response_rate_limit_code + :ok end - def adapter_response_disabled - adapter_controller&.head(:ok) + def adapter_response_disabled_code + :ok end - def adapter_response_inactive_subscription - adapter_controller&.head(:ok) + def adapter_response_inactive_subscription_code + :ok end - def adapter_response_upgrade - adapter_controller&.head(:ok) + def adapter_response_upgrade_code + :ok end - def adapter_response_blocked - adapter_controller&.head(:ok) + def adapter_response_blocked_code + :ok end private diff --git a/app/models/pager_tree/integrations/form/v3.rb b/app/models/pager_tree/integrations/form/v3.rb index 3b9e419..0b5c26a 100644 --- a/app/models/pager_tree/integrations/form/v3.rb +++ b/app/models/pager_tree/integrations/form/v3.rb @@ -50,15 +50,27 @@ def adapter_supports_cnames? end def adapter_response_inactive_subscription - adapter_controller&.render(status: :payment_required, json: {code: Rack::Utils.status_code(:payment_required), errors: ["Customer must subscribe service plan to use this integration"]}) + adapter_controller&.render(status: adapter_response_inactive_subscription_code, json: {code: Rack::Utils.status_code(adapter_response_inactive_subscription_code), errors: ["Customer must subscribe service plan to use this integration"]}) + end + + def adapter_response_inactive_subscription_code + :payment_required end def adapter_response_upgrade - adapter_controller&.render(status: :payment_required, json: {code: Rack::Utils.status_code(:payment_required), errors: ["Customer must upgrade service plan to use this integration"]}) + adapter_controller&.render(status: adapter_response_upgrade_code, json: {code: Rack::Utils.status_code(adapter_response_upgrade_code), errors: ["Customer must upgrade service plan to use this integration"]}) + end + + def adapter_response_upgrade_code + :payment_required end def adapter_response_maintenance_mode - adapter_controller&.render(status: :service_unavailable, json: {code: Rack::Utils.status_code(:service_unavailable), errors: ["Integration currently in maintenance mode"]}) + adapter_controller&.render(status: adapter_response_maintenance_mode_code, json: {code: Rack::Utils.status_code(adapter_response_maintenance_mode_code), errors: ["Integration currently in maintenance mode"]}) + end + + def adapter_response_maintenance_mode_code + :service_unavailable end def adapter_thirdparty_id diff --git a/app/models/pager_tree/integrations/integration.rb b/app/models/pager_tree/integrations/integration.rb index 8702f90..6c80a2e 100644 --- a/app/models/pager_tree/integrations/integration.rb +++ b/app/models/pager_tree/integrations/integration.rb @@ -117,35 +117,67 @@ def adapter_show_outgoing_webhook_delivery? # END basic show functions def adapter_response_rate_limit - adapter_controller&.head(:too_many_requests) + adapter_controller&.head(adapter_response_rate_limit_code) + end + + def adapter_response_rate_limit_code + :too_many_requests end def adapter_response_disabled - adapter_controller&.head(:method_not_allowed) + adapter_controller&.head(adapter_response_disabled_code) + end + + def adapter_response_disabled_code + :method_not_allowed end def adapter_response_inactive_subscription - adapter_controller&.head(:payment_required) + adapter_controller&.head(adapter_response_inactive_subscription_code) + end + + def adapter_response_inactive_subscription_code + :payment_required end def adapter_response_upgrade - adapter_controller&.head(:payment_required) + adapter_controller&.head(adapter_response_upgrade_code) + end + + def adapter_response_upgrade_code + :payment_required end def adapter_response_maintenance_mode - adapter_controller&.head(:ok) + adapter_controller&.head(adapter_response_maintenance_mode_code) + end + + def adapter_response_maintenance_mode_code + :ok end def adapter_response_blocked - adapter_controller&.head(:forbidden) + adapter_controller&.head(adapter_response_blocked_code) + end + + def adapter_response_blocked_code + :forbidden end def adapter_response_deferred - adapter_controller&.head(:ok) + adapter_controller&.head(adapter_response_deferred_code) + end + + def adapter_response_deferred_code + :ok end def adapter_response_incoming - adapter_controller&.head(:ok) + adapter_controller&.head(adapter_response_incoming_code) + end + + def adapter_response_incoming_code + :ok end def cast_types