Merge pull request #735 from jrafanie/backward_compatible_rails7_changes

Backward compatible rails 7 changes

db/migrate/20180606155924_move_ansible_container_secrets_into_database.rb

@@ -54,7 +54,7 @@ def update_authentications
     database_auth_find_args = db_args.merge(
       :name     => "Ansible Database Authentication",
       :authtype => "ansible_database_password",
-      :userid   => ApplicationRecord.configurations[Rails.env]["username"],
+      :userid   => ApplicationRecord.configurations.configs_for(:env_name => Rails.env, :name => "primary").configuration_hash["username"],
       :type     => "AuthUseridPassword"
     )
 
@@ -78,7 +78,7 @@ def get_secret_data
       decoded_data["secret-key"],
       decoded_data["rabbit-password"],
       decoded_data["admin-password"],
-      ApplicationRecord.configurations[Rails.env]["password"]
+      ApplicationRecord.configurations.configs_for(:env_name => Rails.env, :name => "primary").configuration_hash["password"]
     ].map { |v| ManageIQ::Password.encrypt(v) }
   rescue OpenURI::HTTPError
     nil

db/migrate/20220111170303_fix_child_container_manager_sti.rb

@@ -46,18 +46,17 @@ def up
         ServiceParametersSet.in_my_region.where(:ext_management_system => managers).update_all(:type => "#{provider_klass}::ServiceParametersSet")
       end
     end
+  end
 
-    def down
-      PROVIDERS.each do |provider|
-        provider_klass = "ManageIQ::Providers::#{provider}::ContainerManager"
-        say_with_time("Resetting STI class for #{provider_klass}") do
-          managers = ExtManagementSystem.in_my_region.where(:type => provider_klass)
-
-          ContainerTemplate.in_my_region.where(:ext_management_system => managers).update_all(:type => nil)
-          ServiceInstance.in_my_region.where(:ext_management_system => managers).update_all(:type => nil)
-          ServiceOffering.in_my_region.where(:ext_management_system => managers).update_all(:type => nil)
-          ServiceParametersSet.in_my_region.where(:ext_management_system => managers).update_all(:type => nil)
-        end
+  def down
+    PROVIDERS.each do |provider|
+      provider_klass = "ManageIQ::Providers::#{provider}::ContainerManager"
+      say_with_time("Resetting STI class for #{provider_klass}") do
+        managers = ExtManagementSystem.in_my_region.where(:type => provider_klass)
+        ContainerTemplate.in_my_region.where(:ext_management_system => managers).update_all(:type => nil)
+        ServiceInstance.in_my_region.where(:ext_management_system => managers).update_all(:type => nil)
+        ServiceOffering.in_my_region.where(:ext_management_system => managers).update_all(:type => nil)
+        ServiceParametersSet.in_my_region.where(:ext_management_system => managers).update_all(:type => nil)
       end
     end
   end

spec/dummy/config/environments/development.rb

@@ -45,14 +45,6 @@
   # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
-  # Suppress logger output for asset requests.
-  config.assets.quiet = true
-
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 

spec/dummy/config/environments/production.rb

@@ -22,12 +22,6 @@
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Compress CSS using a preprocessor.
-  # config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'
 

spec/migrations/20180606155924_move_ansible_container_secrets_into_database_spec.rb

@@ -85,7 +85,7 @@
         expect(database_authentications.count).to eq(4)
         expect(ansible_secret_key).to eq("secretkey")
         expect(ansible_rabbitmq_password).to eq("rabbitpassword")
-        expect(ansible_database_password).to eq(ApplicationRecord.configurations[Rails.env]["password"])
+        expect(ansible_database_password).to eq(ApplicationRecord.configurations.configs_for(:env_name => Rails.env, :name => "primary").configuration_hash["password"])
       end
 
       it "updates authentications with the secret values" do
@@ -105,7 +105,7 @@
         expect(ansible_secret_key).to eq("secretkey")
         expect(ansible_rabbitmq_password).to eq("rabbitpassword")
         expect(ansible_admin_password).to eq("adminpassword")
-        expect(ansible_database_password).to eq(ApplicationRecord.configurations[Rails.env]["password"])
+        expect(ansible_database_password).to eq(ApplicationRecord.configurations.configs_for(:env_name => Rails.env, :name => "primary").configuration_hash["password"])
       end
     end
   end
@@ -161,7 +161,7 @@ def ansible_database_password
     auths = database_authentications.where(
       :name     => "Ansible Database Authentication",
       :authtype => "ansible_database_password",
-      :userid   => ApplicationRecord.configurations[Rails.env]["username"],
+      :userid   => ApplicationRecord.configurations.configs_for(:env_name => Rails.env, :name => "primary").configuration_hash["username"],
       :type     => "AuthUseridPassword"
     )
     expect(auths.count).to eq(1)