kitchen-terraform 6.1.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8549ab850779ffc15ccb46e62033077103d76ccc0a57b87ee30dd8de88838b70
-  data.tar.gz: c7f65d4ef1e3f37e7e1cd1d73e48b294517d5911292a787350749f7ef9a99d41
+  metadata.gz: ebbc4dbd4906a3a96739eed20a5c1bfa39d7934a62802fc06d23055fc54bb1a9
+  data.tar.gz: 345d17157bd83fbc657914873df6e1b6f4df6af1b03ae85c1fcf320ab31824d7
 SHA512:
-  metadata.gz: daa80765cdb58cd956a4b42aee2c9bc86f40172bd349fdbb683727f6d3ac925b9347c4e22c9b5c89b62ebc8d8ff771e2ee0140dbd496407ac1910193918eb4a6
-  data.tar.gz: 33401e979b8f07aacfbcf206b9b9c721d08641920d0178334485a7c1a8359269552db38400886175c15a8c0f4dab1e3f88a277bbd1e1c06f52d44681cdb01d86
+  metadata.gz: 60ef5b80c2d9ced1e2c07fc68033410cb5765eeafac822ce6b7544cfc1723838536b2447165a2d5c30a4685efc242b30dfcff77ce54bd7da4708aee3bc2f0590
+  data.tar.gz: 18db0e062e63d602f896cf1c3f3cdd82d7a1da8f4db63dfc58ee8e263d083ab3267d789a529d463473aa91fa52f1ccfe5352b135f96f825baa4d74b28738fda7

data/README.md

@@ -6,17 +6,16 @@
 [![Gem downloads version][gem-downloads-version-shield]][kitchen-terraform-gem]
 [![Gem downloads total][gem-downloads-total-shield]][kitchen-terraform-gem]
 
-[![Kitchen tests workflow][kitchen-tests-workflow-shield]][kitchen-tests-workflow]
-[![RSpec tests workflow][rspec-tests-workflow-shield]][rspec-tests-workflow]
+[![Delivery][delivery-shield]][delivery-workflow]
+[![Pages Build and Deployment][pages-build-deployment-shield]][pages-build-deployment-workflow]
 [![Code coverage][code-coverage-shield]][code-coverage]
 [![Maintainability][maintainability-shield]][maintainability]
 [![Technical debt][technical-debt-shield]][technical-debt]
-[![Dependencies][hakiri-shield]][hakiri]
 
 [![Gitter chat][gitter-shield]][gitter]
 
-Kitchen-Terraform provides a set of [Kitchen][kitchen] plugins
-which enable the use of Kitchen to converge a [Terraform][terraform]
+Kitchen-Terraform provides a set of [Test Kitchen][test-kitchen] plugins
+which enable the use of Test Kitchen to converge a [Terraform][terraform]
 configuration and verify the resulting infrastructure systems with
 [InSpec][inspec] controls.
 
@@ -73,20 +72,28 @@ the semantic versioning of the Ruby gem.
 
 > Defining Kitchen-Terraform as a dependency for Bundler in a Gemfile
 
+---
+
 ```ruby
 source "https://rubygems.org/" do
-  gem "kitchen-terraform", "~> 5.7"
+  gem "kitchen-terraform", "~> 7.0"
 end
 ```
 
+---
+
 Second, run the following command.
 
 > Installing Kitchen-Terraform with Bundler
 
+---
+
 ```sh
 bundle install
 ```
 
+---
+
 The preceding command will create a `Gemfile.lock` comprising a list
 of the resolved Ruby gem dependencies.
 
@@ -101,10 +108,14 @@ example.
 
 > Installing Kitchen-Terraform with RubyGems
 
+---
+
 ```sh
-gem install kitchen-terraform --version 6.1.0
+gem install kitchen-terraform --version 7.0.1
 ```
 
+---
+
 This approach is not recommended as it requires more effort to install
 the gem in a manner that is reproducible and free of dependency
 conflicts.
@@ -124,25 +135,34 @@ Ed25519-type SSH keys.
 
 ## Usage
 
+A familiarity with [Test Kitchen][test-kitchen] workflows and commands is required to use Kitchen-Terraform.
+
 ### Configuration
 
-Kitchen-Terraform provides three Test Kitchen plugins which must be
+Kitchen-Terraform provides four Test Kitchen plugins which must be
 configured in a
-[Kitchen configuration file][kitchen-configuration-file] in
+[Test Kitchen configuration file][kitchen-configuration-file] in
 order to successfully test Terraform configuration.
 
-The [Terraform driver][terraform-driver] manages the state of the
-Terraform root module.
+The [Terraform driver][terraform-driver] is the bridge between Test
+Kitchen and Terraform. It manages the [state][terraform-state] of the
+Terraform root module under test by shelling out and running Terraform commands.
 
-The [Terraform provisioner][terraform-provisioner] uses the Terraform
-driver to apply changes to the Terraform state.
+The [Terraform provisioner][terraform-provisioner] applies changes to
+the Terraform state based on the configuration of the root module.
 
-The [Terraform verifier][terraform-verifier] uses InSpec to verify the
-Terraform state.
+The [Terraform transport][terraform-transport] is responsible for the
+integration with the Terraform CLI.
+
+The [Terraform verifier][terraform-verifier] utilizes InSpec to verify
+the behaviour and state of resources in the Terraform state.
 
 More information can be found in the
 [Ruby gem documentation][ruby-gem-documentation].
 
+The `kitchen doctor` command can be used to validate the system and the
+configuration file.
+
 ### Caveats
 
 Versions of Terraform in the 0.11 series may cause `kitchen test` to
@@ -159,7 +179,7 @@ Several tutorials are available on the
 
 The integration tests for Kitchen-Terraform can also be viewed as
 examples of how it works. The
-[integration test Kitchen configuration file][int-kitchen-config]
+[integration test Test Kitchen configuration file][int-kitchen-config]
 and the [integration test directory][test-directory] provide several
 functional examples which exercise various features of
 Kitchen-Terraform.
@@ -226,9 +246,6 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 
 <!-- Markdown links and image definitions -->
 
-[appveyor-build-status-shield]: https://ci.appveyor.com/api/projects/status/8d7t014gij5grk5r/branch/master?svg=true
-[appveyor-build-status]: https://ci.appveyor.com/project/aaron-lane/kitchen-terraform/branch/master
-[bundler-getting-started]: https://bundler.io/#getting-started
 [bundler-in-depth]: https://bundler.io/gemfile.html
 [bundler]: https://bundler.io/index.html#getting-started
 [changelog]: https://github.com/newcontext-oss/kitchen-terraform/blob/master/CHANGELOG.md
@@ -236,37 +253,30 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 [code-coverage]: https://codeclimate.com/github/newcontext-oss/kitchen-terraform/
 [contributing-document]: https://github.com/newcontext-oss/kitchen-terraform/blob/master/CONTRIBUTING.md
 [contributors]: https://github.com/newcontext-oss/kitchen-terraform/graphs/contributors
-[docker]: https://www.docker.com/
-[docker-community-edition]: https://store.docker.com/editions/community/docker-ce-server-ubuntu
-[docker-provider]: https://www.terraform.io/docs/providers/docker/index.html
+[copado-github]: https://github.com/CopadoSolutions
+[copado-linkedin]: https://www.linkedin.com/company/copado-solutions-s.l
+[copado-twitter]: https://twitter.com/CopadoSolutions
+[copado]: https://copado.com/
+[delivery-shield]: https://github.com/newcontext-oss/kitchen-terraform/actions/workflows/delivery.yml/badge.svg
+[delivery-workflow]: https://github.com/newcontext-oss/kitchen-terraform/actions/workflows/delivery.yml
 [gem-downloads-total-shield]: https://img.shields.io/gem/dt/kitchen-terraform.svg
 [gem-downloads-version-shield]: https://img.shields.io/gem/dtv/kitchen-terraform.svg
 [gem-version-shield]: https://img.shields.io/gem/v/kitchen-terraform.svg
 [gitter-shield]: https://img.shields.io/gitter/room/kitchen-terraform/Lobby.svg
 [gitter]: https://gitter.im/kitchen-terraform/Lobby
-[hakiri-shield]: https://hakiri.io/github/newcontext-oss/kitchen-terraform/master.svg
-[hakiri]: https://hakiri.io/github/newcontext-oss/kitchen-terraform/
-[inspec]: https://www.inspec.io/
+[inspec]: https://community.chef.io/tools/chef-inspec
 [int-kitchen-config]: https://github.com/newcontext-oss/kitchen-terraform/blob/master/kitchen.yml
-[issue-271]: https://github.com/newcontext-oss/kitchen-terraform/issues/271
-[kitchen]: http://kitchen.ci/index.html
 [kitchen-configuration-file]: https://docs.chef.io/config_yml_kitchen.html
 [kitchen-terraform-gem]: https://rubygems.org/gems/kitchen-terraform
 [kitchen-terraform-logo]: https://raw.githubusercontent.com/newcontext-oss/kitchen-terraform/master/assets/logo.png
 [kitchen-terraform-tutorials]: https://newcontext-oss.github.io/kitchen-terraform/tutorials/
-[kitchen-tests-workflow]: https://github.com/newcontext-oss/kitchen-terraform/actions/workflows/kitchen-tests.yml
-[kitchen-tests-workflow-shield]: https://github.com/newcontext-oss/kitchen-terraform/actions/workflows/kitchen-tests.yml/badge.svg
 [license]: https://github.com/newcontext-oss/kitchen-terraform/blob/master/LICENSE
 [maintainability-shield]: https://img.shields.io/codeclimate/maintainability-percentage/newcontext-oss/kitchen-terraform.svg
 [maintainability]: https://codeclimate.com/github/newcontext-oss/kitchen-terraform/
-[copado-github]: https://github.com/CopadoSolutions
-[copado-linkedin]: https://www.linkedin.com/company/copado-solutions-s.l
-[copado-twitter]: https://twitter.com/CopadoSolutions
-[copado]: https://copado.com/
+[pages-build-deployment-shield]: https://github.com/newcontext-oss/kitchen-terraform/actions/workflows/pages/pages-build-deployment/badge.svg
+[pages-build-deployment-workflow]: https://github.com/newcontext-oss/kitchen-terraform/actions/workflows/pages/pages-build-deployment
 [rbenv]: https://github.com/rbenv/rbenv
 [rbnacl-installation]: https://github.com/crypto-rb/rbnacl/tree/v4.0.2#installation
-[rspec-tests-workflow]: https://github.com/newcontext-oss/kitchen-terraform/actions/workflows/rspec-tests.yml
-[rspec-tests-workflow-shield]: https://github.com/newcontext-oss/kitchen-terraform/actions/workflows/rspec-tests.yml/badge.svg
 [ruby-branches]: https://www.ruby-lang.org/en/downloads/branches/
 [ruby-gem-documentation]: http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/
 [ruby-gems-what-is]: http://guides.rubygems.org/ruby-gems-what-is/index.html
@@ -275,11 +285,14 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 [rubygems-installing-gems]: http://guides.rubygems.org/rubygems-basics/#rubygems-installing-gems
 [technical-debt-shield]: https://img.shields.io/codeclimate/tech-debt/newcontext-oss/kitchen-terraform.svg
 [technical-debt]: https://codeclimate.com/github/newcontext-oss/kitchen-terraform/
-[terraform-cli]: https://www.terraform.io/docs/commands/index.html
+[terraform-cli]: https://developer.hashicorp.com/terraform/cli/commands
 [terraform-driver]: http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/Kitchen/Driver/Terraform
 [terraform-install]: https://www.terraform.io/intro/getting-started/install.html
 [terraform-provisioner]: http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/Kitchen/Provisioner/Terraform
+[terraform-state]: https://developer.hashicorp.com/terraform/language/state
+[terraform-transport]: http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/Kitchen/Transport/Terraform
 [terraform-verifier]: http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/Kitchen/Verifier/Terraform
 [terraform]: https://www.terraform.io/
 [test-directory]: https://github.com/newcontext-oss/kitchen-terraform/tree/master/test
+[test-kitchen]: http://kitchen.ci/
 [tfenv]: https://github.com/kamatama41/tfenv

data/lib/kitchen/driver/terraform.rb

@@ -32,6 +32,7 @@ require "kitchen/terraform/configurable"
 require "kitchen/terraform/driver/create"
 require "kitchen/terraform/driver/destroy"
 require "kitchen/terraform/version_verifier"
+require "kitchen/transport/terraform"
 require "rubygems"
 require "shellwords"
 
@@ -44,9 +45,9 @@ module Kitchen
   # @see http://www.rubydoc.info/gems/test-kitchen/Kitchen/Driver
   module Driver
 
-    # The driver is the bridge between Test Kitchen and Terraform. It manages the
-    # {https://www.terraform.io/docs/state/index.html state} of the Terraform root module by shelling out and running
-    # Terraform commands.
+    # The Terraform driver is the bridge between Test Kitchen and Terraform. It manages the
+    # {https://developer.hashicorp.com/terraform/language/state state} of the Terraform root module under test by
+    # shelling out and running Terraform commands.
     #
     # === Commands
     #
@@ -76,6 +77,8 @@ module Kitchen
     #
     # ==== client
     #
+    # driver.client is deprecated; use transport.client instead.
+    #
     # {include:Kitchen::Terraform::ConfigAttribute::Client}
     #
     # ==== color
@@ -84,6 +87,8 @@ module Kitchen
     #
     # ==== command_timeout
     #
+    # driver.command_timeout is deprecated; use transport.command_timeout instead.
+    #
     # {include:Kitchen::Terraform::ConfigAttribute::CommandTimeout}
     #
     # ==== lock
@@ -104,6 +109,8 @@ module Kitchen
     #
     # ==== root_module_directory
     #
+    # driver.root_module_directory is deprecated; use transport.root_module_directory instead.
+    #
     # {include:Kitchen::Terraform::ConfigAttribute::RootModuleDirectory}
     #
     # ==== variable_files
@@ -135,20 +142,15 @@ module Kitchen
     class Terraform < ::Kitchen::Driver::Base
       kitchen_driver_api_version 2
 
-      no_parallel_for(
-        :create,
-        :converge,
-        :setup,
-        :destroy
-      )
-
       include ::Kitchen::Terraform::ConfigAttribute::BackendConfigurations
 
       include ::Kitchen::Terraform::ConfigAttribute::Client
+      deprecate_config_for :client, "use transport.client instead"
 
       include ::Kitchen::Terraform::ConfigAttribute::Color
 
       include ::Kitchen::Terraform::ConfigAttribute::CommandTimeout
+      deprecate_config_for :command_timeout, "use transport.command_timeout instead"
 
       include ::Kitchen::Terraform::ConfigAttribute::Lock
 
@@ -159,6 +161,7 @@ module Kitchen
       include ::Kitchen::Terraform::ConfigAttribute::PluginDirectory
 
       include ::Kitchen::Terraform::ConfigAttribute::RootModuleDirectory
+      deprecate_config_for :root_module_directory, "use transport.root_module_directory instead"
 
       include ::Kitchen::Terraform::ConfigAttribute::VariableFiles
 
@@ -168,13 +171,21 @@ module Kitchen
 
       include ::Kitchen::Terraform::Configurable
 
+      attr_reader :transport
+
       # Creates a Test Kitchen instance by initializing the working directory and creating a test workspace.
       #
-      # @param _state [Hash] the mutable instance and driver state.
+      # @param state [Hash] the mutable instance and driver state.
       # @raise [Kitchen::ActionFailed] if the result of the action is a failure.
       # @return [void]
-      def create(_state)
-        create_strategy.call
+      def create(state)
+        ::Kitchen::Terraform::Driver::Create.new(
+          config: config,
+          connection: transport.connection(state),
+          logger: logger,
+          version_requirement: version_requirement,
+          workspace_name: workspace_name,
+        ).call
       rescue => error
         action_failed.call message: error.message
       end
@@ -182,35 +193,63 @@ module Kitchen
       # Destroys a Test Kitchen instance by initializing the working directory, selecting the test workspace,
       # deleting the state, selecting the default workspace, and deleting the test workspace.
       #
-      # @param _state [Hash] the mutable instance and driver state.
+      # @param state [Hash] the mutable instance and driver state.
       # @raise [Kitchen::ActionFailed] if the result of the action is a failure.
       # @return [void]
-      def destroy(_state)
-        destroy_strategy.call
+      def destroy(state)
+        ::Kitchen::Terraform::Driver::Destroy.new(
+          config: config,
+          connection: transport.connection(state.merge(environment: { "TF_WARN_OUTPUT_ERRORS" => "true" })),
+          logger: logger,
+          version_requirement: version_requirement,
+          workspace_name: workspace_name,
+        ).call
       rescue => error
         action_failed.call message: error.message
       end
 
+      # doctor checks the system and configuration for common errors.
+      #
+      # @param state [Hash] the mutable Kitchen instance state.
+      # @return [Boolean] +true+ if any errors are found; +false+ if no errors are found.
+      def doctor(state)
+        errors = false
+
+        deprecated_config.each_pair do |attribute, message|
+          errors = true
+          logger.warn "driver.#{attribute} is deprecated: #{message}"
+        end
+
+        methods.each do |method|
+          next if !method.match? /doctor_config_.*/
+
+          config_error = send method
+          errors = errors || config_error
+        end
+
+        transport_errors = transport.doctor state
+        verifier_errors = instance.verifier.doctor state
+
+        errors || transport_errors || verifier_errors
+      end
+
       # #finalize_config! invokes the super implementation and then initializes the strategies.
       #
       # @param instance [Kitchen::Instance] an associated instance.
       # @raise [Kitchen::ClientError] if the instance is nil.
       # @return [self]
-      # @see Kitchen::Configurable#finalize_config!
       def finalize_config!(instance)
-        super instance
-        self.create_strategy = ::Kitchen::Terraform::Driver::Create.new(
-          config: config,
-          logger: logger,
-          version_requirement: version_requirement,
-          workspace_name: workspace_name,
-        )
-        self.destroy_strategy = ::Kitchen::Terraform::Driver::Destroy.new(
-          config: config,
-          logger: logger,
-          version_requirement: version_requirement,
-          workspace_name: workspace_name,
-        )
+        super
+
+        self.deprecated_config ||= {}
+
+        transport = instance.transport
+
+        self.transport = if ::Kitchen::Transport::Terraform == transport.class
+            transport
+          else
+            ::Kitchen::Transport::Terraform.new(config).finalize_config! instance
+          end
 
         self
       end
@@ -226,7 +265,8 @@ module Kitchen
 
       private
 
-      attr_accessor :action_failed, :create_strategy, :destroy_strategy
+      attr_accessor :action_failed, :deprecated_config
+      attr_writer :transport
     end
   end
 end

data/lib/kitchen/provisioner/terraform.rb

@@ -24,7 +24,7 @@ module Kitchen
   #
   # @see http://www.rubydoc.info/gems/test-kitchen/Kitchen/Provisioner
   module Provisioner
-    # The provisioner applies changes to the Terraform state based on the configuration of the root module.
+    # The Terraform provisioner applies changes to the Terraform state based on the configuration of the root module.
     #
     # === Commands
     #
@@ -80,33 +80,20 @@ module Kitchen
       # @param state [Hash] the mutable instance and provisioner state.
       # @raise [Kitchen::ActionFailed] if the result of the action is a failure.
       def call(state)
-        converge_strategy.call state: state
-      rescue => error
-        action_failed.call message: error.message
-      end
+        driver = instance.driver
+        transport = driver.transport
 
-      # #finalize_config! invokes the super implementation and then initializes the strategy.
-      #
-      # @param instance [Kitchen::Instance] an associated instance.
-      # @raise [Kitchen::ClientError] if the instance is nil.
-      # @return [self]
-      # @see Kitchen::Configurable#finalize_config!
-      def finalize_config!(instance)
-        super instance
-        self.action_failed = ::Kitchen::Terraform::Raise::ActionFailed.new logger: logger
-        self.converge_strategy = ::Kitchen::Terraform::Provisioner::Converge.new(
-          config: instance.driver.send(:config),
+        ::Kitchen::Terraform::Provisioner::Converge.new(
+          config: driver.send(:config),
+          connection: transport.connection({}),
+          debug_connection: transport.connection(logger: ::Kitchen::Terraform::DebugLogger.new(logger)),
           logger: logger,
           version_requirement: version_requirement,
           workspace_name: workspace_name,
-        )
-
-        self
+        ).call state: state
+      rescue => error
+        ::Kitchen::Terraform::Raise::ActionFailed.new(logger: logger).call message: error.message
       end
-
-      private
-
-      attr_accessor :action_failed, :converge_strategy
     end
   end
 end

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

@@ -68,6 +68,20 @@ module Kitchen
         def config_client_default_value
           "terraform"
         end
+
+        # #doctor_config_client validates the client configuration.
+        #
+        # @return [Boolean] +true+ if any errors are found; +false+ if no errors are found.
+        def doctor_config_client
+          errors = false
+
+          if !::TTY::Which.exist? config_client
+            errors = true
+            logger.error "client '#{config_client}' is not executable or does not exist"
+          end
+
+          errors
+        end
       end
     end
   end

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

@@ -579,6 +579,20 @@ module Kitchen
           end,
           schema: ::Kitchen::Terraform::ConfigAttributeContract::Systems.new,
         ).apply config_attribute: self
+
+        # #doctor_config_systems validates the systems configuration.
+        #
+        # @return [Boolean] +true+ if any errors are found; +false+ if no errors are found.
+        def doctor_config_systems
+          errors = false
+
+          if config_systems.empty?
+            errors = true
+            logger.error "systems is empty"
+          end
+
+          errors
+        end
       end
     end
   end

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

@@ -21,7 +21,7 @@ require "kitchen/terraform/config_attribute_contract/hash_of_symbols_and_strings
 module Kitchen
   module Terraform
     module ConfigAttributeType
-      # This modules applies the behaviour of a configuration attribute of type hash of symbols and strings to a module 
+      # This modules applies the behaviour of a configuration attribute of type hash of symbols and strings to a module
       # which must be included by a plugin class.
       #
       # @see http://dry-rb.org/gems/dry-validation/basics/working-with-schemas/ DRY Validation Working With Schemas

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

@@ -22,7 +22,7 @@ require "kitchen/terraform/config_attribute_type"
 module Kitchen
   module Terraform
     module ConfigAttributeType
-      # This module applies the behaviour of a configuration attribute of type integer to a module which must be 
+      # This module applies the behaviour of a configuration attribute of type integer to a module which must be
       # included by a plugin class.
       #
       # @see http://dry-rb.org/gems/dry-validation/basics/working-with-schemas/ DRY Validation Working With Schemas

data/lib/kitchen/terraform/configurable.rb

@@ -39,7 +39,6 @@ module Kitchen
       # @param instance [Kitchen::Instance] an associated instance.
       # @raise [Kitchen::ClientError] if the instance is nil.
       # @return [self]
-      # @see Kitchen::Configurable#finalize_config!
       def finalize_config!(instance)
         super instance
         self.version_requirement = ::Gem::Requirement.new ">= 0.11.4", "< 2.0.0"

data/lib/kitchen/terraform/debug_logger.rb

@@ -20,6 +20,19 @@ module Kitchen
   module Terraform
     # This class delegates to a logger but ensures the debug level is the default level used for logging messages.
     class DebugLogger < ::SimpleDelegator
+      class << self
+        # .new creates a new instance of the class.
+        #
+        # @return [Kitchen::Terraform::DebugLogger]
+        def new(obj)
+          if !obj.kind_of? ::Kitchen::Logger
+            raise ::TypeError, "delegate must be a Kitchen::Logger; recevied #{obj.class}"
+          end
+
+          super
+        end
+      end
+
       # This method overrides the #<< method of the delegate to call #debug.
       #
       # @param message [#to_s] the message to be logged.

data/lib/kitchen/terraform/driver/create.rb

@@ -15,11 +15,11 @@
 # limitations under the License.
 
 require "kitchen"
+require "kitchen/shell_out"
 require "kitchen/terraform/command/init_factory"
 require "kitchen/terraform/command/version"
 require "kitchen/terraform/command/workspace_new"
 require "kitchen/terraform/command/workspace_select"
-require "kitchen/terraform/command_executor"
 require "kitchen/terraform/verify_version"
 require "rubygems"
 
@@ -46,7 +46,7 @@ module Kitchen
       class Create
         # #call executes the action.
         #
-        # @raise [Kitchen::TransientFailure] if a command fails.
+        # @raise [Kitchen::StandardError] if a command fails.
         # @return [self]
         def call
           read_client_version
@@ -60,23 +60,17 @@ module Kitchen
         # #initialize prepares a new instance of the class.
         #
         # @param config [Hash] the configuration of the driver.
+        # @param connection [Kitchen::Terraform::Transport::Connection] a Terraform connection.
         # @param logger [Kitchen::Logger] a logger for logging messages.
         # @param version_requirement [Gem::VersionRequirement] the required version of the Terraform client.
         # @param workspace_name [String] the name of the Terraform workspace to select or to create.
         # @option config [String] :client the pathname of the Terraform client.
         # @return [Kitchen::Terraform::Driver::Create]
-        def initialize(config:, logger:, version_requirement:, workspace_name:)
+        def initialize(config:, connection:, logger:, version_requirement:, workspace_name:)
           self.complete_config = config.to_hash.merge upgrade_during_init: true, workspace_name: workspace_name
+          self.connection = connection
           self.client_version = ::Gem::Version.new "0.0.0"
-          self.command_executor = ::Kitchen::Terraform::CommandExecutor.new(
-            client: complete_config.fetch(:client),
-            logger: logger,
-          )
           self.logger = logger
-          self.options = {
-            cwd: complete_config.fetch(:root_module_directory),
-            timeout: complete_config.fetch(:command_timeout),
-          }
           self.workspace_name = workspace_name
           self.workspace_new = ::Kitchen::Terraform::Command::WorkspaceNew.new config: complete_config
           self.workspace_select = ::Kitchen::Terraform::Command::WorkspaceSelect.new config: complete_config
@@ -92,10 +86,9 @@ module Kitchen
 
         attr_accessor(
           :client_version,
-          :command_executor,
           :complete_config,
+          :connection,
           :logger,
-          :options,
           :verify_version,
           :version,
           :workspace_name,
@@ -105,36 +98,28 @@ module Kitchen
 
         def create_or_select_workspace
           logger.warn "Creating the #{workspace_name} Terraform workspace..."
-          command_executor.run command: workspace_new, options: options do |standard_output|
-          end
+          connection.execute workspace_new
           logger.warn "Finished creating the #{workspace_name} Terraform workspace."
-        rescue ::Kitchen::TransientFailure
+        rescue ::Kitchen::ShellOut::ShellCommandFailed
           select_workspace
         end
 
         def initialize_directory
           logger.warn "Initializing the Terraform working directory..."
-          command_executor.run(
-            command: ::Kitchen::Terraform::Command::InitFactory.new(version: client_version)
-              .build(config: complete_config),
-            options: options,
-          ) do |standard_output|
-          end
+          connection.execute ::Kitchen::Terraform::Command::InitFactory
+                               .new(version: client_version).build(config: complete_config)
           logger.warn "Finished initializing the Terraform working directory."
         end
 
         def read_client_version
           logger.warn "Reading the Terraform client version..."
-          command_executor.run command: version, options: options do |standard_output|
-            self.client_version = ::Gem::Version.new standard_output.slice /Terraform v(\d+\.\d+\.\d+)/, 1
-          end
+          self.client_version = ::Gem::Version.new connection.execute(version).slice /Terraform v(\d+\.\d+\.\d+)/, 1
           logger.warn "Finished reading the Terraform client version."
         end
 
         def select_workspace
           logger.warn "Selecting the #{workspace_name} Terraform workspace..."
-          command_executor.run command: workspace_select, options: options do |standard_output|
-          end
+          connection.execute workspace_select
           logger.warn "Finished selecting the #{workspace_name} Terraform workspace."
         end
       end