From 1a24f7f4f37d98a566212d2b157067534e1a024a Mon Sep 17 00:00:00 2001 From: stevenjcumming <134282106+stevenjcumming@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:22:28 -0500 Subject: [PATCH] Remove Unused Settings - Part 1 (#19096) * remove unused settings * remove unused settings --- config/settings.yml | 21 ------------------- config/settings/test.yml | 9 -------- lib/gibft/configuration.rb | 1 + lib/gibft/service.rb | 1 + ...r_level_review_upload_status_batch_spec.rb | 8 +++---- ...level_review_upload_status_updater_spec.rb | 20 +++++++----------- ...disagreement_upload_status_updater_spec.rb | 8 +++---- ...mental_claim_upload_status_updater_spec.rb | 8 +++---- 8 files changed, 19 insertions(+), 57 deletions(-) diff --git a/config/settings.yml b/config/settings.yml index 1d10b044f01..07baf2c7ab6 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -86,12 +86,10 @@ sign_in: terms_of_use: current_version: v1 - provisioner_cookie_domain: localhost enabled_clients: vaweb, mhv, myvahealth lockbox: master_key: "0d78eaf0e90d4e7b8910c9112e16e66d8b00ec4054a89aa426e32712a13371e9" - previous_master_key: "a798f118b400a1a7552597cc94f44c577919c76b3d26c1eed8ae0703f4240216" binaries: # you can specify a full path in settings.local.yml if necessary @@ -106,8 +104,6 @@ clamav: host: 'clamav' port: '3310' -db_encryption_key: f01ff8ebd1a2b053ad697ae1f0d86adb - database_url: postgis:///vets-api test_database_url: postgis:///vets-api-test @@ -159,11 +155,7 @@ salesforce-gibft: url: "https://va--rdtcddev.cs33.my.salesforce.com/" salesforce-carma: - mock: true url: "https://fake-carma.salesforce.com" - consumer_key: 12345ABC.QQ_1234BBfake - signing_key_path: "spec/fixtures/carma/privatekey.pem" # A dummy private key used for test suite - username: fake-user@va.gov.carmafake salesforce: env: dev @@ -171,7 +163,6 @@ salesforce: form_10_10cg: carma: mulesoft: - mock: false host: ~ client_id: ~ client_secret: ~ @@ -386,8 +377,6 @@ modules_appeals_api: enabled: false weekly_decision_review: enabled: false - daily_error: - enabled: false weekly_error: enabled: false schema_dir: config/schemas @@ -647,12 +636,6 @@ claims_api: content_type: 'application/vnd.api+json' report_enabled: false audit_enabled: false - s3: - enabled: false - aws_access_key_id: ~ - aws_secret_access_key: ~ - region: ~ - bucket: ~ disability_claims_mock_override: false schema_dir: config/schemas slack: @@ -834,7 +817,6 @@ iam_ssoe: client_id: "Mobile_App_API_Server_LOWERS" # oauth (rest) and sts (soap) services are on different hosts oauth_url: "https://int.fed.eauth.va.gov:444" - sts_url: "https://preprod.services.eauth.va.gov:9301" timeout: 20 statsd: @@ -1637,9 +1619,6 @@ rrd: alerts: recipients: - fake_email - event_tracking: - recipients: - - fake_email mas_tracking: recipients: - fake_email diff --git a/config/settings/test.yml b/config/settings/test.yml index 7b8a608b71f..8e76495d6df 100644 --- a/config/settings/test.yml +++ b/config/settings/test.yml @@ -8,9 +8,6 @@ mvi: url: http://www.example.com/ mock: false -locators: - providers_enabled: true - reports: aws: access_key_id: key @@ -277,9 +274,6 @@ rrd: alerts: recipients: - fake_email - event_tracking: - recipients: - - fake_email sidekiq: github_organization: "organization" @@ -371,7 +365,6 @@ lgy: form_10_10cg: carma: mulesoft: - mock: true host: "https://fake-mulesoft.vapi.va.gov" client_id: BEEFCAFE1234 client_secret: C0FFEEFACE4321 @@ -391,7 +384,6 @@ vha: mhv: medical_records: - app_id: 0 app_token: xyz host: http://example.org @@ -401,7 +393,6 @@ evss: claims_api: evss_container: - auth_base_name: staging-api.va.gov client_key: fakekeyvaluehere pdf_generator_526: url: 'https://fake_pdf_url.com' diff --git a/lib/gibft/configuration.rb b/lib/gibft/configuration.rb index 9cbf6f9c033..20c575c4ad6 100644 --- a/lib/gibft/configuration.rb +++ b/lib/gibft/configuration.rb @@ -4,6 +4,7 @@ module Gibft class Configuration < Salesforce::Configuration + # Settings.salesforce-gibft SALESFORCE_INSTANCE_URL = Settings['salesforce-gibft'].url def service_name diff --git a/lib/gibft/service.rb b/lib/gibft/service.rb index c1ddfdeb225..3e6b8cc177a 100644 --- a/lib/gibft/service.rb +++ b/lib/gibft/service.rb @@ -7,6 +7,7 @@ module Gibft class Service < Salesforce::Service configuration Gibft::Configuration + # Settings.salesforce-gibft CONSUMER_KEY = Settings['salesforce-gibft'].consumer_key SIGNING_KEY_PATH = Settings['salesforce-gibft'].signing_key_path SALESFORCE_USERNAMES = { diff --git a/modules/appeals_api/spec/sidekiq/higher_level_review_upload_status_batch_spec.rb b/modules/appeals_api/spec/sidekiq/higher_level_review_upload_status_batch_spec.rb index 3a63e11b9c1..56e7b99f052 100644 --- a/modules/appeals_api/spec/sidekiq/higher_level_review_upload_status_batch_spec.rb +++ b/modules/appeals_api/spec/sidekiq/higher_level_review_upload_status_batch_spec.rb @@ -35,11 +35,9 @@ let(:upload) { create(:higher_level_review_v1, status: 'received') } it 'ignores them' do - with_settings(Settings.modules_appeals_api, higher_level_review_updater_enabled: true) do - Sidekiq::Testing.inline! { AppealsApi::HigherLevelReviewUploadStatusBatch.new.perform } - upload.reload - expect(upload.status).to eq('received') - end + Sidekiq::Testing.inline! { AppealsApi::HigherLevelReviewUploadStatusBatch.new.perform } + upload.reload + expect(upload.status).to eq('received') end end diff --git a/modules/appeals_api/spec/sidekiq/higher_level_review_upload_status_updater_spec.rb b/modules/appeals_api/spec/sidekiq/higher_level_review_upload_status_updater_spec.rb index ccd7f21ae2d..505a1d2cdb9 100644 --- a/modules/appeals_api/spec/sidekiq/higher_level_review_upload_status_updater_spec.rb +++ b/modules/appeals_api/spec/sidekiq/higher_level_review_upload_status_updater_spec.rb @@ -28,11 +28,9 @@ in_process_element[0]['uuid'] = upload.id expect(faraday_response).to receive(:body).at_least(:once).and_return([in_process_element].to_json) - with_settings(Settings.modules_appeals_api, higher_level_review_updater_enabled: true) do - AppealsApi::HigherLevelReviewUploadStatusUpdater.new.perform([upload]) - upload.reload - expect(upload.status).to eq('processing') - end + AppealsApi::HigherLevelReviewUploadStatusUpdater.new.perform([upload]) + upload.reload + expect(upload.status).to eq('processing') end it 'notifies sentry & slack of individual bad records without affecting good records' do @@ -51,13 +49,11 @@ expect_any_instance_of(AppealsApi::CentralMailUpdater).to receive(:log_exception_to_sentry).once expect_any_instance_of(AppealsApi::Slack::Messager).to receive(:notify!).once - with_settings(Settings.modules_appeals_api, higher_level_review_updater_enabled: true) do - AppealsApi::HigherLevelReviewUploadStatusUpdater.new.perform([bad_upload, upload]) - upload.reload - bad_upload.reload - expect(upload.status).to eq('processing') - expect(bad_upload.status).to eq('submitting') - end + AppealsApi::HigherLevelReviewUploadStatusUpdater.new.perform([bad_upload, upload]) + upload.reload + bad_upload.reload + expect(upload.status).to eq('processing') + expect(bad_upload.status).to eq('submitting') end end end diff --git a/modules/appeals_api/spec/sidekiq/notice_of_disagreement_upload_status_updater_spec.rb b/modules/appeals_api/spec/sidekiq/notice_of_disagreement_upload_status_updater_spec.rb index b88a4f447f4..d0a23911dac 100644 --- a/modules/appeals_api/spec/sidekiq/notice_of_disagreement_upload_status_updater_spec.rb +++ b/modules/appeals_api/spec/sidekiq/notice_of_disagreement_upload_status_updater_spec.rb @@ -24,11 +24,9 @@ in_process_element[0]['uuid'] = upload.id expect(faraday_response).to receive(:body).at_least(:once).and_return([in_process_element].to_json) - with_settings(Settings.modules_appeals_api, notice_of_disagreement_updater_enabled: true) do - AppealsApi::NoticeOfDisagreementUploadStatusUpdater.new.perform([upload]) - upload.reload - expect(upload.status).to eq('processing') - end + AppealsApi::NoticeOfDisagreementUploadStatusUpdater.new.perform([upload]) + upload.reload + expect(upload.status).to eq('processing') end end end diff --git a/modules/appeals_api/spec/sidekiq/supplemental_claim_upload_status_updater_spec.rb b/modules/appeals_api/spec/sidekiq/supplemental_claim_upload_status_updater_spec.rb index 6ea97d6e7bd..121a745185d 100644 --- a/modules/appeals_api/spec/sidekiq/supplemental_claim_upload_status_updater_spec.rb +++ b/modules/appeals_api/spec/sidekiq/supplemental_claim_upload_status_updater_spec.rb @@ -24,11 +24,9 @@ in_process_element[0]['uuid'] = upload.id expect(faraday_response).to receive(:body).at_least(:once).and_return([in_process_element].to_json) - with_settings(Settings.modules_appeals_api, supplemental_claim_updater_enabled: true) do - AppealsApi::SupplementalClaimUploadStatusUpdater.new.perform([upload]) - upload.reload - expect(upload.status).to eq('processing') - end + AppealsApi::SupplementalClaimUploadStatusUpdater.new.perform([upload]) + upload.reload + expect(upload.status).to eq('processing') end end end