kitchen-terraform 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272bfd39d809ace18838162e11c8488a6ae6623a6c88dc1b177619b41007e95c
-  data.tar.gz: d2509795935a5daccf9ee2be3521f0ac7f72865a8be5f3c430a008dd4623bb83
+  metadata.gz: 8ea1afc210ba60f866e551ce195c076eda236fcba4ddbfd0e6c8198583243e13
+  data.tar.gz: 27665fd25ff0b67acc1df2a2d3febf69353ed3c166790a515bb2dee37eee807b
 SHA512:
-  metadata.gz: 4be878740914aa1fe71c61d895747840ada06b414211c65ff89f01aa7a9b9bd5128800fc82285b8aee024704c21f1cb8500002dcc2460624b1cf25a8e3ca222c
-  data.tar.gz: f66253b088954ad0c4a545daa7b7cd24bdffa271cf34b613bb95c73973ff72bedc365abdfacc7be6c0329ba90f8674bf9d442202cf7b97f840b3124e45b66600
+  metadata.gz: '08243c47d3406c442d5eb64625667affa29c20fb90f5558124678d74a46239d49537ccd8361d15b42d6125f08849eae1c55871edbe768bd1a0696e7c0a772000'
+  data.tar.gz: ee74fa4d72efc97e01faaed3f941e78cb075b4fe7a4e8a9212176d3ac957d7e4749ce988bb056ad44d62d37b8b8949cc9764f538390e8fb97f61132f0ff6ca1b

data/lib/kitchen/driver/terraform.rb

@@ -18,6 +18,7 @@ require "kitchen"
 require "kitchen/terraform/command/output"
 require "kitchen/terraform/command/version"
 require "kitchen/terraform/config_attribute/backend_configurations"
+require "kitchen/terraform/config_attribute/client"
 require "kitchen/terraform/config_attribute/color"
 require "kitchen/terraform/config_attribute/command_timeout"
 require "kitchen/terraform/config_attribute/lock"
@@ -32,7 +33,6 @@ require "kitchen/terraform/configurable"
 require "kitchen/terraform/shell_out"
 require "kitchen/terraform/verify_version"
 require "shellwords"
-require "tty/which"
 
 # This namespace is defined by Kitchen.
 #
@@ -198,6 +198,8 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
 
   include ::Kitchen::Terraform::ConfigAttribute::BackendConfigurations
 
+  include ::Kitchen::Terraform::ConfigAttribute::Client
+
   include ::Kitchen::Terraform::ConfigAttribute::Color
 
   include ::Kitchen::Terraform::ConfigAttribute::CommandTimeout
@@ -272,6 +274,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   def retrieve_outputs(&block)
     run_workspace_select_instance
     ::Kitchen::Terraform::Command::Output.run(
+      client: config_client,
       options: {
         cwd: config_root_module_directory, live_stream: logger, timeout: config_command_timeout,
       }, &block
@@ -280,16 +283,6 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
     raise ::Kitchen::ActionFailed, error.message
   end
 
-  # Verifies that the Terraform CLI is on the PATH.
-  #
-  # @raise [::Kitchen::UserError] if the Terraform CLI is not available.
-  # @return [void]
-  def verify_dependencies
-    if !::TTY::Which.exist? "terraform"
-      raise ::Kitchen::UserError, "The Terraform CLI was not found on the PATH"
-    end
-  end
-
   private
 
   def apply_run
@@ -301,6 +294,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @api private
   def apply_run_apply
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "apply " \
       "#{lock_flag} " \
       "#{lock_timeout_flag} " \
@@ -322,6 +316,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @api private
   def apply_run_get
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "get -update",
       options: {
         cwd: config_root_module_directory,
@@ -334,6 +329,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @api private
   def apply_run_validate
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "validate " \
       "#{color_flag} " \
       "#{variables_flags} " \
@@ -361,6 +357,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @api private
   def create_run_init
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "init " \
       "-input=false " \
       "#{lock_flag} " \
@@ -385,6 +382,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @api private
   def destroy_run_destroy
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "destroy " \
       "-auto-approve " \
       "#{lock_flag} " \
@@ -397,7 +395,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
       "#{variable_files_flags}",
       options: {
         cwd: config_root_module_directory,
-        environment: {"TF_WARN_OUTPUT_ERRORS" => "true"},
+        environment: { "TF_WARN_OUTPUT_ERRORS" => "true" },
         live_stream: logger,
         timeout: config_command_timeout,
       },
@@ -407,6 +405,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @api private
   def destroy_run_init
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "init " \
       "-input=false " \
       "#{lock_flag} " \
@@ -430,6 +429,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @api private
   def destroy_run_workspace_delete_instance
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "workspace delete #{workspace_name}",
       options: {
         cwd: config_root_module_directory,
@@ -442,6 +442,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @api private
   def destroy_run_workspace_select_default
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "workspace select default",
       options: {
         cwd: config_root_module_directory,
@@ -478,6 +479,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @api private
   def run_workspace_select_instance
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "workspace select #{workspace_name}",
       options: {
         cwd: config_root_module_directory,
@@ -487,6 +489,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
     )
   rescue ::Kitchen::Terraform::Error
     ::Kitchen::Terraform::ShellOut.run(
+      client: config_client,
       command: "workspace new #{workspace_name}",
       options: {
         cwd: config_root_module_directory,

data/lib/kitchen/terraform/command/output.rb

@@ -29,13 +29,11 @@ module ::Kitchen::Terraform::Command::Output
     # @option options [::Kitchen::Logger] :live_stream a Test Kitchen logger to capture the output from running the
     #   command.
     # @option options [::Integer] :timeout the maximum duration in seconds to run the command.
+    # @param client [::String] the pathname of the Terraform client.
     # @param options [::Hash] options which adjust the execution of the command.
     # @yieldparam output [::Hash] the standard output of the command parsed as JSON.
-    def run(options:, &block)
-      run_shell_out(
-        options: options,
-        &block
-      )
+    def run(client:, options:, &block)
+      run_shell_out client: client, options: options, &block
     rescue ::JSON::ParserError => error
       handle_json_parser error: error
     rescue ::Kitchen::Terraform::Error => error
@@ -62,12 +60,8 @@ module ::Kitchen::Terraform::Command::Output
     end
 
     # @api private
-    def run_shell_out(options:)
-      ::Kitchen::Terraform::ShellOut
-        .run(
-          command: "output -json",
-          options: options,
-        ) do |standard_output:|
+    def run_shell_out(client:, options:)
+      ::Kitchen::Terraform::ShellOut.run client: client, command: "output -json", options: options do |standard_output:|
         yield outputs: ::JSON.parse(standard_output)
       end
     end

data/lib/kitchen/terraform/config_attribute.rb

@@ -55,25 +55,22 @@ class ::Kitchen::Terraform::ConfigAttribute
   def define_singleton_included
     local_schema = schema
 
-    config_attribute
-      .define_singleton_method :included do |plugin_class|
-        ::Kitchen::Terraform::ConfigAttributeDefiner
-          .new(
-            attribute: self,
-            schema: local_schema
-          )
-          .define plugin_class: plugin_class
-      end
+    config_attribute.define_singleton_method :included do |plugin_class|
+      ::Kitchen::Terraform::ConfigAttributeDefiner
+        .new(
+          attribute: self,
+          schema: local_schema,
+        ).define plugin_class: plugin_class
+    end
   end
 
   # @api private
   def define_singleton_to_sym
     local_attribute = attribute
 
-    config_attribute
-      .define_singleton_method :to_sym do
-        local_attribute
-      end
+    config_attribute.define_singleton_method :to_sym do
+      local_attribute
+    end
 
     config_attribute.extend ::Kitchen::Terraform::ConfigAttributeCacher
   end

data/lib/kitchen/terraform/config_attribute/backend_configurations.rb

@@ -33,9 +33,8 @@ module ::Kitchen::Terraform::ConfigAttribute::BackendConfigurations
     .apply(
       attribute: :backend_configurations,
       config_attribute: self,
-      default_value:
-        lambda do
-          {}
-        end
+      default_value: lambda do
+        {}
+      end,
     )
 end

data/lib/kitchen/terraform/config_attribute/client.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# Copyright 2016 New Context Services, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "kitchen/terraform/config_attribute_cacher"
+require "kitchen/terraform/config_schemas/string"
+require "kitchen/terraform/config_attribute_definer"
+require "tty/which"
+
+module Kitchen
+  module Terraform
+    class ConfigAttribute
+      # This attribute contains the pathname of the
+      # {https://www.terraform.io/docs/commands/index.html Terraform client} to be used by Kitchen-Terraform.
+      #
+      # If the value is not an absolute pathname or a relative pathname then Kitchen-Terraform will attempt to find the
+      # value in the directories of the {https://en.wikipedia.org/wiki/PATH_(variable) PATH}.
+      #
+      # The pathname of any executable file which implements the interfaces of the following Terraform client commands
+      # may be specified: apply; destroy; get; init; validate; workspace.
+      #
+      # Type:: {http://www.yaml.org/spec/1.2/spec.html#id2760844 Scalar}
+      # Required:: False
+      # Default:: <code>terraform</code>
+      # Example:: <code>client: /usr/local/bin/terraform</code>
+      # Example:: <code>client: ./bin/terraform</code>
+      # Example:: <code>client: terraform</code>
+      #
+      # @abstract It must be included by a plugin class in order to be used.
+      module Client
+        class << self
+          def included(plugin_class)
+            ::Kitchen::Terraform::ConfigAttributeDefiner.new(
+              attribute: self,
+              schema: ::Kitchen::Terraform::ConfigSchemas::String,
+            ).define plugin_class: plugin_class
+            plugin_class.expand_path_for to_sym do |plugin|
+              !::TTY::Which.exist? plugin[to_sym]
+            end
+          end
+
+          # @return [::Symbol] the symbol corresponding to this attribute.
+          def to_sym
+            :client
+          end
+        end
+
+        extend ::Kitchen::Terraform::ConfigAttributeCacher
+
+        # @return [::String] </code>"terraform"</code>
+        def config_client_default_value
+          "terraform"
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/terraform/config_attribute/color.rb

@@ -32,11 +32,9 @@ module ::Kitchen::Terraform::ConfigAttribute::Color
   ::Kitchen::Terraform::ConfigAttribute
     .new(
       attribute: :color,
-      default_value:
-        lambda do
-          ::Kitchen.tty?
-        end,
-      schema: ::Kitchen::Terraform::ConfigSchemas::Boolean
-    )
-    .apply config_attribute: self
+      default_value: lambda do
+        ::Kitchen.tty?
+      end,
+      schema: ::Kitchen::Terraform::ConfigSchemas::Boolean,
+    ).apply config_attribute: self
 end

data/lib/kitchen/terraform/config_attribute/command_timeout.rb

@@ -28,9 +28,8 @@ module ::Kitchen::Terraform::ConfigAttribute::CommandTimeout
     .apply(
       attribute: :command_timeout,
       config_attribute: self,
-      default_value:
-        lambda do
-          600
-        end
+      default_value: lambda do
+        600
+      end,
     )
 end

data/lib/kitchen/terraform/config_attribute/lock.rb

@@ -28,11 +28,9 @@ module ::Kitchen::Terraform::ConfigAttribute::Lock
   ::Kitchen::Terraform::ConfigAttribute
     .new(
       attribute: :lock,
-      default_value:
-        lambda do
-          true
-        end,
-      schema: ::Kitchen::Terraform::ConfigSchemas::Boolean
-    )
-    .apply config_attribute: self
+      default_value: lambda do
+        true
+      end,
+      schema: ::Kitchen::Terraform::ConfigSchemas::Boolean,
+    ).apply config_attribute: self
 end

data/lib/kitchen/terraform/config_attribute/lock_timeout.rb

@@ -29,9 +29,8 @@ module ::Kitchen::Terraform::ConfigAttribute::LockTimeout
     .apply(
       attribute: :lock_timeout,
       config_attribute: self,
-      default_value:
-        lambda do
-          0
-        end
+      default_value: lambda do
+        0
+      end,
     )
 end

data/lib/kitchen/terraform/config_attribute/parallelism.rb

@@ -29,9 +29,8 @@ module ::Kitchen::Terraform::ConfigAttribute::Parallelism
     .apply(
       attribute: :parallelism,
       config_attribute: self,
-      default_value:
-        lambda do
-          10
-        end
+      default_value: lambda do
+        10
+      end,
     )
 end

data/lib/kitchen/terraform/config_attribute/plugin_directory.rb

@@ -38,9 +38,8 @@ module ::Kitchen::Terraform::ConfigAttribute::PluginDirectory
     ::Kitchen::Terraform::FilePathConfigAttributeDefiner
       .new(
         attribute: self,
-        schema: ::Kitchen::Terraform::ConfigSchemas::OptionalString
-      )
-      .define plugin_class: plugin_class
+        schema: ::Kitchen::Terraform::ConfigSchemas::OptionalString,
+      ).define plugin_class: plugin_class
   end
 
   # @return [::Symbol] the symbol corresponding to this attribute.

data/lib/kitchen/terraform/config_attribute/root_module_directory.rb

@@ -36,9 +36,8 @@ module ::Kitchen::Terraform::ConfigAttribute::RootModuleDirectory
     ::Kitchen::Terraform::FilePathConfigAttributeDefiner
       .new(
         attribute: self,
-        schema: ::Kitchen::Terraform::ConfigSchemas::String
-      )
-      .define plugin_class: plugin_class
+        schema: ::Kitchen::Terraform::ConfigSchemas::String,
+      ).define plugin_class: plugin_class
   end
 
   # @return [::Symbol] the symbol corresponding to the attribute.

data/lib/kitchen/terraform/config_attribute/variable_files.rb

@@ -40,9 +40,8 @@ module ::Kitchen::Terraform::ConfigAttribute::VariableFiles
     ::Kitchen::Terraform::FilePathConfigAttributeDefiner
       .new(
         attribute: self,
-        schema: ::Kitchen::Terraform::ConfigSchemas::ArrayOfStrings
-      )
-      .define plugin_class: plugin_class
+        schema: ::Kitchen::Terraform::ConfigSchemas::ArrayOfStrings,
+      ).define plugin_class: plugin_class
   end
 
   # @return [::Symbol] the symbol corresponding to this attribute.

data/lib/kitchen/terraform/config_attribute/variables.rb

@@ -31,9 +31,8 @@ module ::Kitchen::Terraform::ConfigAttribute::Variables
     .apply(
       attribute: :variables,
       config_attribute: self,
-      default_value:
-        lambda do
-          {}
-        end
+      default_value: lambda do
+        {}
+      end,
     )
 end

data/lib/kitchen/terraform/config_attribute_definer.rb

@@ -23,20 +23,17 @@ class ::Kitchen::Terraform::ConfigAttributeDefiner
   # @param plugin_class [::Kitchen::Configurable] a plugin class.
   # @return [void]
   def define(plugin_class:)
-    plugin_class
-      .required_config @attribute do |_attribute, value, _plugin|
-        process(
-          messages:
-            @schema
-              .call(value: value)
-              .messages,
-          plugin_class: plugin_class
-        )
-      end
-    plugin_class
-      .default_config @attribute do |plugin|
-        plugin.send "config_#{@attribute}_default_value"
-      end
+    plugin_class.required_config @attribute do |_attribute, value, _plugin|
+      process(
+        messages: @schema
+          .call(value: value)
+          .messages,
+        plugin_class: plugin_class,
+      )
+    end
+    plugin_class.default_config @attribute do |plugin|
+      plugin.send "config_#{@attribute}_default_value"
+    end
   end
 
   private

data/lib/kitchen/terraform/config_attribute_type/hash_of_symbols_and_strings.rb

@@ -35,16 +35,14 @@ module ::Kitchen::Terraform::ConfigAttributeType::HashOfSymbolsAndStrings
       .new(
         attribute: attribute,
         default_value: default_value,
-        schema:
-          ::Dry::Validation
-            .Schema do
-              configure do
-                extend ::Kitchen::Terraform::ConfigPredicates::HashOfSymbolsAndStrings
-              end
-              required(:value).value :hash_of_symbols_and_strings?
-            end
-      )
-      .apply config_attribute: config_attribute
+        schema: ::Dry::Validation
+          .Schema do
+          configure do
+            extend ::Kitchen::Terraform::ConfigPredicates::HashOfSymbolsAndStrings
+          end
+          required(:value).value :hash_of_symbols_and_strings?
+        end,
+      ).apply config_attribute: config_attribute
 
     self
   end

data/lib/kitchen/terraform/config_attribute_type/integer.rb

@@ -34,13 +34,11 @@ module ::Kitchen::Terraform::ConfigAttributeType::Integer
       .new(
         attribute: attribute,
         default_value: default_value,
-        schema:
-          ::Dry::Validation
-            .Schema do
-              required(:value).filled :int?
-            end
-      )
-      .apply config_attribute: config_attribute
+        schema: ::Dry::Validation
+          .Schema do
+          required(:value).filled :int?
+        end,
+      ).apply config_attribute: config_attribute
 
     self
   end

data/lib/kitchen/terraform/config_predicates/hash_of_symbols_and_strings.rb

@@ -50,8 +50,8 @@ module ::Kitchen::Terraform::ConfigPredicates::HashOfSymbolsAndStrings
   def self.all_symbols?(keys:)
     keys
       .all? do |key|
-        key.kind_of? ::Symbol
-      end
+      key.kind_of? ::Symbol
+    end
   end
 
   # If all values are strings then the result is +true+; else the result is +false+.
@@ -62,8 +62,8 @@ module ::Kitchen::Terraform::ConfigPredicates::HashOfSymbolsAndStrings
   def self.all_strings?(values:)
     values
       .all? do |value|
-        value.kind_of? ::String
-      end
+      value.kind_of? ::String
+    end
   end
 
   private
@@ -73,9 +73,9 @@ module ::Kitchen::Terraform::ConfigPredicates::HashOfSymbolsAndStrings
       .merge(
         en: {
           errors: {
-            hash_of_symbols_and_strings?: "must be a hash which includes only symbol keys and string values"
-          }
-        }
+            hash_of_symbols_and_strings?: "must be a hash which includes only symbol keys and string values",
+          },
+        },
       )
   end
 end

data/lib/kitchen/terraform/config_schemas/array_of_strings.rb

@@ -23,9 +23,9 @@ require "kitchen/terraform/config_schemas"
 ::Kitchen::Terraform::ConfigSchemas::ArrayOfStrings =
   ::Dry::Validation
     .Schema do
-      required(:value)
-        .each(
-          :filled?,
-          :str?
-        )
-    end
+    required(:value)
+      .each(
+        :filled?,
+        :str?
+      )
+  end

data/lib/kitchen/terraform/config_schemas/boolean.rb

@@ -23,5 +23,5 @@ require "kitchen/terraform/config_schemas"
 ::Kitchen::Terraform::ConfigSchemas::Boolean =
   ::Dry::Validation
     .Schema do
-      required(:value).filled :bool?
-    end
+    required(:value).filled :bool?
+  end

data/lib/kitchen/terraform/config_schemas/optional_string.rb

@@ -23,9 +23,9 @@ require "kitchen/terraform/config_schemas"
 ::Kitchen::Terraform::ConfigSchemas::OptionalString =
   ::Dry::Validation
     .Schema do
-      required(:value)
-        .maybe(
-          :str?,
-          :filled?
-        )
-    end
+    required(:value)
+      .maybe(
+        :str?,
+        :filled?
+      )
+  end

data/lib/kitchen/terraform/config_schemas/string.rb

@@ -22,5 +22,5 @@ require "kitchen/terraform/config_schemas"
 ::Kitchen::Terraform::ConfigSchemas::String =
   ::Dry::Validation
     .Schema do
-      required(:value).filled :str?
-    end
+    required(:value).filled :str?
+  end

data/lib/kitchen/terraform/configurable.rb

@@ -30,27 +30,15 @@ module ::Kitchen::Terraform::Configurable
     self
   end
 
-  # Alternative implementation of Kitchen::Configurable#finalize_config! which validates the configuration before
-  # attempting to expand paths.
-  #
-  # @note this method should be removed when Test Kitchen: Issue #1229 is solved.
-  # @param kitchen_instance [::Kitchen::Instance] an associated Test Kitchen instance.
-  # @return [self] itself, for use in chaining.
-  # @raise [::Kitchen::ClientError] if the instance is nil.
-  # @see https://github.com/test-kitchen/test-kitchen/blob/v1.16.0/lib/kitchen/configurable.rb#L46
-  #   Kitchen::Configurable#finalize_config!
-  # @see https://github.com/test-kitchen/test-kitchen/issues/1229 Test Kitchen: Issue #1229
-  def finalize_config!(kitchen_instance)
-    kitchen_instance or
-      raise(
-        ::Kitchen::ClientError,
-        "Instance must be provided to #{self}"
-      )
+  private
 
-    @instance = kitchen_instance
-    validate_config!
-    expand_paths!
-    load_needed_dependencies!
-    self
+  def expand_paths!
+    validate_config! if !@validate_config_called
+    super
+  end
+
+  def validate_config!
+    @validate_config_called ||= true
+    super
   end
 end

data/lib/kitchen/terraform/file_path_config_attribute_definer.rb

@@ -42,7 +42,7 @@ class ::Kitchen::Terraform::FilePathConfigAttributeDefiner
       ::Kitchen::Terraform::ConfigAttributeDefiner
         .new(
           attribute: attribute,
-          schema: schema
+          schema: schema,
         )
   end
 end

data/lib/kitchen/terraform/shell_out.rb

@@ -26,28 +26,24 @@ require "mixlib/shellout"
 module ::Kitchen::Terraform::ShellOut
   # Runs a Terraform command.
   #
-  # @option options [::String] :cwd the directory in which to run the command.
+  # @option options [::Hash] :environment environment variables to define when running the command.
+  # @option options [::Integer] :timeout the maximum duration in seconds to run the command.
   # @option options [::Kitchen::Logger] :live_stream a Test Kitchen logger to capture the output from running the
   #   command.
-  # @option options [::Integer] :timeout the maximum duration in seconds to run the command.
+  # @option options [::String] :cwd the directory in which to run the command.
+  # @param client [::String] the pathname of the Terraform client.
   # @param command [::String] the command to run.
-  # @option options [::Hash] :environment environment variables to define when running the command.
   # @param options [::Hash] options which adjust the execution of the command.
   # @raise [::Kitchen::Terraform::Error] if running the command fails.
   # @return [::String] the standard output from running the command.
   # @see https://rubygems.org/gems/mixlib-shellout mixlib-shellout
   # @yieldparam standard_output [::String] the standard output from running the command.
-  def self.run(command:, options:, &block)
-    block ||=
-      lambda do |standard_output:|
-        standard_output
-      end
+  def self.run(client:, command:, options:, &block)
+    block ||= lambda do |standard_output:|
+      standard_output
+    end
 
-    run_shell_out(
-      command: command,
-      options: options,
-      &block
-    )
+    run_shell_out client: client, command: command, options: options, &block
   rescue ::Errno::EACCES,
          ::Errno::ENOENT,
          ::Mixlib::ShellOut::InvalidCommandOption,
@@ -67,11 +63,11 @@ module ::Kitchen::Terraform::ShellOut
   end
 
   # @api private
-  def self.run_shell_out(command:, options:)
+  def self.run_shell_out(client:, command:, options:)
     yield(standard_output: ::Mixlib::ShellOut.new(
-            "terraform #{command}",
+            "#{client} #{command}",
             options.merge(
-              environment: {"TF_IN_AUTOMATION" => "true", "TF_WARN_OUTPUT_ERRORS" => "1"}.merge(
+              environment: { "TF_IN_AUTOMATION" => "true", "TF_WARN_OUTPUT_ERRORS" => "1" }.merge(
                 options.fetch(:environment) do
                   {}
                 end

data/lib/kitchen/terraform/version.rb

@@ -72,7 +72,7 @@ module ::Kitchen::Terraform::Version
 
     # @api private
     def value
-      self.value = ::Gem::Version.new "4.3.0" if not @value
+      self.value = ::Gem::Version.new "4.4.0" if not @value
       @value
     end
 

data/lib/kitchen/verifier/terraform.rb

@@ -106,31 +106,12 @@ module Kitchen
       # @return [self]
       def finalize_config!(kitchen_instance)
         super kitchen_instance
-        configure_inspec_connection_options
-        configure_inspec_miscellaneous_options
-      end
-
-      private
-
-      def configure_inspec_connection_options
-        @inspec_options.merge! transport_connection_options
+        @inspec_options.merge! "color" => config_color
 
-        @inspec_options
-          .store(
-            "connection_timeout",
-            @inspec_options.delete("timeout")
-          )
+        self
       end
 
-      def configure_inspec_miscellaneous_options
-        @inspec_options.merge!(
-          "color" => config_color,
-          "distinct_exit" => false,
-          "sudo" => false,
-          "sudo_command" => "sudo -E",
-          "sudo_options" => "",
-        )
-      end
+      private
 
       def load_outputs
         instance.driver.retrieve_outputs do |outputs:|
@@ -140,12 +121,8 @@ module Kitchen
 
       def initialize(configuration = {})
         init_config configuration
-        @inspec_options = {}
+        @inspec_options = { "distinct_exit" => false }
         @outputs = {}
-        @transport_attributes = [
-          :compression, :compression_level, :connection_retries, :connection_retry_sleep, :connection_timeout,
-          :keepalive, :keepalive_interval, :max_wait_until_ready,
-        ]
       end
 
       def inspec_profile_path
@@ -176,16 +153,6 @@ module Kitchen
         ::Kitchen::Terraform::InSpecOptionsMapper.new(system: system).map options: @inspec_options.dup
       end
 
-      def transport_connection_options
-        ::Kitchen::Util.stringified_hash(
-          instance.transport.diagnose.select do |key|
-            @transport_attributes.include? key
-          end.tap do |options|
-            options.store :timeout, options.fetch(:connection_timeout)
-          end
-        )
-      end
-
       def verify(system:)
         ::Kitchen::Terraform::System
           .new(mapping: system)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Aaron Lane
@@ -61,22 +61,8 @@ cert_chain:
   XAjP/LERlXAwM+NCUycJw7BZMn7L2wIdnq6Le1rL6VJS17CZt2heuRtsF+3g0egR
   x97GmUumeM67PGeVodlIV65tdXrdlqKlHcE=
   -----END CERTIFICATE-----
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-04-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,19 +106,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: middleman
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: middleman-autoprefixer
   requirement: !ruby/object:Gem::Requirement
@@ -190,33 +176,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mini_racer
+  name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: pry-coolline
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +217,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -293,56 +293,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: inspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: inspec
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -389,6 +403,7 @@ files:
 - lib/kitchen/terraform/command/version.rb
 - lib/kitchen/terraform/config_attribute.rb
 - lib/kitchen/terraform/config_attribute/backend_configurations.rb
+- lib/kitchen/terraform/config_attribute/client.rb
 - lib/kitchen/terraform/config_attribute/color.rb
 - lib/kitchen/terraform/config_attribute/command_timeout.rb
 - lib/kitchen/terraform/config_attribute/lock.rb
@@ -452,7 +467,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Terraform >= 0.11.4, < 0.12.0
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Test Kitchen plugins for testing Terraform configuration