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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3a1d7d419c7e13ea95d8cf7b04ffe5183aa1cfce3d48e3027609b061416e640
-  data.tar.gz: 1f33098b03b9cba5294b2894f691d55d26f666185d1d6e9a748345a0fc383080
+  metadata.gz: 0d7a8abc81671eea02a2fd4f6d3b4f8a3060eca51d50c70ebb76c3b0c064b027
+  data.tar.gz: c423cb560f674bc848cea3fcfdd57ef21e41742bc2a86e0db74755ec0c86c8d4
 SHA512:
-  metadata.gz: f3dedee60ba29285bc292f263791cd117cff0adff0b092042f6774d321a9eba268431d601ce2cf7d39688c50777c342cde6ab4b20f6ac5603ad7eb3bbe665afa
-  data.tar.gz: 52fe2ac848e6e1d0d5e4677731dcd51db1483d2119966157d7d854ab73f1d2acd676f5412c4bb051ab740d77e9927c3d3e5bbf14bd756dc331853e1a93b13e09
+  metadata.gz: 9623a90a33ba6cd9f7948e3856c3954ef822a9eb94bdd48d44126b467985071e4a27654c1d8848168586a9ead4668d6e407e656163c5b1330500eb48e04c1eec
+  data.tar.gz: 0f4766cda2dd7a4fe0335094e155f5731d215b25dde91d135777546839859a82377833485ef0b8459dd32a77b9cf705d3934fa14bd3d2b330273d4895d944782

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.21)
+    rspec-terraform (0.1.0.pre.24)
       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/configuration/var_captor.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Configuration
+      class VarCaptor
+        def initialize(vars)
+          @vars = vars
+        end
+
+        def method_missing(method, *args, &_)
+          if method.to_s =~ /.*=$/
+            set_var(method.to_s.chop.to_sym, args[0])
+          else
+            read_var(method)
+          end
+        end
+
+        def respond_to_missing?
+          true
+        end
+
+        def to_h
+          @vars
+        end
+
+        private
+
+        def set_var(var, value)
+          @vars[var] = value
+        end
+
+        def read_var(var)
+          @vars[var]
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/configuration.rb

@@ -2,6 +2,7 @@
 
 require_relative 'configuration/providers'
 require_relative 'configuration/merger'
+require_relative 'configuration/var_captor'
 
 module RSpec
   module Terraform

data/lib/rspec/terraform/helpers/apply.rb

@@ -2,6 +2,8 @@
 
 require 'ruby_terraform'
 
+require_relative '../configuration/var_captor'
+
 module RSpec
   module Terraform
     module Helpers
@@ -14,20 +16,55 @@ module RSpec
             configuration_provider || Configuration.identity_provider
         end
 
-        def execute
-          parameters = configuration_provider.resolve(overrides)
-          parameters = parameters.merge(
+        def execute(&block)
+          parameters = with_configuration_provider_parameters(overrides)
+          parameters = with_resolved_vars(parameters, &block)
+          parameters = with_mandatory_parameters(parameters)
+
+          ensure_required_parameters(parameters)
+
+          init(parameters)
+          apply(parameters)
+        end
+
+        private
+
+        def with_configuration_provider_parameters(parameters)
+          configuration_provider.resolve(parameters)
+        end
+
+        def with_resolved_vars(parameters, &block)
+          return parameters unless block_given?
+
+          var_captor = Configuration::VarCaptor.new(parameters[:vars] || {})
+          block.call(var_captor)
+          parameters.merge(vars: var_captor.to_h)
+        end
+
+        def with_mandatory_parameters(parameters)
+          parameters.merge(
             input: false,
             auto_approve: true
           )
+        end
 
-          do_apply(parameters)
+        def ensure_required_parameters(parameters)
+          return if parameters[:configuration_directory]
+
+          throw StandardError.new(
+            'No Terraform configuration directory specified.'
+          )
         end
 
-        private
+        def init(parameters)
+          init_command.execute(
+            chdir: parameters[:configuration_directory],
+            input: parameters[:input]
+          )
+        end
 
-        def do_apply(parameters)
-          RubyTerraform.apply(
+        def apply(parameters)
+          apply_command.execute(
             chdir: parameters[:configuration_directory],
             state: parameters[:state_file],
             vars: parameters[:vars],
@@ -35,6 +72,18 @@ module RSpec
             auto_approve: parameters[:auto_approve]
           )
         end
+
+        def init_command
+          RubyTerraform::Commands::Init.new(
+            binary: RSpec.configuration.terraform_binary
+          )
+        end
+
+        def apply_command
+          RubyTerraform::Commands::Apply.new(
+            binary: RSpec.configuration.terraform_binary
+          )
+        end
       end
     end
   end

data/lib/rspec/terraform/version.rb

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

data/lib/rspec/terraform.rb

@@ -10,4 +10,7 @@ require_relative 'terraform/helpers'
 
 RSpec.configure do |config|
   config.include(RSpec::Terraform::Matchers)
+
+  config.add_setting(:terraform_binary, default: 'terraform')
+  config.add_setting(:terraform_execution_mode, default: :in_place)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.21
+  version: 0.1.0.pre.24
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -284,6 +284,7 @@ files:
 - lib/rspec/terraform/configuration/providers.rb
 - lib/rspec/terraform/configuration/providers/identity.rb
 - lib/rspec/terraform/configuration/providers/in_memory.rb
+- lib/rspec/terraform/configuration/var_captor.rb
 - lib/rspec/terraform/helpers.rb
 - lib/rspec/terraform/helpers/apply.rb
 - lib/rspec/terraform/matchers.rb