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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c33bac6bc11ec62bb0dd06035958076661a9ba193446ddad9c9299c7fc7c1c87
-  data.tar.gz: f03c579d40424f7b3eeb1d11b2f354e5709148ab71b491702e0c5dd5277893fb
+  metadata.gz: 20b9a3c95d0e46b73b0da4b3900f76fc3df5d26a7e7ff2e0301acc6b25cc14f4
+  data.tar.gz: 2de99c52157ff998a66f583100fab8237c60611093224e081a8b481b81361daf
 SHA512:
-  metadata.gz: f75e6299fa46e44d2ff7c525529495e492346d88c8ae0a9634395d4a623871496487b517710177151e9ae871843506d41be8b57581e67785bdaf9f0efe11cf32
-  data.tar.gz: 9f44c320439d80991c33e86f075fa4012e88c31cec8c66caaeba2486cf03785a272363e7141ab5a1949ee26837bb41e97db1a93e914e99335399879e20344d85
+  metadata.gz: 7c184db2e3ec377f97dc944b98332cdaf78f3f01140e01a06cb5af0ba151eb6a8913e734a971582af5ab01d6a55afec75ca186d69e7fea732b2c065a2d6367f3
+  data.tar.gz: 6c46f3220718f37804eed3284eb80757ea0922a1048fc2d179e44efc003026bdd810188f5efcfad0e243b42a675c26399bfa4c065422268f4be0774664020668

data/Gemfile.lock

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

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Configuration
+      class Merger
+        def merge(left, right)
+          merge_top_level(left, right)
+            .merge(merge_accumulating_maps(left, right))
+            .merge(merge_accumulating_lists(left, right))
+        end
+
+        private
+
+        def merge_top_level(left, right)
+          left.merge(right)
+        end
+
+        def merge_accumulating_maps(left, right)
+          %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 == {}
+
+          accumulator.merge(parameter => merged_value)
+        end
+
+        def merge_accumulating_lists(left, right)
+          %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 == []
+
+          accumulator.merge(parameter => merged_value)
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/configuration/providers/identity.rb

@@ -7,7 +7,7 @@ module RSpec
     module Configuration
       module Providers
         class Identity
-          def resolve(overrides)
+          def resolve(overrides = {})
             overrides
           end
         end

data/lib/rspec/terraform/configuration/providers/in_memory.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ruby_terraform'
+require_relative '../merger'
 
 module RSpec
   module Terraform
@@ -11,20 +12,11 @@ module RSpec
 
           def initialize(configuration = {})
             @configuration = configuration
+            @merger = Merger.new
           end
 
           def resolve(overrides = {})
-            left_vars = configuration[:vars] || {}
-            right_vars = overrides[:vars] || {}
-            vars = left_vars.merge(right_vars)
-
-            top_level_merge = configuration.merge(overrides)
-
-            if left_vars == {} && right_vars == {}
-              top_level_merge
-            else
-              top_level_merge.merge(vars: vars)
-            end
+            @merger.merge(configuration, overrides)
           end
         end
       end

data/lib/rspec/terraform/configuration.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'configuration/providers'
+require_relative 'configuration/merger'
 
 module RSpec
   module Terraform

data/lib/rspec/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Terraform
-    VERSION = '0.1.0.pre.20'
+    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.20
+  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
@@ -280,6 +280,7 @@ files:
 - bin/setup
 - lib/rspec/terraform.rb
 - lib/rspec/terraform/configuration.rb
+- lib/rspec/terraform/configuration/merger.rb
 - lib/rspec/terraform/configuration/providers.rb
 - lib/rspec/terraform/configuration/providers/identity.rb
 - lib/rspec/terraform/configuration/providers/in_memory.rb