rspec-terraform 0.1.0.pre.46 → 0.1.0.pre.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2595a9e060198c8472a6a91148d1d0e8c11532efee15fef65d9c732605b17a8d
-  data.tar.gz: e63395a9eb9228904cf3641b27e8f98d383757e1f2caa32a4249db296de99162
+  metadata.gz: c565d7154d7321b3b6b9452592201b5230bbba63e30a3603e233f9ebd8f5bc9d
+  data.tar.gz: d9a59fe476ba65bd885da0386e3696e9e41daaf71b98d48f4c89a6dbcc7d56ba
 SHA512:
-  metadata.gz: a8cf7c02682147df95b9229c8fbf923b0cb1d35fc2b3b104452b560bbc5f0ee796d0fac397bc24ce188d7293ec7bc49bbed9782846d3e381aac20be9d2e89d94
-  data.tar.gz: 531a6420c69096768cb72f8593bea6e8e1d347ebe0182cc58e7a8c9b2ca76cfc67ec89b67c47bf1579712978a5d76a38bc850683cfe192adead3ca1e7d8e9368
+  metadata.gz: 05d52e392f0a08c5d4e1cd1eefccba1d11782f628c88426815e1ae5665e1aaf024f8119d2be4de264487670471bdb52bc8636e52be9c61249491180b433ad8ca
+  data.tar.gz: 7d5f89bd7ca96606e89104b4541f9ccde0b89619b0bbcedad2c95b63e5b82ac87ae31a05eaf2dafaf758131970d34be8576123a0f791bd3aff8921b0e13d5338

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.46)
+    rspec-terraform (0.1.0.pre.48)
       confidante (>= 0.27)
       rspec (>= 3.0)
       ruby-terraform (= 1.7.0.pre.17)

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

@@ -0,0 +1,78 @@
+# 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)
+            parameters = apply_parameters(parameters)
+
+            log_apply_starting(parameters)
+            log_apply_using_parameters(parameters)
+
+            apply_command.execute(parameters)
+
+            log_apply_complete
+          end
+
+          private
+
+          def log_apply_starting(parameters)
+            logger&.info(
+              'Applying for configuration in directory: ' \
+              "'#{parameters[:chdir]}'..."
+            )
+          end
+
+          def log_apply_using_parameters(parameters)
+            logger&.debug("Applying using parameters: #{parameters}...")
+          end
+
+          def log_apply_complete
+            logger&.info('Apply complete.')
+          end
+
+          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)
+            configuration_directory = parameters[:configuration_directory]
+
+            parameters
+              .except(:configuration_directory)
+              .merge(
+                chdir: configuration_directory,
+                input: false,
+                auto_approve: true
+              )
+          end
+
+          def with_apply_state_file_parameters(parameters)
+            state_file = parameters[:state_file]
+            if state_file
+              return parameters
+                       .except(:state_file)
+                       .merge(state: state_file)
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Clean
+          def clean(parameters)
+            return unless execution_mode == :isolated
+
+            configuration_directory = parameters[:configuration_directory]
+
+            log_clean_starting(configuration_directory)
+
+            FileUtils.rm_rf(configuration_directory)
+            FileUtils.mkdir_p(configuration_directory)
+
+            log_clean_complete
+          end
+
+          private
+
+          def log_clean_starting(configuration_directory)
+            logger&.info(
+              'Cleaning configuration directory: ' \
+              "'#{configuration_directory}'..."
+            )
+          end
+
+          def log_clean_complete
+            logger&.info('Clean complete.')
+          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,78 @@
+# 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)
+            parameters = destroy_parameters(parameters)
+
+            log_destroy_starting(parameters)
+            log_destroy_using_parameters(parameters)
+
+            destroy_command.execute(parameters)
+
+            log_destroy_complete
+          end
+
+          private
+
+          def log_destroy_starting(parameters)
+            logger&.info(
+              'Destroying for configuration in directory: ' \
+              "'#{parameters[:chdir]}'..."
+            )
+          end
+
+          def log_destroy_using_parameters(parameters)
+            logger&.debug("Destroying using parameters: #{parameters}...")
+          end
+
+          def log_destroy_complete
+            logger&.info('Destroy complete.')
+          end
+
+          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)
+            configuration_directory = parameters[:configuration_directory]
+
+            parameters
+              .except(:configuration_directory)
+              .merge(
+                chdir: configuration_directory,
+                input: false,
+                auto_approve: true
+              )
+          end
+
+          def with_destroy_state_file_parameters(parameters)
+            state_file = parameters[:state_file]
+            if state_file
+              return parameters
+                       .except(:state_file)
+                       .merge(state: state_file)
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module ExecuteIfRequired
+          def execute_if_required(name, parameters, &block)
+            log_execute_if_required_starting(name)
+
+            if should_execute(parameters)
+              log_execute_if_required_continuing
+              block.call
+            else
+              log_execute_if_required_skipping
+            end
+          end
+
+          private
+
+          def should_execute(parameters)
+            only_if = parameters[:only_if]
+            only_if_args = only_if ? [parameters].slice(0, only_if.arity) : []
+            only_if ? only_if.call(*only_if_args) : true
+          end
+
+          def log_execute_if_required_starting(name)
+            logger&.info("Checking if execution of #{name} required...")
+          end
+
+          def log_execute_if_required_continuing
+            logger&.info('Execution required. Continuing...')
+          end
+
+          def log_execute_if_required_skipping
+            logger&.info('Execution not required. Skipping...')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+# 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)
+            parameters = init_parameters(parameters)
+
+            log_init_starting(parameters)
+            log_init_using_parameters(parameters)
+
+            init_command.execute(parameters)
+
+            log_init_complete
+          end
+
+          private
+
+          def log_init_starting(parameters)
+            logger&.info(
+              'Initing for configuration in directory: ' \
+              "'#{parameters[:chdir]}'..."
+            )
+          end
+
+          def log_init_using_parameters(parameters)
+            logger&.debug("Initing using parameters: #{parameters}...")
+          end
+
+          def log_init_complete
+            logger&.info('Init complete.')
+          end
+
+          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)
+            configuration_directory = parameters[:configuration_directory]
+
+            parameters
+              .except(:configuration_directory)
+              .merge(
+                chdir: configuration_directory,
+                input: false
+              )
+          end
+
+          def with_init_execution_mode_parameters(parameters)
+            source_directory = parameters[:source_directory]
+            parameters = parameters.except(:source_directory)
+
+            if execution_mode == :isolated
+              return parameters.merge(from_module: source_directory)
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,81 @@
+# 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
+            parameters = output_parameters(parameters)
+
+            log_output_starting(parameters)
+            log_output_using_parameters(parameters)
+
+            output_command(stdout: stdout)
+              .execute(parameters)
+
+            log_output_complete
+
+            stdout.string
+          end
+
+          private
+
+          def log_output_starting(parameters)
+            logger&.info(
+              'Outputting for configuration in directory: ' \
+              "'#{parameters[:chdir]}'..."
+            )
+          end
+
+          def log_output_using_parameters(parameters)
+            logger&.debug("Outputting using parameters: #{parameters}...")
+          end
+
+          def log_output_complete
+            logger&.info('Output complete.')
+          end
+
+          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)
+            configuration_directory = parameters[:configuration_directory]
+
+            parameters
+              .except(:configuration_directory)
+              .merge(
+                chdir: configuration_directory
+              )
+          end
+
+          def with_output_state_file_parameters(parameters)
+            state_file = parameters[:state_file]
+            if state_file
+              return parameters
+                       .except(:state_file)
+                       .merge(state: state_file)
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,90 @@
+# 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)
+            parameters = plan_parameters(parameters)
+
+            log_plan_starting(parameters)
+            log_plan_using_parameters(parameters)
+
+            plan_command.execute(parameters)
+
+            log_plan_complete
+
+            parameters[:out]
+          end
+
+          private
+
+          def log_plan_starting(parameters)
+            logger&.info(
+              'Planning for configuration in directory: ' \
+              "'#{parameters[:chdir]}'..."
+            )
+          end
+
+          def log_plan_using_parameters(parameters)
+            logger&.debug("Planning using parameters: #{parameters}...")
+          end
+
+          def log_plan_complete
+            logger&.info('Plan complete.')
+          end
+
+          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)
+            configuration_directory = parameters[:configuration_directory]
+            plan_file_name = resolve_plan_file_name(parameters)
+
+            parameters
+              .except(:configuration_directory, :plan_file_name)
+              .merge(
+                chdir: configuration_directory,
+                out: plan_file_name,
+                input: false
+              )
+          end
+
+          def resolve_plan_file_name(parameters)
+            parameters[:plan_file_name] || random_plan_file_name
+          end
+
+          def random_plan_file_name
+            "#{SecureRandom.hex[0, 10]}.tfplan"
+          end
+
+          def with_plan_state_file_parameters(parameters)
+            state_file = parameters[:state_file]
+            if state_file
+              return parameters
+                       .except(:state_file)
+                       .merge(state: state_file)
+            end
+
+            parameters
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Remove
+          def remove(parameters, file)
+            configuration_directory = parameters[:configuration_directory]
+
+            log_remove_starting(configuration_directory, file)
+
+            FileUtils.rm_f(
+              File.join(configuration_directory, file)
+            )
+
+            log_remove_complete
+          end
+
+          private
+
+          def log_remove_starting(configuration_directory, file)
+            logger&.info(
+              "Removing file: '#{file}' in configuration directory: " \
+              "'#{configuration_directory}'..."
+            )
+          end
+
+          def log_remove_complete
+            logger&.info('Remove complete.')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,79 @@
+# 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)
+            parameters = show_parameters(parameters, plan_file)
+
+            log_show_starting(parameters, plan_file)
+            log_show_using_parameters(parameters)
+
+            stdout = StringIO.new
+            show_command(stdout: stdout)
+              .execute(parameters)
+
+            log_show_complete
+
+            stdout.string
+          end
+
+          private
+
+          def log_show_starting(parameters, plan_file)
+            logger&.info(
+              "Showing file: '#{plan_file}' in configuration directory: " \
+              "'#{parameters[:chdir]}'..."
+            )
+          end
+
+          def log_show_using_parameters(parameters)
+            logger&.debug("Showing using parameters: #{parameters}...")
+          end
+
+          def log_show_complete
+            logger&.info('Show complete.')
+          end
+
+          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)
+            configuration_directory = parameters[:configuration_directory]
+
+            parameters
+              .except(:configuration_directory)
+              .merge(
+                chdir: 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,68 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Helpers
+      module Actions
+        module Validate
+          def validate(parameters)
+            required = required_parameters(execution_mode)
+
+            log_validate_starting(required)
+            log_validate_using_parameters(parameters)
+
+            missing = determine_missing(parameters, required)
+
+            handle_result(missing)
+          end
+
+          private
+
+          def determine_missing(parameters, required)
+            required.filter { |parameter| parameters[parameter].nil? }
+          end
+
+          def handle_result(missing)
+            if missing.empty?
+              log_validate_successful
+            else
+              log_validate_failed(missing)
+              raise_missing_parameters(missing)
+            end
+          end
+
+          def log_validate_starting(required)
+            logger&.info(
+              "Validating required parameters: #{required} present..."
+            )
+          end
+
+          def log_validate_using_parameters(parameters)
+            logger&.debug("Validating parameters: #{parameters}...")
+          end
+
+          def log_validate_successful
+            logger&.info('Validate successful.')
+          end
+
+          def log_validate_failed(missing)
+            logger&.error("Validate failed. Parameters: #{missing} missing.")
+          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
+        end
+      end
+    end
+  end
+end

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

@@ -1,209 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../configuration/var_captor'
-
-module RSpec
-  module Terraform
-    module Helpers
-      # rubocop:disable Metrics/ModuleLength
-      module Actions
-        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 clean(parameters)
-          return unless execution_mode == :isolated
-
-          FileUtils.rm_rf(parameters[:configuration_directory])
-          FileUtils.mkdir_p(parameters[:configuration_directory])
-        end
-
-        def remove(parameters, file)
-          FileUtils.rm_f(
-            File.join(parameters[:configuration_directory], file)
-          )
-        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 init(parameters)
-          init_command.execute(init_parameters(parameters))
-        end
-
-        def apply(parameters)
-          apply_command.execute(apply_parameters(parameters))
-        end
-
-        def destroy(parameters)
-          destroy_command.execute(destroy_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 output(parameters)
-          stdout = StringIO.new
-          output_command(stdout: stdout)
-            .execute(output_parameters(parameters))
-          stdout.string
-        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
-
-        def instantiate_command(klass, opts = {})
-          klass.new(command_options.merge(opts))
-        end
-
-        def init_command
-          instantiate_command(RubyTerraform::Commands::Init)
-        end
-
-        def apply_command
-          instantiate_command(RubyTerraform::Commands::Apply)
-        end
-
-        def destroy_command
-          instantiate_command(RubyTerraform::Commands::Destroy)
-        end
-
-        def plan_command
-          instantiate_command(RubyTerraform::Commands::Plan)
-        end
-
-        def show_command(opts = {})
-          instantiate_command(RubyTerraform::Commands::Show, opts)
-        end
-
-        def output_command(opts = {})
-          instantiate_command(RubyTerraform::Commands::Output, 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 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
-
-        # 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
-
-        # 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
-
-        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
-        end
-      end
-      # rubocop:enable Metrics/ModuleLength
-    end
-  end
-end
+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,15 +3,22 @@
 require 'ruby_terraform'
 
 require_relative './base'
+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 = resolve_parameters(overrides, &block)
 
-          execute_if_required(parameters) do
+          execute_if_required(:apply, parameters) do
             validate(parameters)
             clean(parameters)
             init(parameters)

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative './actions'
 require_relative './parameters'
 
 module RSpec
@@ -8,7 +7,6 @@ module RSpec
     module Helpers
       class Base
         include Parameters
-        include Actions
 
         attr_reader(
           :configuration_provider,

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

@@ -3,15 +3,22 @@
 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 = resolve_parameters(overrides, &block)
 
-          execute_if_required(parameters) do
+          execute_if_required(:destroy, parameters) do
             validate(parameters)
             clean(parameters)
             init(parameters)

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

@@ -3,11 +3,17 @@
 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 = resolve_parameters(overrides)
 

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

@@ -1,15 +1,19 @@
 # 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 = resolve_parameters(overrides, &block)
 

data/lib/rspec/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Terraform
-    VERSION = '0.1.0.pre.46'
+    VERSION = '0.1.0.pre.48'
   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.46
+  version: 0.1.0.pre.48
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: confidante
@@ -305,6 +305,17 @@ files:
 - 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