kitchen-terraform 3.3.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f583f33eb358a79ac661e3e108e4d236f7fe4f303f9022947efb8a83b05cb1b2
-  data.tar.gz: 32fcb9bb51b28bb1a806d9137055edc6a27adc668906da9e4d3cbc1e0fc81daf
+  metadata.gz: 5921183f754b305ec9a7858690b3fca108721241bbff30dd4ce36b2768d5a985
+  data.tar.gz: 5b66ac4f0369e0287cd23cdb3ee5a5322a59e64dd40bb6a5dc1b0e0f42a8393a
 SHA512:
-  metadata.gz: c45754dc6cf770e90a5cf9ba2d1e664a19b3495c14a1ecb60283feac045cf0cfef916b5246a79f1f8f3b008c6e5a4ff32801465ce6ed1b056af06b465a3784be
-  data.tar.gz: 66af7f6b159e36b97c1c5c331dd1409b2a9143471c0be43e506a401836acfb1904fd6e8b8fb2dfae8d107d9953f395ceaef6ca2091a32319eeacc0c092b8b06e
+  metadata.gz: 1b1cb8ec7d383ebee037e69062fc5494bc4c730b6dbbbb53056fade27472258284bd0b13bfd53b2e171d04e032b42723bb89a4df22c911ccb7ceacca9e7fc1b8
+  data.tar.gz: d6561c34bcae17b877cc62c520e3dd3495c75c3c107ee5f657db9ecaf41b16c55e6f45a8770e7092ac35b5fed2f4d0fc77a56490da2e875f50bfe0735a933df3

data/README.md

@@ -9,7 +9,7 @@
 [![Build status][build-status-shield]][build-status]
 [![Test coverage][test-coverage-shield]][test-coverage]
 [![Maintainability][maintainability-shield]][maintainability]
-[![Dependencies][gemnasium-shield]][gemnasium]
+[![Dependencies][hakiri-shield]][hakiri]
 
 [![Gitter chat][gitter-shield]][gitter]
 
@@ -19,7 +19,7 @@ which enable a system to use Test Kitchen to converge a
 state with [InSpec][inspec] controls.
 
 As Kitchen-Terraform integrates several distinctive technologies in a
-nontrivial manner, reviewing the documenation of each of the
+nontrivial manner, reviewing the documentation of each of the
 aforementioned products is strongly encouraged.
 
 ## Installation
@@ -34,7 +34,7 @@ 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`.
+`>= 0.11.4, < 0.12.0`.
 
 [tfenv] can be used to manage versions of Terraform on the system.
 
@@ -48,7 +48,7 @@ Installation instructions can be found in the
 
 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`.
+the interval of `>= 2.3, < 2.6`.
 
 [rbenv] can be used to manage versions of Ruby on the system.
 
@@ -75,7 +75,7 @@ the semantic versioning of the Ruby gem.
 source "https://rubygems.org/" do
   gem(
     "kitchen-terraform",
-    "~> 3.1"
+    "~> 4.0"
   )
 end
 ```
@@ -103,7 +103,7 @@ example.
 > Installing Kitchen-Terraform with RubyGems
 
 ```sh
-gem install kitchen-terraform --version 3.1.0
+gem install kitchen-terraform --version 4.0.0
 ```
 
 This approach is not recommended as it requires more effort to install
@@ -141,11 +141,10 @@ which utilizes the [Docker provider][docker-provider].
 
 The test system is assumed to be running Ubuntu 17.04.
 
-Kitchen-Terraform and its dependencies are assumed to have been
-installed on the test system as described in the
-[Installation](#installation) section.
+Terraform, Ruby, and Bundler are assumed to have been installed on the
+test system as described in the [Installation](#installation) section.
 
-The [Docker Community Editiion][docker-community-edition] is assumed to
+The [Docker Community Edition][docker-community-edition] is assumed to
 have been installed on the test system.
 
 The working directory on the test system is assumed to contain a
@@ -157,8 +156,8 @@ hierarchy of files comprising the following blocks.
 .
 ├── .kitchen.yml
 ├── Gemfile
-├── Gemfile.lock
 ├── main.tf
+├── outputs.tf
 └── test
     └── integration
         └── example
@@ -167,6 +166,14 @@ hierarchy of files comprising the following blocks.
             └── inspec.yml
 ```
 
+> Gemfile
+
+```ruby
+source "https://rubygems.org/"
+
+gem 'kitchen-terraform'
+```
+
 > ./.kitchen.yml (Test Kitchen configuration)
 
 ```yaml
@@ -176,16 +183,15 @@ driver:
 provisioner:
   name: terraform
 
-transport:
-  name: ssh
-  password: root
-
 verifier:
   name: terraform
-  groups:
+  systems:
     - name: container
+      backend: ssh
+      hosts_output: container_hostname
+      password: root
       port: 2222
-      username: root
+      user: root
 
 platforms:
   - name: ubuntu
@@ -222,6 +228,15 @@ resource "docker_container" "ubuntu" {
 }
 ```
 
+> ./outputs.tf
+
+```hcl
+output "container_hostname" {
+  description = "The hostname of the container."
+  value       = "127.0.0.1"
+}
+```
+
 > ./test/integration/example/inspec.yml
 
 ```yaml
@@ -253,6 +268,7 @@ and verify that the container is running Ubuntu.
 > Verifying with Kitchen-Terraform
 
 ```sh
+$ bundle install
 $ bundle exec kitchen test
 -----> Starting Kitchen...
 ...
@@ -267,7 +283,7 @@ $$$$$$ Running command `terraform apply...`
        Finished converging <example-ubuntu>...
 ...
 -----> Verifying <example-ubuntu>...
-       Verifying host 'localhost' of group 'container'
+       Verifying host 'localhost' of system 'container'
 ...
   ✔  operating_system: the operating system is Ubuntu
 ...
@@ -345,8 +361,9 @@ Kitchen-Terraform is maintained by New Context.
 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
+
+[build-status-shield]: https://img.shields.io/travis/newcontext-oss/kitchen-terraform.svg
+[build-status]: https://travis-ci.com/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
@@ -356,19 +373,19 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 [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
-[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
+[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
+[hakiri-shield]: https://hakiri.io/github/newcontext-oss/kitchen-terraform/master.svg
+[hakiri]: https://hakiri.io/github/newcontext-oss/kitchen-terraform/
+[gitter-shield]: https://img.shields.io/gitter/room/kitchen-terraform/Lobby.svg
 [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-shield]: https://api.codeclimate.com/v1/badges/73d4a2280a30e680bac4/maintainability
 [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-
@@ -387,7 +404,7 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 [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-shield]: https://api.codeclimate.com/v1/badges/73d4a2280a30e680bac4/test_coverage
 [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

data/lib/kitchen/driver/terraform.rb

@@ -97,7 +97,7 @@ end
 # ===== Destroying the Terraform State
 #
 #   terraform destroy \
-#     -force \
+#     -auto-approve \
 #     -lock=<lock> \
 #     -lock-timeout=<lock_timeout>s \
 #     -input=false \
@@ -182,6 +182,13 @@ end
 class ::Kitchen::Driver::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::Color
@@ -204,35 +211,6 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
 
   include ::Kitchen::Terraform::Configurable
 
-  # This method queries for the names of the action methods which must be run in serial via a shared mutex.
-  #
-  # If the version satisfies the requirement of ~> 3.3 then no names are returned.
-  #
-  # If the version satisfies the requirement of >= 4 then +:create+, +:converge+, +:setup+, and +:destroy+ are returned.
-  #
-  # @param version [::Kitchen::Terraform::Version] the version to compare against the requirements.
-  # @return [::Array<Symbol>] the action method names.
-  def self.serial_actions(version: ::Kitchen::Terraform::Version.new)
-    version
-      .if_satisfies requirement: ::Gem::Requirement.new("~> 3.3") do
-        no_parallel_for
-      end
-
-    version
-      .if_satisfies requirement: ::Gem::Requirement.new(">= 4") do
-        super()
-          .empty? and
-          no_parallel_for(
-            :create,
-            :converge,
-            :setup,
-            :destroy
-          )
-      end
-
-    super()
-  end
-
   # 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.
   #
@@ -246,8 +224,12 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
     apply_run_apply
     ::Kitchen::Terraform::Command::Output
       .run(
-        duration: config_command_timeout,
-        logger: logger,
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          },
         &block
       )
   end
@@ -300,8 +282,12 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
               ::Kitchen::Terraform::ShellOut
                 .run(
                   command: "version",
-                  duration: 600,
-                  logger: logger
+                  options:
+                    {
+                      cwd: ::Dir.pwd,
+                      live_stream: logger,
+                      timeout: 600
+                    }
                 )
           )
       )
@@ -328,10 +314,13 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
             "#{parallelism_flag} " \
             "-refresh=true " \
             "#{variables_flags} " \
-            "#{variable_files_flags} " \
-            "#{root_module_directory}",
-        duration: config_command_timeout,
-        logger: logger
+            "#{variable_files_flags}",
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   end
 
@@ -339,9 +328,13 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   def apply_run_get
     ::Kitchen::Terraform::ShellOut
       .run(
-        command: "get -update #{root_module_directory}",
-        duration: config_command_timeout,
-        logger: logger
+        command: "get -update",
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   end
 
@@ -354,10 +347,13 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
             "-check-variables=true " \
             "#{color_flag} " \
             "#{variables_flags} " \
-            "#{variable_files_flags} " \
-            "#{root_module_directory}",
-        duration: config_command_timeout,
-        logger: logger
+            "#{variable_files_flags}",
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   end
 
@@ -392,10 +388,13 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
             "-get=true " \
             "-get-plugins=true " \
             "#{plugin_directory_flag} " \
-            "-verify-plugins=true " \
-            "#{root_module_directory}",
-        duration: config_command_timeout,
-        logger: logger
+            "-verify-plugins=true",
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   end
 
@@ -405,7 +404,7 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
       .run(
         command:
           "destroy " \
-            "-force " \
+            "-auto-approve " \
             "#{lock_flag} " \
             "#{lock_timeout_flag} " \
             "-input=false " \
@@ -413,10 +412,13 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
             "#{parallelism_flag} " \
             "-refresh=true " \
             "#{variables_flags} " \
-            "#{variable_files_flags} " \
-            "#{root_module_directory}",
-        duration: config_command_timeout,
-        logger: logger
+            "#{variable_files_flags}",
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   end
 
@@ -436,10 +438,13 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
             "-get=true " \
             "-get-plugins=true " \
             "#{plugin_directory_flag} " \
-            "-verify-plugins=true " \
-            "#{root_module_directory}",
-        duration: config_command_timeout,
-        logger: logger
+            "-verify-plugins=true",
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   end
 
@@ -448,8 +453,12 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
     ::Kitchen::Terraform::ShellOut
       .run(
         command: "workspace delete kitchen-terraform-#{instance_name}",
-        duration: config_command_timeout,
-        logger: logger
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   end
 
@@ -458,8 +467,12 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
     ::Kitchen::Terraform::ShellOut
       .run(
         command: "workspace select default",
-        duration: config_command_timeout,
-        logger: logger
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   end
 
@@ -500,15 +513,23 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
     ::Kitchen::Terraform::ShellOut
       .run(
         command: "workspace select kitchen-terraform-#{instance_name}",
-        duration: config_command_timeout,
-        logger: logger
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   rescue ::Kitchen::Terraform::Error
     ::Kitchen::Terraform::ShellOut
       .run(
         command: "workspace new kitchen-terraform-#{instance_name}",
-        duration: config_command_timeout,
-        logger: logger
+        options:
+          {
+            cwd: config_root_module_directory,
+            live_stream: logger,
+            timeout: config_command_timeout
+          }
       )
   end