kitchen-terraform 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3511bbc6d10c08da856558d9f41949651cb0e38db183909d0f46ae885e6cdc
-  data.tar.gz: dc2fdad8698f10114a5adfce900a60f2d203eef807350d71810a63e1958a8315
+  metadata.gz: 6bed93c8d3edcaa9b632a77af795ef201b1fb3f38851ad1f7b64bccaf0a562e8
+  data.tar.gz: 1276013ec6e8e44701db466c2f1fec4160040c55d2fdeade8b5c9819b3c1dc96
 SHA512:
-  metadata.gz: 378c750cd2ddd73a30b04d3518a0f40d9fa01e4080d5a1014115793a51f999773c056cc46b908ca364e32780975792d77d0982b2d170316a9ec47bc63e043719
-  data.tar.gz: 1fd8130d68184e45c1cffa8ee5fffebdd6bf2364eb24963b92411ed6ad64dc68bf9110b8d3add81bcfa1023df8b90c03b2e649d9b9a53a46321c755d0d934e18
+  metadata.gz: 85a1e4484b097b067041df44ef7a6e1d90ea57734df2e3f0ab45cb07d8a035da4405013ed76fa1928dafc7a65ac27a20877dfee8f933d6ecefd21db1dfbacc92
+  data.tar.gz: 4cbcc7946c975250266fa0dd725a1d8b7e3880929ccb592e30ae1ad1dea79859846c96914cdfd152098319f6024acf69bf6e48bc4cbc1e5d24e053f2c97dce07

data/README.md

@@ -1,76 +1,372 @@
-# ![kitchen-terraform logo](assets/logo.png) kitchen-terraform
+# ![Kitchen-Terraform Logo][kitchen-terraform-logo] Kitchen-Terraform
 
-[![Gem Version](https://badge.fury.io/rb/kitchen-terraform.svg)](https://badge.fury.io/rb/kitchen-terraform)
-[![Code Climate](https://codeclimate.com/github/newcontext-oss/kitchen-terraform/badges/gpa.svg)](https://codeclimate.com/github/newcontext-oss/kitchen-terraform)
-[![Issue Count](https://codeclimate.com/github/newcontext-oss/kitchen-terraform/badges/issue_count.svg)](https://codeclimate.com/github/newcontext-oss/kitchen-terraform)
-[![Build Status Master](https://travis-ci.org/newcontext-oss/kitchen-terraform.svg?branch=master)](https://travis-ci.org/newcontext-oss/kitchen-terraform)
-[![Test Coverage](https://codeclimate.com/github/newcontext-oss/kitchen-terraform/badges/coverage.svg)](https://codeclimate.com/github/newcontext-oss/kitchen-terraform/coverage)
+> Kitchen-Terraform enables verification of Terraform state.
 
-kitchen-terraform is a set of
-[Test Kitchen](http://kitchen.ci/index.html) plugins for testing
-[Terraform configuration](https://www.terraform.io/docs/configuration/index.html)
-.
+[![Gem version][gem-version-shield]][kitchen-terraform-gem]
+[![Gem downloads version][gem-downloads-version-shield]][kitchen-terraform-gem]
+[![Gem downloads total][gem-downloads-total-shield]][kitchen-terraform-gem]
 
-## Requirements
+[![Build status][build-status-shield]][build-status]
+[![Test coverage][test-coverage-shield]][test-coverage]
+[![Maintainability][maintainability-shield]][maintainability]
+[![Dependencies][gemnasium-shield]][gemnasium]
 
-- [Ruby](https://www.ruby-lang.org/en/index.html) **(~> 2.2)**
+[![Gitter chat][gitter-shield]][gitter]
 
-- [Bundler](https://bundler.io/index.html) **(~> 1.12)**
+Kitchen-Terraform provides a set of [Test Kitchen][test-kitchen] plugins
+which enable a system to use Test Kitchen to converge a
+[Terraform][terraform] configuration and verify the resulting Terraform
+state with [InSpec][inspec] controls.
 
-- [Terraform](https://www.terraform.io/index.html)
-  **(>= 0.10.2, < 0.12.0)**
+As Kitchen-Terraform integrates several distinctive technologies in a
+nontrivial manner, reviewing the documenation of each of the
+aforementioned products is strongly encouraged.
 
 ## Installation
 
-kitchen-terraform is packaged as a cryptographically signed
-[Ruby gem](http://guides.rubygems.org/what-is-a-gem/index.html) which
-means it can be
-[installed with Bundler](https://bundler.io/index.html#getting-started).
+### Terraform
+
+Kitchen-Terraform integrates with the
+[Terraform command-line interface][terraform-cli] to implement a Test
+Kitchen workflow for Terraform modules.
+
+Installation instructions can be found in the
+[Terraform: Install Terraform][terraform-install] article.
+
+Kitchen-Terraform supports versions of Terraform in the interval of
+`>= 0.10.2, < 0.12.0`.
+
+[tfenv] can be used to manage versions of Terraform on the system.
+
+### Ruby
+
+Kitchen-Terraform is written in [Ruby][ruby] which requires an
+interpreter to be installed on the system.
+
+Installation instructions can be found in the
+[Ruby: Installing Ruby][ruby-installation] article.
+
+Kitchen-Terraform aims to support all versions of Ruby that are in
+["normal" or "security" maintenance][ruby-branches], which is currently
+the interval of `>= 2.2, < 2.5`.
+
+[rbenv] can be used to manage versions of Ruby on the system.
+
+### Kitchen-Terraform Ruby Gem
+
+Each version of Kitchen-Terraform is published as a
+[Ruby gem][ruby-gems-what-is] to [RubyGems.org][kitchen-terraform-gem]
+which makes them readily available for installation on a system.
+
+#### RubyGems
+
+To install a version of Kitchen-Terraform using the default Ruby package
+manager, RubyGems, run a command like the following example.
+
+> Installing Kitchen-Terraform with RubyGems
+
+```sh
+gem install kitchen-terraform --version 3.1.0
+```
+
+More information can be found in the
+[RubyGems: Installing Gems][rubygems-installing-gems] article.
+
+#### Bundler
 
-### Adding kitchen-terraform to a Terraform project
+[Bundler][bundler] can also be used to manage versions of
+Kitchen-Terraform on the system in a manner that is easily reproducible
+on other systems.
 
-Once Bundler is installed, add kitchen-terraform to the project's
-Gemfile:
+First, create a `Gemfile` with contents like the following example. The
+pessimistic pinning of the version is recommended to benefit from
+the semantic versioning of the Ruby gem.
 
-```rb
+> Defining Kitchen-Terraform as a dependency for Bundler
+
+```ruby
 source "https://rubygems.org/" do
-  gem "kitchen-terraform", "~> 3.0"
+  gem(
+    "kitchen-terraform",
+    "~> 3.1"
+  )
 end
 ```
 
-Then, use Bundler to install the gems:
+Second, run the following command.
+
+> Installing Kitchen-Terraform with Bundler
 
 ```sh
 bundle install
 ```
 
+More information can be found in the
+[Bundler: In Depth][bundler-in-depth] article.
+
 ## Usage
 
-kitchen-terraform provides three Test Kitchen plugins which must be used
-together in the
-[Test Kitchen configuration](https://docs.chef.io/config_yml_kitchen.html)
-in order to successfully test Terraform configuration:
+### Configuration
+
+Kitchen-Terraform provides three Test Kitchen plugins which must be
+configured in a
+[Test Kitchen configuration file][test-kitchen-configuration-file] in
+order to successfully test Terraform configuration.
+
+The [Terraform driver][terraform-driver] manages the state of the
+Terraform root module.
 
-- a [driver](http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/Kitchen/Driver/Terraform)
-  that creates and destroys
-  [Terraform state](https://www.terraform.io/docs/state/index.html);
+The [Terraform provisioner][terraform-provisioner] uses the Terraform
+driver to apply changes to the Terraform state.
 
-- a [provisioner](http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/Kitchen/Provisioner/Terraform)
-  that applies changes to existing Terraform state;
+The [Terraform verifier][terraform-verifier] uses InSpec to verify the
+Terraform state.
 
-- a [verifier](http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/Kitchen/Verifier/Terraform)
-  that verifies the state and behaviour of resources in the Terraform
-  state.
+More information can be found in the
+[Ruby gem documentation][ruby-gem-documentation].
 
-Refer to the [gem documentation](http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/)
-for more information about kitchen-terraform's design and behaviour.
+### Example
 
-Refer to the
-[Getting Started Tutorial](https://newcontext-oss.github.io/kitchen-terraform/tutorials/amazon_provider_ec2.html)
-for a detailed walkthrough of setting up and using kitchen-terraform.
+Assume there is a system which has Kitchen-Terraform and
+[Docker][docker] installed.
 
-Refer to the
-[tutorials](https://newcontext-oss.github.io/kitchen-terraform/tutorials)
-for example Terraform projects using various
-[Terraform providers](https://www.terraform.io/docs/configuration/providers.html)
+Assume the working directory on said system a hierarchy like the
+following examples.
+
+> Directory hierarchy
+
+```
 .
+├── .kitchen.yml
+├── main.tf
+└── test
+    └── integration
+        └── example
+            ├── controls
+            │   ├── operating_system.rb
+            └── inspec.yml
+```
+
+> ./.kitchen.yml
+
+```yaml
+driver:
+  name: terraform
+
+provisioner:
+  name: terraform
+
+transport:
+  name: ssh
+  password: root
+
+verifier:
+  name: terraform
+  groups:
+    - name: container
+      port: 2222
+      username: root
+
+platforms:
+  - name: ubuntu
+
+suites:
+  - name: example
+```
+
+> ./main.tf
+
+```hcl
+provider "docker" {
+  host    = "unix://localhost/var/run/docker.sock"
+}
+
+data "docker_registry_image" "ubuntu" {
+  name = "rastasheep/ubuntu-sshd:latest"
+}
+
+resource "docker_image" "ubuntu" {
+  name          = "${data.docker_registry_image.ubuntu.name}"
+  pull_triggers = ["${data.docker_registry_image.ubuntu.sha256_digest}"]
+}
+
+resource "docker_container" "ubuntu" {
+  image    = "${docker_image.ubuntu.name}"
+  must_run = true
+  name     = "ubuntu_container"
+
+  ports {
+    external = 2222
+    internal = 22
+  }
+}
+```
+
+> ./test/integration/example/inspec.yml
+
+```yaml
+name: example
+```
+
+> ./test/integration/example/controls/operating_system.rb
+
+```ruby
+# frozen_string_literal: true
+
+control "operating_system" do
+  describe "the operating system" do
+    subject do
+      command("lsb_release -a").stdout
+    end
+
+    it "is Ubuntu" do
+      is_expected.to match /Ubuntu/
+    end
+  end
+end
+```
+
+Running the following command would initialize the working directory for
+Terraform, create a Docker container by applying the configuration file,
+and verify that the container is running Ubuntu.
+
+> Verifying with Kitchen-Terraform
+
+```sh
+$ kitchen test
+-----> Starting Kitchen...
+...
+$$$$$$ Running command `terraform init...`
+...
+$$$$$$ Running command `terraform apply...`
+...
+       docker_container.ubuntu: Creation complete after 1s...
+
+       Apply complete! Resources: 2 added, 0 changed, 0 destroyed.
+...
+       Finished converging <example-ubuntu>...
+...
+-----> Verifying <example-ubuntu>...
+       Verifying host 'localhost' of group 'container'
+...
+  ✔  operating_system: the operating system is Ubuntu
+...
+Profile Summary: 1 successful control, 0 control failures, 0 controls skipped
+...
+```
+
+More information can be found on the
+[Kitchen-Terraform Tutorials][kitchen-terraform-tutorials] page.
+
+## Contributing
+
+Kitchen-Terraform thrives on community contributions.
+
+Information about contributing to Kitchen-Terraform can be found in the
+[Contributing document][contributing-document].
+
+## Developing
+
+Pull requests to Kitchen-Terraform are always welcome!
+
+Information about developing Kitchen-Terraform can be found in the
+[Developing document][developing-document].
+
+## Changelog
+
+Kitchen-Terraform adheres to semantic versioning and documents all
+significant changes accordingly.
+
+Information about changes to Kitchen-Terraform can be found in the
+[Changelog][changelog].
+
+## Maintainers
+
+Kitchen-Terraform is maintained by New Context.
+
+<img
+  alt="New Context logo"
+  height="25"
+  src="https://raw.githubusercontent.com/newcontext-oss/kitchen-terraform/master/assets/new_context_logo.png"
+  width="25"> [NewContext.com][new-context]
+
+<img
+  alt="Twitter logo"
+  height="25"
+  src="https://raw.githubusercontent.com/newcontext-oss/kitchen-terraform/master/assets/twitter_logo.png"
+  width="25"> [@NewContext][new-context-twitter]
+
+<img
+  alt="LinkedIn logo"
+  height="23"
+  src="https://raw.githubusercontent.com/newcontext-oss/kitchen-terraform/master/assets/linkedin_logo.png"
+  width="25"> [New Context][new-context-linkedin]
+
+<img
+  alt="GitHub logo"
+  height="25"
+  src="https://raw.githubusercontent.com/newcontext-oss/kitchen-terraform/master/assets/github_logo.png"
+  width="25"> [@NewContext][new-context-github]
+
+<img
+  alt="Email logo"
+  height="16"
+  src="https://raw.githubusercontent.com/newcontext-oss/kitchen-terraform/master/assets/email_logo.png"
+  width="25"> kitchen-terraform@newcontext.com
+
+<img
+  alt="Email logo"
+  height="16"
+  src="https://raw.githubusercontent.com/newcontext-oss/kitchen-terraform/master/assets/email_logo.png"
+  width="25"> info@newcontext.com
+
+## License
+
+Kitchen-Terraform is distributed under the [Apache License][license].
+
+<!-- Markdown links and image definitions -->
+[build-status-shield]: https://img.shields.io/travis/newcontext-oss/kitchen-terraform.svg?style=plastic
+[build-status]: https://travis-ci.org/newcontext-oss/kitchen-terraform
+[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
+[contributing-document]: https://github.com/newcontext-oss/kitchen-terraform/blob/master/CONTRIBUTING.md
+[developing-document]: https://github.com/newcontext-oss/kitchen-terraform/blob/master/DEVELOPING.md
+[docker]: https://www.docker.com/
+[gem-downloads-total-shield]: https://img.shields.io/gem/dt/kitchen-terraform.svg?style=plastic
+[gem-downloads-version-shield]: https://img.shields.io/gem/dtv/kitchen-terraform.svg?style=plastic
+[gem-version-shield]: https://img.shields.io/gem/v/kitchen-terraform.svg?style=plastic
+[gemnasium-shield]: https://img.shields.io/gemnasium/newcontext-oss/kitchen-terraform.svg?style=plastic
+[gemnasium]: https://beta.gemnasium.com/projects/github.com/newcontext-oss/kitchen-terraform
+[gitter-shield]: https://img.shields.io/gitter/room/kitchen-terraform/Lobby.svg?style=plastic
+[gitter]: https://gitter.im/kitchen-terraform/Lobby
+[inspec]: https://www.inspec.io/
+[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/
+[license]: https://github.com/newcontext-oss/kitchen-terraform/blob/master/LICENSE
+[maintainability-shield]: https://img.shields.io/codeclimate/maintainability/newcontext-oss/kitchen-terraform.svg?style=plastic
+[maintainability]: https://codeclimate.com/github/newcontext-oss/kitchen-terraform/maintainability
+[new-context-github]: https://github.com/newcontext
+[new-context-linkedin]: https://www.linkedin.com/company/-new-context-
+[new-context-twitter]: https://twitter.com/newcontext
+[new-context]: https://newcontext.com/
+[rbenv]: https://github.com/rbenv/rbenv
+[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
+[ruby-installation]: https://www.ruby-lang.org/en/documentation/installation/
+[ruby]: https://www.ruby-lang.org/en/
+[rubygems-installing-gems]: http://guides.rubygems.org/rubygems-basics/#rubygems-installing-gems
+[terraform-cli]: https://www.terraform.io/docs/commands/index.html
+[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-verifier]: http://www.rubydoc.info/github/newcontext-oss/kitchen-terraform/Kitchen/Verifier/Terraform
+[terraform]: https://www.terraform.io/
+[test-coverage-shield]: https://img.shields.io/codeclimate/c/newcontext-oss/kitchen-terraform.svg?style=plastic
+[test-coverage]: https://codeclimate.com/github/newcontext-oss/kitchen-terraform/test_coverage
+[test-kitchen-configuration-file]: https://docs.chef.io/config_yml_kitchen.html
+[test-kitchen]: http://kitchen.ci/index.html
+[tfenv]: https://github.com/kamatama41/tfenv

data/lib/kitchen/driver/terraform.rb

@@ -14,11 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry/monads"
-require "json"
 require "kitchen/driver/base"
 require "kitchen/errors"
 require "kitchen/terraform/client_version_verifier"
+require "kitchen/terraform/command/output"
 require "kitchen/terraform/config_attribute/backend_configurations"
 require "kitchen/terraform/config_attribute/color"
 require "kitchen/terraform/config_attribute/command_timeout"
@@ -174,10 +173,6 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
 
   no_parallel_for
 
-  include ::Dry::Monads::Either::Mixin
-
-  include ::Dry::Monads::Try::Mixin
-
   include ::Kitchen::Terraform::ConfigAttribute::BackendConfigurations
 
   include ::Kitchen::Terraform::ConfigAttribute::Color
@@ -201,41 +196,35 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # Applies changes to the state by selecting the test workspace, updating the dependency modules, validating the root
   # module, applying the state changes, and retrieving the state output.
   #
-  # @return [::Dry::Monads::Either] the result of the action.
-  def apply
-    apply_run_workspace_select_instance
-      .bind do
-        apply_run_get
-      end
-      .bind do
-        apply_run_validate
-      end
-      .bind do
-        apply_run_apply
-      end
-      .bind do
-        apply_run_output
-      end
+  # @raise [::Kitchen::Terraform::Error] if one of the steps fails.
+  # @return [void]
+  # @yieldparam output [::String] the state output.
+  def apply(&block)
+    run_workspace_select_instance
+    apply_run_get
+    apply_run_validate
+    apply_run_apply
+    ::Kitchen::Terraform::Command::Output
+      .run(
+        duration: config_command_timeout,
+        logger: logger,
+        &block
+      )
   end
 
   # Creates a Test Kitchen instance by initializing the working directory and creating a test workspace.
   #
   # @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_run_init
-      .bind do
-        create_run_workspace_new_instance
-          .or do
-            create_run_workspace_select_instance
-          end
-      end
-      .or do |failure|
-        raise(
-          ::Kitchen::ActionFailed,
-          failure
-        )
-      end
+    run_workspace_select_instance
+  rescue ::Kitchen::Terraform::Error => error
+    raise(
+      ::Kitchen::ActionFailed,
+      error.message
+    )
   end
 
   # Destroys a Test Kitchen instance by initializing the working directory, selecting the test workspace,
@@ -243,54 +232,44 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   #
   # @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_run_init
-      .bind do
-        destroy_run_workspace_select_instance
-          .or do
-            destroy_run_workspace_new_instance
-          end
-      end
-      .bind do
-        destroy_run_destroy
-      end
-      .bind do
-        destroy_run_workspace_select_default
-      end
-      .bind do
-        destroy_run_workspace_delete_instance
-      end
-      .or do |failure|
-        raise(
-          ::Kitchen::ActionFailed,
-          failure
-        )
-      end
+    run_workspace_select_instance
+    destroy_run_destroy
+    destroy_run_workspace_select_default
+    destroy_run_workspace_delete_instance
+  rescue ::Kitchen::Terraform::Error => error
+    raise(
+      ::Kitchen::ActionFailed,
+      error.message
+    )
   end
 
   # Verifies that the Terraform version available to the driver is supported.
   #
   # @raise [::Kitchen::UserError] if the version is not supported.
+  # @return [void]
   def verify_dependencies
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command: "version",
-        logger: logger
-      )
-      .bind do |output|
+    logger
+      .warn(
         ::Kitchen::Terraform::ClientVersionVerifier
           .new
-          .verify version_output: output
-      end
-      .or do |failure|
-        raise(
-          ::Kitchen::UserError,
-          failure
-        )
-      end
-      .bind do |verified_client_version|
-        logger.warn verified_client_version
-      end
+          .verify(
+            version_output:
+              ::Kitchen::Terraform::ShellOut
+                .run(
+                  command: "version",
+                  duration: 600,
+                  logger: logger
+                )
+          )
+      )
+  rescue ::Kitchen::Terraform::Error => error
+    raise(
+      ::Kitchen::UserError,
+      error.message
+    )
   end
 
   private
@@ -326,35 +305,6 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
       )
   end
 
-  # @api private
-  def apply_run_output
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command: "output -json",
-        duration: config_command_timeout,
-        logger: logger
-      )
-      .bind do |output|
-        Try ::JSON::ParserError do
-          ::JSON.parse output
-        end
-          .to_either
-          .or do |error|
-            Left "Parsing Terraform output as JSON failed: #{error}"
-          end
-      end
-  end
-
-  # @api private
-  def apply_run_workspace_select_instance
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command: "workspace select kitchen-terraform-#{instance.name}",
-        duration: config_command_timeout,
-        logger: logger
-      )
-  end
-
   # @api private
   def apply_run_validate
     ::Kitchen::Terraform::ShellOut
@@ -395,26 +345,6 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
       )
   end
 
-  # @api private
-  def create_run_workspace_new_instance
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command: "workspace new kitchen-terraform-#{instance.name}",
-        duration: config_command_timeout,
-        logger: logger
-      )
-  end
-
-  # @api private
-  def create_run_workspace_select_instance
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command: "workspace select kitchen-terraform-#{instance.name}",
-        duration: config_command_timeout,
-        logger: logger
-      )
-  end
-
   # @api private
   def destroy_run_destroy
     ::Kitchen::Terraform::ShellOut
@@ -463,37 +393,39 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   def destroy_run_workspace_delete_instance
     ::Kitchen::Terraform::ShellOut
       .run(
-        command: "workspace delete kitchen-terraform-#{instance.name}",
+        command: "workspace delete kitchen-terraform-#{instance_name}",
         duration: config_command_timeout,
         logger: logger
       )
   end
 
   # @api private
-  def destroy_run_workspace_new_instance
+  def destroy_run_workspace_select_default
     ::Kitchen::Terraform::ShellOut
       .run(
-        command: "workspace new kitchen-terraform-#{instance.name}",
+        command: "workspace select default",
         duration: config_command_timeout,
         logger: logger
       )
   end
 
   # @api private
-  def destroy_run_workspace_select_default
+  def instance_name
+    @instance_name ||= instance.name
+  end
+
+  # @api private
+  def run_workspace_select_instance
     ::Kitchen::Terraform::ShellOut
       .run(
-        command: "workspace select default",
+        command: "workspace select kitchen-terraform-#{instance_name}",
         duration: config_command_timeout,
         logger: logger
       )
-  end
-
-  # @api private
-  def destroy_run_workspace_select_instance
+  rescue ::Kitchen::Terraform::Error
     ::Kitchen::Terraform::ShellOut
       .run(
-        command: "workspace select kitchen-terraform-#{instance.name}",
+        command: "workspace new kitchen-terraform-#{instance_name}",
         duration: config_command_timeout,
         logger: logger
       )