From 96048b451c4d02e57cc1c7bbc7f70036607852b2 Mon Sep 17 00:00:00 2001 From: Mitchell Henke Date: Fri, 26 Mar 2021 09:00:46 -0500 Subject: [PATCH] simplify pinpoint config --- config/application.yml.default | 10 ++----- config/initializers/telephony.rb | 45 ++++++++------------------------ 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/config/application.yml.default b/config/application.yml.default index 7664c0636e6..2cfce0cb466 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -101,14 +101,8 @@ password_max_attempts: '3' personal_key_retired: 'true' phone_format_e164_opt_out_list: '[]' pii_lock_timeout_in_minutes: '30' -pinpoint_sms_application_id: -pinpoint_sms_credential_role_arn: -pinpoint_sms_longcode_pool: -pinpoint_sms_region: -pinpoint_sms_shortcode: -pinpoint_voice_credential_role_arn: -pinpoint_voice_longcode_pool: -pinpoint_voice_region: +pinpoint_sms_configs: '[]' +pinpoint_voice_configs: '[]' poll_rate_for_verify_in_seconds: '3' proofer_mock_fallback: 'true' proofing_send_partial_dob: 'false' diff --git a/config/initializers/telephony.rb b/config/initializers/telephony.rb index 4d24e7e65b0..c312c37a10e 100644 --- a/config/initializers/telephony.rb +++ b/config/initializers/telephony.rb @@ -7,47 +7,24 @@ Logger.new('log/telephony.log', level: :info) end - if AppConfig.env.pinpoint_sms_configs.present? - JSON.parse(AppConfig.env.pinpoint_sms_configs || '[]').each do |sms_json_config| - c.pinpoint.add_sms_config do |sms| - sms.application_id = sms_json_config['application_id'] - sms.region = sms_json_config['region'] - sms.shortcode = sms_json_config['shortcode'] - sms.credential_role_arn = sms_json_config['credential_role_arn'] - if sms_json_config['credential_role_arn'].present? - sms.credential_role_session_name = Socket.gethostname - end - end - end - else + JSON.parse(AppConfig.env.pinpoint_sms_configs).each do |sms_json_config| c.pinpoint.add_sms_config do |sms| - sms.region = AppConfig.env.pinpoint_sms_region - sms.application_id = AppConfig.env.pinpoint_sms_application_id - sms.shortcode = AppConfig.env.pinpoint_sms_shortcode - sms.credential_role_arn = AppConfig.env.pinpoint_sms_credential_role_arn - if AppConfig.env.pinpoint_sms_credential_role_arn.present? + sms.application_id = sms_json_config['application_id'] + sms.region = sms_json_config['region'] + sms.shortcode = sms_json_config['shortcode'] + sms.credential_role_arn = sms_json_config['credential_role_arn'] + if sms_json_config['credential_role_arn'].present? sms.credential_role_session_name = Socket.gethostname end end end - if AppConfig.env.pinpoint_voice_configs.present? - JSON.parse(AppConfig.env.pinpoint_voice_configs || '[]').each do |voice_json_config| - c.pinpoint.add_voice_config do |voice| - voice.region = voice_json_config['region'] - voice.longcode_pool = voice_json_config['longcode_pool'] || [] - voice.credential_role_arn = voice_json_config['credential_role_arn'] - if voice_json_config['credential_role_arn'].present? - voice.credential_role_session_name = Socket.gethostname - end - end - end - else + JSON.parse(AppConfig.env.pinpoint_voice_configs).each do |voice_json_config| c.pinpoint.add_voice_config do |voice| - voice.region = AppConfig.env.pinpoint_voice_region - voice.longcode_pool = JSON.parse(AppConfig.env.pinpoint_voice_longcode_pool || '[]') - voice.credential_role_arn = AppConfig.env.pinpoint_voice_credential_role_arn - if AppConfig.env.pinpoint_voice_credential_role_arn.present? + voice.region = voice_json_config['region'] + voice.longcode_pool = voice_json_config['longcode_pool'] || [] + voice.credential_role_arn = voice_json_config['credential_role_arn'] + if voice_json_config['credential_role_arn'].present? voice.credential_role_session_name = Socket.gethostname end end