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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c33bac6bc11ec62bb0dd06035958076661a9ba193446ddad9c9299c7fc7c1c87
-  data.tar.gz: f03c579d40424f7b3eeb1d11b2f354e5709148ab71b491702e0c5dd5277893fb
+  metadata.gz: d3a1d7d419c7e13ea95d8cf7b04ffe5183aa1cfce3d48e3027609b061416e640
+  data.tar.gz: 1f33098b03b9cba5294b2894f691d55d26f666185d1d6e9a748345a0fc383080
 SHA512:
-  metadata.gz: f75e6299fa46e44d2ff7c525529495e492346d88c8ae0a9634395d4a623871496487b517710177151e9ae871843506d41be8b57581e67785bdaf9f0efe11cf32
-  data.tar.gz: 9f44c320439d80991c33e86f075fa4012e88c31cec8c66caaeba2486cf03785a272363e7141ab5a1949ee26837bb41e97db1a93e914e99335399879e20344d85
+  metadata.gz: f3dedee60ba29285bc292f263791cd117cff0adff0b092042f6774d321a9eba268431d601ce2cf7d39688c50777c342cde6ab4b20f6ac5603ad7eb3bbe665afa
+  data.tar.gz: 52fe2ac848e6e1d0d5e4677731dcd51db1483d2119966157d7d854ab73f1d2acd676f5412c4bb051ab740d77e9927c3d3e5bbf14bd756dc331853e1a93b13e09

data/Gemfile.lock

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

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

@@ -0,0 +1,47 @@
+# 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)
+          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)
+          end
+
+          merged
+        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)
+          end
+
+          merged
+        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.21'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.20
+  version: 0.1.0.pre.21
 platform: ruby
 authors:
 - InfraBlocks Maintainers
@@ -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