rspec-terraform 0.1.0.pre.45 → 0.1.0.pre.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e1e41e777f174198e1de6459ef21f280d11227fd2a0b97e0d6604458b48e34
-  data.tar.gz: 071164c5440ab7b9a094c0125c7d562acb40d235485baac554dfd6e14bbc55fb
+  metadata.gz: 81533be8b2db5deed030c7d321cf443d1703b7c8e71d7379c70463fab9a9d3f6
+  data.tar.gz: 77b1e6c0b70fc4fd4a258f0a3d6db4c8aa1e404e6059c2eed81ef0163b59509e
 SHA512:
-  metadata.gz: d8f45a75288ba61061d435320509688ac960e4be4b1842b62d4a4c87cc6e5a75af656f6b6fad60b39fbe24f12060cc8d9d1bec4038616efb2d7dea02649caba9
-  data.tar.gz: d2e42b5ca9bbfbcb59842e656e9d2816fb838c8bed600aaeaeb008f6601dd64755fa8ac33c27b79cc38c84efc2c8f99b612b25498c98f0292c0fb115433e9e4d
+  metadata.gz: c53f5bfe578e18b842e0d509c582fca0c06cb106c10d8fcde12c20361fd2c53b546e3b62dd60109af3bbcb71116c39d4ffcac29703cfa6399b3187da26ab5b58
+  data.tar.gz: 294f50f7e73613ade97534b6706d5df40c6194d50746509826c92f7692484f7cab267e34741257bada91fb1ff92e5e3b5fc7699a506cd6c1870d200f6ba719fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.45)
+    rspec-terraform (0.1.0.pre.47)
       confidante (>= 0.27)
       rspec (>= 3.0)
       ruby-terraform (= 1.7.0.pre.17)
@@ -145,7 +145,7 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.13.1)
+    rubocop-rspec (2.13.2)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     ruby-terraform (1.7.0.pre.17)
@@ -178,7 +178,7 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   arm64-darwin-21

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'ruby_terraform'
+
+require_relative './command_instantiation'
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Apply
+          include CommandInstantiation
+
+          def apply(parameters)
+            apply_command.execute(apply_parameters(parameters))
+          end
+
+          private
+
+          def apply_command
+            instantiate_command(RubyTerraform::Commands::Apply)
+          end
+
+          def apply_parameters(parameters)
+            with_apply_state_file_parameters(
+              with_apply_standard_parameters(parameters)
+            )
+          end
+
+          def with_apply_standard_parameters(parameters)
+            parameters.merge(
+              chdir: parameters[:configuration_directory],
+              input: false,
+              auto_approve: true
+            )
+          end
+
+          def with_apply_state_file_parameters(parameters)
+            if parameters[:state_file]
+              return parameters.merge(state: parameters[:state_file])
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/clean.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Clean
+          def clean(parameters)
+            return unless execution_mode == :isolated
+
+            FileUtils.rm_rf(parameters[:configuration_directory])
+            FileUtils.mkdir_p(parameters[:configuration_directory])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/command_instantiation.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module CommandInstantiation
+          def instantiate_command(klass, opts = {})
+            klass.new(command_options.merge(opts))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/destroy.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'ruby_terraform'
+
+require_relative './command_instantiation'
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Destroy
+          include CommandInstantiation
+
+          def destroy(parameters)
+            destroy_command.execute(destroy_parameters(parameters))
+          end
+
+          private
+
+          def destroy_command
+            instantiate_command(RubyTerraform::Commands::Destroy)
+          end
+
+          def destroy_parameters(parameters)
+            with_destroy_state_file_parameters(
+              with_destroy_standard_parameters(parameters)
+            )
+          end
+
+          def with_destroy_standard_parameters(parameters)
+            parameters.merge(
+              chdir: parameters[:configuration_directory],
+              input: false,
+              auto_approve: true
+            )
+          end
+
+          def with_destroy_state_file_parameters(parameters)
+            if parameters[:state_file]
+              return parameters.merge(state: parameters[:state_file])
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/execute_if_required.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module ExecuteIfRequired
+          def execute_if_required(parameters, &block)
+            only_if = parameters[:only_if]
+            only_if_args = only_if ? [parameters].slice(0, only_if.arity) : []
+            should_execute = only_if ? only_if.call(*only_if_args) : true
+
+            block.call if should_execute
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/init.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'ruby_terraform'
+
+require_relative './command_instantiation'
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Init
+          include CommandInstantiation
+
+          def init(parameters)
+            init_command.execute(init_parameters(parameters))
+          end
+
+          private
+
+          def init_command
+            instantiate_command(RubyTerraform::Commands::Init)
+          end
+
+          def init_parameters(parameters)
+            with_init_execution_mode_parameters(
+              with_init_standard_parameters(parameters)
+            )
+          end
+
+          def with_init_standard_parameters(parameters)
+            parameters.merge(
+              chdir: parameters[:configuration_directory],
+              input: false
+            )
+          end
+
+          def with_init_execution_mode_parameters(parameters)
+            if execution_mode == :isolated
+              return parameters.merge(
+                from_module: parameters[:source_directory]
+              )
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/output.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'ruby_terraform'
+require 'stringio'
+
+require_relative './command_instantiation'
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Output
+          include CommandInstantiation
+
+          def output(parameters)
+            stdout = StringIO.new
+            output_command(stdout: stdout)
+              .execute(output_parameters(parameters))
+            stdout.string
+          end
+
+          private
+
+          def output_command(opts = {})
+            instantiate_command(RubyTerraform::Commands::Output, opts)
+          end
+
+          def output_parameters(parameters)
+            with_output_state_file_parameters(
+              with_output_standard_parameters(parameters)
+            )
+          end
+
+          def with_output_standard_parameters(parameters)
+            parameters.merge(
+              chdir: parameters[:configuration_directory]
+            )
+          end
+
+          def with_output_state_file_parameters(parameters)
+            if parameters[:state_file]
+              return parameters.merge(state: parameters[:state_file])
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/plan.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'ruby_terraform'
+require 'securerandom'
+
+require_relative './command_instantiation'
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Plan
+          include CommandInstantiation
+
+          def plan(parameters)
+            plan_parameters = plan_parameters(parameters)
+            plan_command.execute(plan_parameters)
+            plan_parameters[:out]
+          end
+
+          private
+
+          def plan_command
+            instantiate_command(RubyTerraform::Commands::Plan)
+          end
+
+          def plan_parameters(parameters)
+            with_plan_state_file_parameters(
+              with_plan_standard_parameters(parameters)
+            )
+          end
+
+          def with_plan_standard_parameters(parameters)
+            parameters.merge(
+              chdir: parameters[:configuration_directory],
+              out: parameters[:plan_file_name] ||
+                "#{SecureRandom.hex[0, 10]}.tfplan",
+              input: false
+            )
+          end
+
+          def with_plan_state_file_parameters(parameters)
+            if parameters[:state_file]
+              return parameters.merge(state: parameters[:state_file])
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/remove.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Remove
+          def remove(parameters, file)
+            FileUtils.rm_f(
+              File.join(parameters[:configuration_directory], file)
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/show.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'ruby_terraform'
+require 'stringio'
+
+require_relative './command_instantiation'
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Show
+          include CommandInstantiation
+
+          def show(parameters, plan_file)
+            stdout = StringIO.new
+            show_command(stdout: stdout)
+              .execute(show_parameters(parameters, plan_file))
+            stdout.string
+          end
+
+          private
+
+          def show_command(opts = {})
+            instantiate_command(RubyTerraform::Commands::Show, opts)
+          end
+
+          def show_parameters(parameters, plan_file)
+            with_show_plan_file_parameters(
+              with_show_standard_parameters(parameters),
+              plan_file
+            )
+          end
+
+          def with_show_standard_parameters(parameters)
+            parameters.merge(
+              chdir: parameters[:configuration_directory],
+              no_color: true,
+              json: true
+            )
+          end
+
+          def with_show_plan_file_parameters(parameters, plan_file)
+            parameters.merge(
+              path: plan_file
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/helpers/actions/validate.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Validate
+          def validate(parameters)
+            missing_parameters =
+              required_parameters(execution_mode)
+                .filter { |parameter| parameters[parameter].nil? }
+
+            return if missing_parameters.empty?
+
+            raise_missing_parameters(missing_parameters)
+          end
+
+          private
+
+          def raise_missing_parameters(parameters)
+            parameters = parameters.collect { |parameter| "`:#{parameter}`" }
+            if parameters.count == 1
+              raise StandardError,
+                    "Required parameter: #{parameters[0]} missing."
+            else
+              parameters =
+                "#{parameters[..-2].join(', ')} and #{parameters[-1]}"
+              raise StandardError,
+                    "Required parameters: #{parameters} missing."
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative './actions/clean'
+require_relative './actions/validate'
+require_relative './actions/init'
+require_relative './actions/apply'
+require_relative './actions/destroy'
+require_relative './actions/plan'
+require_relative './actions/output'
+require_relative './actions/show'
+require_relative './actions/remove'
+require_relative './actions/execute_if_required'

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

@@ -3,16 +3,20 @@
 require 'ruby_terraform'
 
 require_relative './base'
-require_relative '../configuration/var_captor'
+require_relative './actions'
 
 module RSpec
   module Terraform
     module Helpers
       class Apply < Base
+        include Actions::ExecuteIfRequired
+        include Actions::Validate
+        include Actions::Clean
+        include Actions::Init
+        include Actions::Apply
+
         def execute(overrides = {}, &block)
-          parameters = with_configuration_provider_parameters(overrides)
-          parameters = with_resolved_vars(parameters, &block)
-          parameters = with_mandatory_parameters(parameters)
+          parameters = resolve_parameters(overrides, &block)
 
           execute_if_required(parameters) do
             validate(parameters)
@@ -24,14 +28,6 @@ module RSpec
 
         private
 
-        def execute_if_required(parameters, &block)
-          only_if = parameters[:only_if]
-          only_if_args = only_if ? [parameters].slice(0, only_if.arity) : []
-          should_execute = only_if ? only_if.call(*only_if_args) : true
-
-          block.call if should_execute
-        end
-
         def mandatory_parameters
           {
             input: false,
@@ -45,60 +41,6 @@ module RSpec
             isolated: %i[source_directory configuration_directory]
           }[execution_mode] || []
         end
-
-        def clean(parameters)
-          return unless execution_mode == :isolated
-
-          FileUtils.rm_rf(parameters[:configuration_directory])
-          FileUtils.mkdir_p(parameters[:configuration_directory])
-        end
-
-        def init(parameters)
-          init_command.execute(init_parameters(parameters))
-        end
-
-        def apply(parameters)
-          apply_command.execute(apply_parameters(parameters))
-        end
-
-        def init_command
-          RubyTerraform::Commands::Init.new(command_options)
-        end
-
-        def apply_command
-          RubyTerraform::Commands::Apply.new(command_options)
-        end
-
-        def init_parameters(parameters)
-          init_parameters = parameters.merge(
-            chdir: parameters[:configuration_directory],
-            input: false
-          )
-          if execution_mode == :isolated
-            init_parameters =
-              init_parameters.merge(from_module: parameters[:source_directory])
-          end
-
-          init_parameters
-        end
-
-        # rubocop:disable Metrics/MethodLength
-        def apply_parameters(parameters)
-          apply_parameters =
-            parameters.merge(
-              chdir: parameters[:configuration_directory],
-              input: false,
-              auto_approve: true
-            )
-
-          if parameters[:state_file]
-            apply_parameters =
-              apply_parameters.merge(state: parameters[:state_file])
-          end
-
-          apply_parameters
-        end
-        # rubocop:enable Metrics/MethodLength
       end
     end
   end

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

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../configuration/var_captor'
+require_relative './parameters'
 
 module RSpec
   module Terraform
     module Helpers
       class Base
+        include Parameters
+
         attr_reader(
           :configuration_provider,
           :binary,
@@ -29,44 +31,6 @@ module RSpec
 
         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(mandatory_parameters)
-        end
-
-        def raise_missing_parameters(parameters)
-          parameters = parameters.collect { |parameter| "`:#{parameter}`" }
-          if parameters.count == 1
-            raise StandardError,
-                  "Required parameter: #{parameters[0]} missing."
-          else
-            parameters = "#{parameters[..-2].join(', ')} and #{parameters[-1]}"
-            raise StandardError,
-                  "Required parameters: #{parameters} missing."
-          end
-        end
-
-        def validate(parameters)
-          missing_parameters =
-            required_parameters(execution_mode)
-              .filter { |parameter| parameters[parameter].nil? }
-
-          return if missing_parameters.empty?
-
-          raise_missing_parameters(missing_parameters)
-        end
-
         def mandatory_parameters
           {}
         end

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

@@ -3,14 +3,20 @@
 require 'ruby_terraform'
 
 require_relative './base'
+require_relative './actions'
 
 module RSpec
   module Terraform
     module Helpers
       class Destroy < Base
+        include Actions::ExecuteIfRequired
+        include Actions::Validate
+        include Actions::Clean
+        include Actions::Init
+        include Actions::Destroy
+
         def execute(overrides = {}, &block)
-          parameters = with_configuration_provider_parameters(overrides)
-          parameters = with_resolved_vars(parameters, &block)
+          parameters = resolve_parameters(overrides, &block)
 
           execute_if_required(parameters) do
             validate(parameters)
@@ -22,74 +28,12 @@ module RSpec
 
         private
 
-        def execute_if_required(parameters, &block)
-          only_if = parameters[:only_if]
-          only_if_args = only_if ? [parameters].slice(0, only_if.arity) : []
-          should_execute = only_if ? only_if.call(*only_if_args) : true
-
-          block.call if should_execute
-        end
-
         def required_parameters(execution_mode)
           {
             in_place: [:configuration_directory],
             isolated: %i[source_directory configuration_directory]
           }[execution_mode] || []
         end
-
-        def clean(parameters)
-          return unless execution_mode == :isolated
-
-          FileUtils.rm_rf(parameters[:configuration_directory])
-          FileUtils.mkdir_p(parameters[:configuration_directory])
-        end
-
-        def init(parameters)
-          init_command.execute(init_parameters(parameters))
-        end
-
-        def destroy(parameters)
-          destroy_command.execute(destroy_parameters(parameters))
-        end
-
-        def init_command
-          RubyTerraform::Commands::Init.new(command_options)
-        end
-
-        def destroy_command
-          RubyTerraform::Commands::Destroy.new(command_options)
-        end
-
-        def init_parameters(parameters)
-          init_parameters = parameters.merge(
-            chdir: parameters[:configuration_directory],
-            input: false
-          )
-          if execution_mode == :isolated
-            init_parameters =
-              init_parameters.merge(from_module: parameters[:source_directory])
-          end
-
-          init_parameters
-        end
-
-        # rubocop:disable Metrics/MethodLength
-        def destroy_parameters(parameters)
-          destroy_parameters =
-            parameters.merge(
-              chdir: parameters[:configuration_directory],
-              input: false,
-              auto_approve: true
-            )
-
-          if parameters[:state_file]
-            destroy_parameters =
-              destroy_parameters.merge(state: parameters[:state_file])
-          end
-
-          destroy_parameters
-        end
-        # rubocop:enable Metrics/MethodLength
       end
     end
   end

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

@@ -3,29 +3,30 @@
 require 'ruby_terraform'
 
 require_relative './base'
+require_relative './actions'
 
 module RSpec
   module Terraform
     module Helpers
       class Output < Base
+        include Actions::Validate
+        include Actions::Clean
+        include Actions::Init
+        include Actions::Output
+
         def execute(overrides = {})
-          parameters = with_configuration_provider_parameters(overrides)
-          parameters = with_mandatory_parameters(parameters)
+          parameters = resolve_parameters(overrides)
 
           validate(parameters)
           clean(parameters)
           init(parameters)
           output_value = output(parameters)
 
-          JSON.parse(output_value, symbolize_names: true)
+          parse(output_value)
         end
 
         private
 
-        def with_mandatory_parameters(parameters)
-          parameters.merge(mandatory_parameters)
-        end
-
         def mandatory_parameters
           {
             json: true
@@ -39,57 +40,8 @@ module RSpec
           }[execution_mode] || []
         end
 
-        def clean(parameters)
-          return unless execution_mode == :isolated
-
-          FileUtils.rm_rf(parameters[:configuration_directory])
-          FileUtils.mkdir_p(parameters[:configuration_directory])
-        end
-
-        def init(parameters)
-          init_command.execute(init_parameters(parameters))
-        end
-
-        def output(parameters)
-          stdout = StringIO.new
-          output_command(stdout: stdout)
-            .execute(output_parameters(parameters))
-          stdout.string
-        end
-
-        def init_command
-          RubyTerraform::Commands::Init.new(command_options)
-        end
-
-        def output_command(opts = {})
-          RubyTerraform::Commands::Output.new(command_options.merge(opts))
-        end
-
-        def init_parameters(parameters)
-          init_parameters = parameters.merge(
-            chdir: parameters[:configuration_directory],
-            input: false
-          )
-          if execution_mode == :isolated
-            init_parameters =
-              init_parameters.merge(from_module: parameters[:source_directory])
-          end
-
-          init_parameters
-        end
-
-        def output_parameters(parameters)
-          output_parameters =
-            parameters.merge(
-              chdir: parameters[:configuration_directory]
-            )
-
-          if parameters[:state_file]
-            output_parameters =
-              output_parameters.merge(state: parameters[:state_file])
-          end
-
-          output_parameters
+        def parse(output_value)
+          JSON.parse(output_value, symbolize_names: true)
         end
       end
     end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative '../configuration/var_captor'
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Parameters
+        def resolve_parameters(overrides, &block)
+          parameters = with_configuration_provider_parameters(overrides)
+          parameters = with_resolved_vars(parameters, &block)
+          with_mandatory_parameters(parameters)
+        end
+
+        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(mandatory_parameters)
+        end
+      end
+    end
+  end
+end

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

@@ -1,18 +1,21 @@
 # frozen_string_literal: true
 
-require 'ruby_terraform'
-require 'securerandom'
-require 'stringio'
-
 require_relative './base'
+require_relative './actions'
 
 module RSpec
   module Terraform
     module Helpers
       class Plan < Base
+        include Actions::Validate
+        include Actions::Clean
+        include Actions::Init
+        include Actions::Plan
+        include Actions::Show
+        include Actions::Remove
+
         def execute(overrides = {}, &block)
-          parameters = with_configuration_provider_parameters(overrides)
-          parameters = with_resolved_vars(parameters, &block)
+          parameters = resolve_parameters(overrides, &block)
 
           validate(parameters)
           clean(parameters)
@@ -32,94 +35,11 @@ module RSpec
           }[execution_mode] || []
         end
 
-        def clean(parameters)
-          return unless execution_mode == :isolated
-
-          FileUtils.rm_rf(parameters[:configuration_directory])
-          FileUtils.mkdir_p(parameters[:configuration_directory])
-        end
-
-        def init(parameters)
-          init_command.execute(init_parameters(parameters))
-        end
-
-        def plan(parameters)
-          plan_parameters = plan_parameters(parameters)
-          plan_command.execute(plan_parameters)
-          plan_parameters[:out]
-        end
-
-        def show(parameters, plan_file)
-          stdout = StringIO.new
-          show_command(stdout: stdout)
-            .execute(show_parameters(parameters, plan_file))
-          stdout.string
-        end
-
         def parse(plan_contents)
           RubyTerraform::Models::Plan.new(
             JSON.parse(plan_contents, symbolize_names: true)
           )
         end
-
-        def remove(parameters, plan_file)
-          FileUtils.rm_f(
-            File.join(parameters[:configuration_directory], plan_file)
-          )
-        end
-
-        def init_command
-          RubyTerraform::Commands::Init.new(command_options)
-        end
-
-        def plan_command
-          RubyTerraform::Commands::Plan.new(command_options)
-        end
-
-        def show_command(opts = {})
-          RubyTerraform::Commands::Show.new(command_options.merge(opts))
-        end
-
-        def init_parameters(parameters)
-          init_parameters = parameters.merge(
-            chdir: parameters[:configuration_directory],
-            input: false
-          )
-          if execution_mode == :isolated
-            init_parameters =
-              init_parameters.merge(from_module: parameters[:source_directory])
-          end
-
-          init_parameters
-        end
-
-        # rubocop:disable Metrics/MethodLength
-        def plan_parameters(parameters)
-          plan_parameters =
-            parameters.merge(
-              chdir: parameters[:configuration_directory],
-              out: parameters[:plan_file_name] ||
-                "#{SecureRandom.hex[0, 10]}.tfplan",
-              input: false
-            )
-
-          if parameters[:state_file]
-            plan_parameters =
-              plan_parameters.merge(state: parameters[:state_file])
-          end
-
-          plan_parameters
-        end
-        # rubocop:enable Metrics/MethodLength
-
-        def show_parameters(parameters, plan_file)
-          parameters.merge(
-            chdir: parameters[:configuration_directory],
-            path: plan_file,
-            no_color: true,
-            json: true
-          )
-        end
       end
     end
   end

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

@@ -8,8 +8,7 @@ module RSpec
     module Helpers
       class Var < Base
         def execute(overrides = {}, &block)
-          parameters = with_configuration_provider_parameters(overrides)
-          parameters = with_resolved_vars(parameters, &block)
+          parameters = resolve_parameters(overrides, &block)
 
           parameters[:vars][parameters[:name].to_sym]
         end

data/lib/rspec/terraform/version.rb

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

data/lib/rspec/terraform.rb

@@ -13,7 +13,6 @@ require_relative 'terraform/logging'
 # TODO
 # ====
 #
-# * Test session
 # * Before support in matchers
 # * Reference support in matchers
 # * Sensitive support in matchers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.45
+  version: 0.1.0.pre.47
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: confidante
@@ -304,10 +304,23 @@ files:
 - lib/rspec/terraform/configuration/providers/seed.rb
 - lib/rspec/terraform/configuration/var_captor.rb
 - lib/rspec/terraform/helpers.rb
+- lib/rspec/terraform/helpers/actions.rb
+- lib/rspec/terraform/helpers/actions/apply.rb
+- lib/rspec/terraform/helpers/actions/clean.rb
+- lib/rspec/terraform/helpers/actions/command_instantiation.rb
+- lib/rspec/terraform/helpers/actions/destroy.rb
+- lib/rspec/terraform/helpers/actions/execute_if_required.rb
+- lib/rspec/terraform/helpers/actions/init.rb
+- lib/rspec/terraform/helpers/actions/output.rb
+- lib/rspec/terraform/helpers/actions/plan.rb
+- lib/rspec/terraform/helpers/actions/remove.rb
+- lib/rspec/terraform/helpers/actions/show.rb
+- lib/rspec/terraform/helpers/actions/validate.rb
 - lib/rspec/terraform/helpers/apply.rb
 - lib/rspec/terraform/helpers/base.rb
 - lib/rspec/terraform/helpers/destroy.rb
 - lib/rspec/terraform/helpers/output.rb
+- lib/rspec/terraform/helpers/parameters.rb
 - lib/rspec/terraform/helpers/plan.rb
 - lib/rspec/terraform/helpers/var.rb
 - lib/rspec/terraform/logging.rb