Revert "Single Config File - Settings - Attempt 2 (#21039)" (#21040)

This reverts commit b296d24.

Author: stevenjcumming

.github/CODEOWNERS

@@ -746,6 +746,7 @@ config/health_care_application @department-of-veterans-affairs/vfs-10-10 @depart
 config/imagemagick/policies/new-policy.xml @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 config/initializers/01_redis.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 config/initializers/aal.rb @department-of-veterans-affairs/octo-identity
+config/initializers/add_local_config.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 config/initializers/app_info.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 config/initializers/application_controller_renderer.rb @department-of-veterans-affairs/octo-identity
 config/initializers/authn_context.rb @department-of-veterans-affairs/octo-identity
@@ -806,6 +807,7 @@ config/routes.rb @department-of-veterans-affairs/va-api-engineers @department-of
 config/settings @department-of-veterans-affairs/backend-review-group
 config/settings/development.yml @department-of-veterans-affairs/backend-review-group
 config/settings.local.yml.example @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
+config/settings/production.yml @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers
 config/settings/test.yml @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers
 config/settings.yml @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers
 config/sidekiq.yml @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
@@ -1089,7 +1091,6 @@ postman/Dockerfile @department-of-veterans-affairs/backend-review-group
 public @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 rakelib @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 rakelib/breakers_outage.rake @department-of-veterans-affairs/backend-review-group
-rakelib/config_settings.rake @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 rakelib/connectivity.rake @department-of-veterans-affairs/octo-identity
 rakelib/decision_review_repl.rb @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 rakelib/education_benefits_submission.rake @department-of-veterans-affairs/my-education-benefits @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group

.github/workflows/settings_checks.yml

@@ -134,18 +134,5 @@ class Application < Rails::Application
     # These files do not contain auto-loaded ruby classes,
     #   they are loaded through app/sidekiq/education_form/forms/base.rb
     Rails.autoloaders.main.ignore(Rails.root.join('app', 'sidekiq', 'education_form', 'templates', '1990-disclosure'))
-
-    # ENVs from Parent Helm Chart are all lowercase.
-    # To keep with the convention, they should all
-    # be upcased in order to not disrupt other ENVs.
-    # This code adds an upcased version
-    # ENV['example'] => ENV['EXAMPLE]
-    ENV.each_key do |key|
-      next unless key == key.downcase
-
-      # WARNING: changing this will cause all deployed
-      # settings with ENVs to be nil.
-      ENV[key.upcase] = ENV.fetch(key)
-    end
   end
 end

config/application.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+vsp_environment = ENV.fetch('VSP_ENVIRONMENT', nil)
+
+if vsp_environment
+  source = Rails.root.join("config/settings/#{vsp_environment}.local.yml").to_s
+  Settings.prepend_source!(source)
+  Settings.reload!
+end

config/initializers/add_local_config.rb

@@ -37,5 +37,5 @@
 
   # Whether nil values will overwrite an existing value when merging configs. Default: true
   #
-  config.merge_nil_values = true
+  config.merge_nil_values = false
 end