rspec-terraform 0.1.0.pre.41 → 0.1.0.pre.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6abf52967c937d8a7761aab1289a1a244ed440bd735311360d3888c3746d8e39
-  data.tar.gz: ef8e4d1ed48f86632623785b6fafa69bef6bc38c63d902c3897ea8083c31bc7a
+  metadata.gz: 84471e75598a3fc301a717d206fd91ba40583271430805b183cbaf58610a8331
+  data.tar.gz: 6178c6b399ff218dffbb21c4f036c64233e3ac84e96ba86660254af7d6f2d4d0
 SHA512:
-  metadata.gz: 2034dd4ce31339bd6e6e834adfba4d0fc7ca894e532e2e0ef1e4e06efd24c3596d5daf2317933c5d4ee50c0da88ee3188840ed141a9a20492f9ba5d66c97ac1f
-  data.tar.gz: d41ffaa70e27cedc9f6dcaceb2aeec825be58c9bb41cc8344e9780d7cc1f9db77b8f44dba89da6cb159beabcfa6febac2c0ea93d76bd831f33a163b380bd39eb
+  metadata.gz: f3b96974345ca144b4314eb2c90237bb238223e706c214fe94b97f4e5462edf969f6b4da8b3cd83a4a81daed33771f18a0e9f415c361ec6f9cb3ebfe97be7b74
+  data.tar.gz: 19651b182453d3de16dfca2b5b4fe205df0d2af4bbfdc80dc1aa4d71298cd359a0ce70655720e100dc21f4f1f19b4784f51bdd56b3adfd63c05c3177a825f21d

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.41)
+    rspec-terraform (0.1.0.pre.44)
       confidante (>= 0.27)
       rspec (>= 3.0)
-      ruby-terraform (= 1.7.0.pre.16)
+      ruby-terraform (= 1.7.0.pre.17)
 
 GEM
   remote: https://rubygems.org/
@@ -148,7 +148,7 @@ GEM
     rubocop-rspec (2.12.1)
       rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
-    ruby-terraform (1.7.0.pre.16)
+    ruby-terraform (1.7.0.pre.17)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
     ruby2_keywords (0.0.5)

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

@@ -7,15 +7,26 @@ require_relative '../configuration/var_captor'
 module RSpec
   module Terraform
     module Helpers
+      # rubocop:disable Metrics/ClassLength
       class Apply
         attr_reader(
-          :configuration_provider, :binary, :execution_mode
+          :configuration_provider,
+          :binary,
+          :logger,
+          :stdin,
+          :stdout,
+          :stderr,
+          :execution_mode
         )
 
         def initialize(opts = {})
           @configuration_provider =
             opts[:configuration_provider] || Configuration.identity_provider
           @binary = opts[:binary] || 'terraform'
+          @logger = opts[:logger]
+          @stdin = opts[:stdin]
+          @stdout = opts[:stdout]
+          @stderr = opts[:stderr]
           @execution_mode = opts[:execution_mode] || :in_place
         end
 
@@ -24,15 +35,24 @@ module RSpec
           parameters = with_resolved_vars(parameters, &block)
           parameters = with_mandatory_parameters(parameters)
 
-          ensure_required_parameters(parameters)
-
-          clean(parameters)
-          init(parameters)
-          apply(parameters)
+          execute_if_required(parameters) do
+            validate(parameters)
+            clean(parameters)
+            init(parameters)
+            apply(parameters)
+          end
         end
 
         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 with_configuration_provider_parameters(parameters)
           configuration_provider.resolve(parameters)
         end
@@ -59,16 +79,6 @@ module RSpec
           }[execution_mode] || []
         end
 
-        def ensure_required_parameters(parameters)
-          missing_parameters =
-            required_parameters(execution_mode)
-              .filter { |parameter| parameters[parameter].nil? }
-
-          return if missing_parameters.empty?
-
-          raise_missing_parameters(missing_parameters)
-        end
-
         def raise_missing_parameters(parameters)
           parameters = parameters.collect { |parameter| "`:#{parameter}`" }
           if parameters.count == 1
@@ -81,6 +91,16 @@ module RSpec
           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 clean(parameters)
           return unless execution_mode == :isolated
 
@@ -97,11 +117,11 @@ module RSpec
         end
 
         def init_command
-          RubyTerraform::Commands::Init.new(binary: binary)
+          RubyTerraform::Commands::Init.new(command_options)
         end
 
         def apply_command
-          RubyTerraform::Commands::Apply.new(binary: binary)
+          RubyTerraform::Commands::Apply.new(command_options)
         end
 
         def init_parameters(parameters)
@@ -134,7 +154,18 @@ module RSpec
           apply_parameters
         end
         # rubocop:enable Metrics/MethodLength
+
+        def command_options
+          {
+            binary: binary,
+            logger: logger,
+            stdin: stdin,
+            stdout: stdout,
+            stderr: stderr
+          }
+        end
       end
+      # rubocop:enable Metrics/ClassLength
     end
   end
 end

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

@@ -7,15 +7,26 @@ require_relative '../configuration/var_captor'
 module RSpec
   module Terraform
     module Helpers
+      # rubocop:disable Metrics/ClassLength
       class Destroy
         attr_reader(
-          :configuration_provider, :binary, :execution_mode
+          :configuration_provider,
+          :binary,
+          :logger,
+          :stdin,
+          :stdout,
+          :stderr,
+          :execution_mode
         )
 
         def initialize(opts = {})
           @configuration_provider =
             opts[:configuration_provider] || Configuration.identity_provider
           @binary = opts[:binary] || 'terraform'
+          @logger = opts[:logger]
+          @stdin = opts[:stdin]
+          @stdout = opts[:stdout]
+          @stderr = opts[:stderr]
           @execution_mode = opts[:execution_mode] || :in_place
         end
 
@@ -23,15 +34,24 @@ module RSpec
           parameters = with_configuration_provider_parameters(overrides)
           parameters = with_resolved_vars(parameters, &block)
 
-          ensure_required_parameters(parameters)
-
-          clean(parameters)
-          init(parameters)
-          destroy(parameters)
+          execute_if_required(parameters) do
+            validate(parameters)
+            clean(parameters)
+            init(parameters)
+            destroy(parameters)
+          end
         end
 
         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 with_configuration_provider_parameters(parameters)
           configuration_provider.resolve(parameters)
         end
@@ -51,16 +71,6 @@ module RSpec
           }[execution_mode] || []
         end
 
-        def ensure_required_parameters(parameters)
-          missing_parameters =
-            required_parameters(execution_mode)
-              .filter { |parameter| parameters[parameter].nil? }
-
-          return if missing_parameters.empty?
-
-          raise_missing_parameters(missing_parameters)
-        end
-
         def raise_missing_parameters(parameters)
           parameters = parameters.collect { |parameter| "`:#{parameter}`" }
           if parameters.count == 1
@@ -73,6 +83,16 @@ module RSpec
           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 clean(parameters)
           return unless execution_mode == :isolated
 
@@ -89,19 +109,18 @@ module RSpec
         end
 
         def init_command
-          RubyTerraform::Commands::Init.new(binary: binary)
+          RubyTerraform::Commands::Init.new(command_options)
         end
 
         def destroy_command
-          RubyTerraform::Commands::Destroy.new(binary: binary)
+          RubyTerraform::Commands::Destroy.new(command_options)
         end
 
         def init_parameters(parameters)
-          init_parameters =
-            parameters.merge(
-              chdir: parameters[:configuration_directory],
-              input: false
-            )
+          init_parameters = parameters.merge(
+            chdir: parameters[:configuration_directory],
+            input: false
+          )
           if execution_mode == :isolated
             init_parameters =
               init_parameters.merge(from_module: parameters[:source_directory])
@@ -127,7 +146,18 @@ module RSpec
           destroy_parameters
         end
         # rubocop:enable Metrics/MethodLength
+
+        def command_options
+          {
+            binary: binary,
+            logger: logger,
+            stdin: stdin,
+            stdout: stdout,
+            stderr: stderr
+          }
+        end
       end
+      # rubocop:enable Metrics/ClassLength
     end
   end
 end

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

@@ -5,15 +5,26 @@ require 'ruby_terraform'
 module RSpec
   module Terraform
     module Helpers
+      # rubocop:disable Metrics/ClassLength
       class Output
         attr_reader(
-          :configuration_provider, :binary, :execution_mode
+          :configuration_provider,
+          :binary,
+          :logger,
+          :stdin,
+          :stdout,
+          :stderr,
+          :execution_mode
         )
 
         def initialize(opts = {})
           @configuration_provider =
             opts[:configuration_provider] || Configuration.identity_provider
           @binary = opts[:binary] || 'terraform'
+          @logger = opts[:logger]
+          @stdin = opts[:stdin]
+          @stdout = opts[:stdout]
+          @stderr = opts[:stderr]
           @execution_mode = opts[:execution_mode] || :in_place
         end
 
@@ -90,11 +101,11 @@ module RSpec
         end
 
         def init_command
-          RubyTerraform::Commands::Init.new(binary: binary)
+          RubyTerraform::Commands::Init.new(command_options)
         end
 
         def output_command(opts = {})
-          RubyTerraform::Commands::Output.new(opts.merge(binary: binary))
+          RubyTerraform::Commands::Output.new(command_options.merge(opts))
         end
 
         def init_parameters(parameters)
@@ -123,7 +134,18 @@ module RSpec
 
           output_parameters
         end
+
+        def command_options
+          {
+            binary: binary,
+            logger: logger,
+            stdin: stdin,
+            stdout: stdout,
+            stderr: stderr
+          }
+        end
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

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

@@ -12,13 +12,23 @@ module RSpec
       # rubocop:disable Metrics/ClassLength
       class Plan
         attr_reader(
-          :configuration_provider, :binary, :execution_mode
+          :configuration_provider,
+          :binary,
+          :logger,
+          :stdin,
+          :stdout,
+          :stderr,
+          :execution_mode
         )
 
         def initialize(opts = {})
           @configuration_provider =
             opts[:configuration_provider] || Configuration.identity_provider
           @binary = opts[:binary] || 'terraform'
+          @logger = opts[:logger]
+          @stdin = opts[:stdin]
+          @stdout = opts[:stdout]
+          @stderr = opts[:stderr]
           @execution_mode = opts[:execution_mode] || :in_place
         end
 
@@ -116,15 +126,15 @@ module RSpec
         end
 
         def init_command
-          RubyTerraform::Commands::Init.new(binary: binary)
+          RubyTerraform::Commands::Init.new(command_options)
         end
 
         def plan_command
-          RubyTerraform::Commands::Plan.new(binary: binary)
+          RubyTerraform::Commands::Plan.new(command_options)
         end
 
         def show_command(opts = {})
-          RubyTerraform::Commands::Show.new(opts.merge(binary: binary))
+          RubyTerraform::Commands::Show.new(command_options.merge(opts))
         end
 
         def init_parameters(parameters)
@@ -167,6 +177,16 @@ module RSpec
             json: true
           )
         end
+
+        def command_options
+          {
+            binary: binary,
+            logger: logger,
+            stdin: stdin,
+            stdout: stdout,
+            stderr: stderr
+          }
+        end
       end
       # rubocop:enable Metrics/ClassLength
     end

data/lib/rspec/terraform/helpers.rb

@@ -46,6 +46,10 @@ module RSpec
 
         {
           binary: config.terraform_binary,
+          logger: config.terraform_logger,
+          stdin: config.terraform_stdin,
+          stdout: config.terraform_stdout,
+          stderr: config.terraform_stderr,
           execution_mode: config.terraform_execution_mode,
           configuration_provider: config.terraform_configuration_provider
         }

data/lib/rspec/terraform/version.rb

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

data/rspec-terraform.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'confidante', '>= 0.27'
   spec.add_dependency 'rspec', '>= 3.0'
-  spec.add_dependency 'ruby-terraform', '1.7.0.pre.16'
+  spec.add_dependency 'ruby-terraform', '1.7.0.pre.17'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'faker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.41
+  version: 0.1.0.pre.44
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: confidante
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre.16
+        version: 1.7.0.pre.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre.16
+        version: 1.7.0.pre.17
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement