Merge pull request #19418 from jrafanie/update_config_gem

Update to config gem 2.0.0
ManageIQ · Oct 22, 2019 · ab9b93b · ab9b93b
2 parents 1bedf26 + 2711b70
commit ab9b93b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -33,7 +33,7 @@ gem "bcrypt",                         "~> 3.1.10",     :require => false
 gem "bundler",                        ">=1.15",        :require => false
 gem "byebug",                                          :require => false
 gem "color",                          "~>1.8"
-gem "config",                         "~>1.6.0",       :require => false
+gem "config",                         "~>2.0",         :require => false
 gem "dalli",                          "=2.7.6",        :require => false
 gem "default_value_for",              "~>3.3"
 gem "docker-api",                     "~>1.33.6",      :require => false

diff --git a/lib/vmdb/settings.rb b/lib/vmdb/settings.rb
@@ -29,6 +29,7 @@ def initialize(errors)
 
     def self.init
       ::Config.overwrite_arrays = true
+      ::Config.merge_nil_values = false
       reset_settings_constant(for_resource(:my_server))
       on_reload
     end
@@ -182,8 +183,9 @@ def self.local_sources
     # sources and doesn't allow you insert new sources into the middle of the
     # stack.
     def self.reset_settings_constant(settings)
-      Kernel.send(:remove_const, ::Config.const_name) if Kernel.const_defined?(::Config.const_name)
-      Kernel.const_set(::Config.const_name, settings)
+      name = ::Config.const_name
+      Object.send(:remove_const, name) if Object.const_defined?(name)
+      Object.const_set(name, settings)
     end
     private_class_method :reset_settings_constant