rspec-terraform 0.1.0.pre.22 → 0.1.0.pre.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e28c4be63e7af5fe059859b2c2de2699f700ad3d163e56981c02a2fd946d477
-  data.tar.gz: 45f56162be84a621752fc33868c350eaefd1c2b198d8bbe46f516af2f6d4dca4
+  metadata.gz: 20b9a3c95d0e46b73b0da4b3900f76fc3df5d26a7e7ff2e0301acc6b25cc14f4
+  data.tar.gz: 2de99c52157ff998a66f583100fab8237c60611093224e081a8b481b81361daf
 SHA512:
-  metadata.gz: 4ad8bfda440da3162a37740551ad3bf1fb8567700709893a349327e5a7145b106a179004cc5c8d47ed40641f1f2ed650f1e410b6cf379d5ebb37a7914c53f7de
-  data.tar.gz: 533d8a62d6784ce2451354590333aecc60343449e2feb0f4a1634384dda203de7ddc668080b4169cdc422f92a793b4ac8897dcbb4a73217bc4b4ed80c6869921
+  metadata.gz: 7c184db2e3ec377f97dc944b98332cdaf78f3f01140e01a06cb5af0ba151eb6a8913e734a971582af5ab01d6a55afec75ca186d69e7fea732b2c065a2d6367f3
+  data.tar.gz: 6c46f3220718f37804eed3284eb80757ea0922a1048fc2d179e44efc003026bdd810188f5efcfad0e243b42a675c26399bfa4c065422268f4be0774664020668

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.22)
+    rspec-terraform (0.1.0.pre.23)
       rspec (>= 3.0)
       ruby-terraform (= 1.7.0.pre.13)
 

data/lib/rspec/terraform/configuration/merger.rb

@@ -17,29 +17,36 @@ module RSpec
         end
 
         def merge_accumulating_maps(left, right)
-          left_vars = left[:vars] || {}
-          right_vars = right[:vars] || {}
-          vars = left_vars.merge(right_vars)
-
-          merged = {}
-          unless left_vars == {} && right_vars == {}
-            merged = merged.merge(vars: vars)
+          %i[vars backend_config].inject({}) do |merged, parameter|
+            merge_accumulating_map(parameter, merged, left, right)
           end
+        end
+
+        def merge_accumulating_map(parameter, accumulator, left, right)
+          left_value = left[parameter] || {}
+          right_value = right[parameter] || {}
+          merged_value = left_value.merge(right_value)
+
+          return accumulator if merged_value == {}
 
-          merged
+          accumulator.merge(parameter => merged_value)
         end
 
         def merge_accumulating_lists(left, right)
-          left_var_files = left[:var_files] || []
-          right_var_files = right[:var_files] || []
-          var_files = left_var_files + right_var_files
-
-          merged = {}
-          unless left_var_files == [] && right_var_files == []
-            merged = merged.merge(var_files: var_files)
+          %i[var_files targets replaces plugin_dirs platforms]
+            .inject({}) do |merged, parameter|
+            merge_accumulating_list(parameter, merged, left, right)
           end
+        end
+
+        def merge_accumulating_list(parameter, accumulator, left, right)
+          left_value = left[parameter] || []
+          right_value = right[parameter] || []
+          merged_value = left_value + right_value
+
+          return accumulator if merged_value == []
 
-          merged
+          accumulator.merge(parameter => merged_value)
         end
       end
     end

data/lib/rspec/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Terraform
-    VERSION = '0.1.0.pre.22'
+    VERSION = '0.1.0.pre.23'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.22
+  version: 0.1.0.pre.23
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec