Explicitly call DeepMerge.deep_merge! instead of the Hash method

Fixes #26
simp · Dec 27, 2024 · 5c3a3cd · 5c3a3cd
1 parent 1f1134e
commit 5c3a3cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/compliance_engine/component.rb b/lib/compliance_engine/component.rb
@@ -243,7 +243,7 @@ def element
     @element = {}
 
     fragments.each_value do |fragment|
-      @element = @element.deep_merge!(fragment)
+      @element = DeepMerge.deep_merge!(fragment, @element)
     end
 
     @element

diff --git a/lib/compliance_engine/data.rb b/lib/compliance_engine/data.rb
@@ -268,7 +268,7 @@ def confines
       collection.each_value do |v|
         v.to_a.each do |component|
           next unless component.key?('confine')
-          @confines = @confines.deep_merge!(component['confine'])
+          @confines = DeepMerge.deep_merge!(component['confine'], @confines)
         end
       end
     end
@@ -310,7 +310,7 @@ def hiera(requested_profiles = [])
 
     valid_profiles.reverse_each do |profile|
       check_mapping(profile).each_value do |check|
-        parameters = parameters.deep_merge!(check.hiera)
+        parameters = DeepMerge.deep_merge!(check.hiera, parameters)
       end
     end