Merge pull request #12523 from chef/lcg/fix-inspec-waivers

Fix inspec waivers in compliance mode
chef · Jan 28, 2022 · 15daf49 · 15daf49
2 parents 5053bf4 + 3745ecc
commit 15daf49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/chef/compliance/input_collection.rb b/lib/chef/compliance/input_collection.rb
@@ -57,7 +57,7 @@ def from_hash(hash)
       # @return [Array<Input>] inspec inputs which are enabled in a form suitable to pass to inspec
       #
       def inspec_data
-        select(&:enabled?).each_with_object({}) { |input, hash| hash.merge(input.inspec_data) }
+        select(&:enabled?).each_with_object({}) { |input, hash| hash.merge!(input.inspec_data) }
       end
 
       # DSL method to enable input files.  This matches on the filename of the input file.

diff --git a/lib/chef/compliance/waiver_collection.rb b/lib/chef/compliance/waiver_collection.rb
@@ -57,7 +57,7 @@ def from_hash(hash)
       # @return [Array<Waiver>] inspec waivers which are enabled in a form suitable to pass to inspec
       #
       def inspec_data
-        select(&:enabled?).each_with_object({}) { |waiver, hash| hash.merge(waiver.inspec_data) }
+        select(&:enabled?).each_with_object({}) { |waiver, hash| hash.merge!(waiver.inspec_data) }
       end
 
       # DSL method to enable waiver files.  This matches on the filename of the waiver file.