kitchen-terraform 5.4.0 → 5.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bcbe6865ba35e28aac3d217a4cbaf18d0655f4f1eb6eeb1da8b3581dfb26a21
-  data.tar.gz: fc281daa77c16e7bcad62f11e939c883245bf5d8fc427692e0bf27eca96da934
+  metadata.gz: 24be7336ab4c7262f10b788ee1a05d46128685d73ad1a68ce01ab3f3249c1f57
+  data.tar.gz: 6049b0f5dc6956fb216179cb6c151e66c2479d9512f818f8b6541296a9642aa9
 SHA512:
-  metadata.gz: 6da972fd9308fe99d628b9d1bd63d3ef0d76a19fcffef5786bb585e925f309ddc13cee7aae79c48c97b6fe819badda2ba8135becf73904bfa2b3b10e5af18253
-  data.tar.gz: d9058ca17bf97bd8bbb1ffc412c26a6dbc8b9a179df591014b937af14ca13b0f2c0dc890ed330d8d8b8fc2be73a7dfa82c2588ba154e4e2179f552a61322541f
+  metadata.gz: '081a8c15bb44c3abf56f31c7dba176bd64ba4205c03e560af0e39d78b4c3294c02dd2829facb7c92f133f360ae2aa92ecb5d46ed195123dbc3d614b1d01107e6'
+  data.tar.gz: ff5019b5f8e9db143108c8f5e49d570f60e7b8cae1ae43f8b3705b2b8def44fc62a9126f70b29762e5c04962196ac22a7bc405b013ea67377ee8d41322b7495e

data/README.md

@@ -1,6 +1,6 @@
 # ![Kitchen-Terraform Logo][kitchen-terraform-logo] Kitchen-Terraform
 
-> Kitchen-Terraform enables verification of Terraform state.
+> Kitchen-Terraform enables verification of infrastructure systems provisioned with Terraform.
 
 [![Gem version][gem-version-shield]][kitchen-terraform-gem]
 [![Gem downloads version][gem-downloads-version-shield]][kitchen-terraform-gem]
@@ -15,10 +15,10 @@
 
 [![Gitter chat][gitter-shield]][gitter]
 
-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.
+Kitchen-Terraform provides a set of [Kitchen][kitchen] plugins
+which enable the use of Kitchen to converge a [Terraform][terraform]
+configuration and verify the resulting infrastructure systems with
+[InSpec][inspec] controls.
 
 As Kitchen-Terraform integrates several distinctive technologies in a
 nontrivial manner, reviewing the documentation of each of the
@@ -36,7 +36,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.11.4, < 0.13.0`.
+`>= 0.11.4, < 0.15.0`.
 
 [tfenv] can be used to manage versions of Terraform on the system.
 
@@ -75,7 +75,7 @@ the semantic versioning of the Ruby gem.
 
 ```ruby
 source "https://rubygems.org/" do
-  gem "kitchen-terraform", "~> 5.4"
+  gem "kitchen-terraform", "~> 5.7"
 end
 ```
 
@@ -102,7 +102,7 @@ example.
 > Installing Kitchen-Terraform with RubyGems
 
 ```sh
-gem install kitchen-terraform --version 5.4.0
+gem install kitchen-terraform --version 5.7.2
 ```
 
 This approach is not recommended as it requires more effort to install
@@ -128,7 +128,7 @@ Ed25519-type SSH keys.
 
 Kitchen-Terraform provides three Test Kitchen plugins which must be
 configured in a
-[Test Kitchen configuration file][test-kitchen-configuration-file] in
+[Kitchen configuration file][kitchen-configuration-file] in
 order to successfully test Terraform configuration.
 
 The [Terraform driver][terraform-driver] manages the state of the
@@ -152,168 +152,18 @@ workaround for this problem is to use
 details about the problem are available in
 [issue #271](issue-271).
 
-### Example
+### Tutorials and Examples
 
-This example demonstrates how to test a simple Terraform configuration
-which utilizes the [Docker provider][docker-provider].
-
-The test system is assumed to be running Ubuntu 17.04.
-
-Terraform, Ruby, and Bundler are assumed to have been installed on the
-test system as described in the [Installation](#installation) section.
-
-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
-hierarchy of files comprising the following blocks.
-
-> Directory hierarchy
-
-```
-.
-├── .kitchen.yml
-├── Gemfile
-├── main.tf
-├── outputs.tf
-└── test
-    └── integration
-        └── example
-            ├── controls
-            │   ├── operating_system.rb
-            └── inspec.yml
-```
-
-> Gemfile
-
-```ruby
-source "https://rubygems.org/"
-
-gem 'kitchen-terraform', '~> 5.1'
-```
-
-> ./kitchen.yml (Test Kitchen configuration)
-
-```yaml
-driver:
-  name: terraform
-
-provisioner:
-  name: terraform
-
-verifier:
-  name: terraform
-  systems:
-    - name: container
-      backend: ssh
-      hosts_output: container_hostname
-      password: root
-      port: 2222
-      user: root
-
-platforms:
-  - name: ubuntu
-
-suites:
-  - name: example
-```
-
-Although Kitchen-Terraform supports multiple versions of Terraform,
-below snippets are compatible with v0.12:
-> ./main.tf
-
-```hcl
-provider "docker" {
-  host = "unix:///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
-  }
-}
-```
-
-> ./outputs.tf
-
-```hcl
-output "container_hostname" {
-  description = "The hostname of the container."
-  value       = "127.0.0.1"
-}
-```
-
-> ./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("cat /etc/os-release").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
-$ bundle install
-$ bundle exec 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 system '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
+Several tutorials are available on the
 [Kitchen-Terraform Tutorials][kitchen-terraform-tutorials] page.
 
+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]
+and the [integration test directory][test-directory] provide several
+functional examples which exercise various features of
+Kitchen-Terraform.
+
 ## Contributing
 
 Kitchen-Terraform thrives on community contributions.
@@ -331,7 +181,8 @@ Information about changes to Kitchen-Terraform can be found in the
 
 ## Maintainers
 
-Kitchen-Terraform is maintained by New Context.
+Kitchen-Terraform is maintained by [community contributors][contributors]
+and New Context.
 
 <img
   alt="New Context logo"
@@ -384,6 +235,7 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 [code-coverage-shield]: https://img.shields.io/codeclimate/coverage/newcontext-oss/kitchen-terraform.svg
 [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
@@ -395,7 +247,10 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 [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/
+[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/
@@ -422,8 +277,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-kitchen-configuration-file]: https://docs.chef.io/config_yml_kitchen.html
-[test-kitchen]: http://kitchen.ci/index.html
+[test-directory]: https://github.com/newcontext-oss/kitchen-terraform/tree/master/test
 [tfenv]: https://github.com/kamatama41/tfenv
 [travis-build-status-shield]: https://img.shields.io/travis/com/newcontext-oss/kitchen-terraform.svg
 [travis-build-status]: https://travis-ci.com/newcontext-oss/kitchen-terraform

data/lib/kitchen/terraform/configurable.rb

@@ -42,7 +42,7 @@ module Kitchen
       # @see Kitchen::Configurable#finalize_config!
       def finalize_config!(instance)
         super instance
-        self.version_requirement = ::Gem::Requirement.new ">= 0.11.4", "< 0.13.0"
+        self.version_requirement = ::Gem::Requirement.new ">= 0.11.4", "< 0.15.0"
         self.workspace_name = "kitchen-terraform-#{::Shellwords.escape instance.name}"
       end
 

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

@@ -76,7 +76,7 @@ module Kitchen
             logger: logger,
           )
           self.logger = logger
-          self.options = { cwd: config.fetch(:root_module_directory), timeout: config.fetch(:command_timeout) }
+          define_options config: config
           self.workspace_name = workspace_name
           self.destroy = ::Kitchen::Terraform::Command::Destroy.new config: config
           self.init = ::Kitchen::Terraform::Command::Init.new config: hash_config
@@ -100,6 +100,7 @@ module Kitchen
         attr_accessor(
           :command_executor,
           :destroy,
+          :destroy_options,
           :init,
           :logger,
           :options,
@@ -119,9 +120,16 @@ module Kitchen
           logger.warn "Finished creating the #{workspace_name} Terraform workspace."
         end
 
+        def define_options(config:)
+          self.options = { cwd: config.fetch(:root_module_directory), timeout: config.fetch(:command_timeout) }
+          self.destroy_options = options.merge(
+            environment: { "LC_ALL" => nil, "TF_IN_AUTOMATION" => "true", "TF_WARN_OUTPUT_ERRORS" => "true" }
+          )
+        end
+
         def destroy_infrastructure
           logger.warn "Destroying the Terraform-managed infrastructure..."
-          command_executor.run command: destroy, options: options do |standard_output:|
+          command_executor.run command: destroy, options: destroy_options do |standard_output:|
           end
           logger.warn "Finished destroying the Terraform-managed infrastructure."
         end

data/lib/kitchen/terraform/inspec_runner.rb

@@ -60,7 +60,14 @@ module Kitchen
         self.host = options.fetch :host do
           ""
         end
+
+        ::Inspec::Plugin::V2::Loader.new.tap do |loader|
+          loader.load_all
+          loader.exit_on_load_error
+        end
+        
         self.runner = ::Inspec::Runner.new options.merge logger: ::Inspec::Log.logger
+
         profile_locations.each do |profile_location|
           runner.add_target profile_location
         end

data/lib/kitchen/terraform/provisioner/converge.rb

@@ -175,7 +175,7 @@ module Kitchen
         def save_outputs(parsed_outputs:, state:)
           logger.warn "Writing the output variables to the Kitchen instance state..."
           outputs_manager.save outputs: parsed_outputs, state: state
-          logger.warn "Finished writing the output varibales to the Kitchen instance state."
+          logger.warn "Finished writing the output variables to the Kitchen instance state."
         end
 
         def save_variables_and_outputs(state:)

data/lib/kitchen/terraform/shell_out.rb

@@ -29,16 +29,17 @@ module Kitchen
       #
       # @param command [String] the command to run.
       # @param logger [Kitchen::Logger] a logger for logging messages.
+      # @param options [Hash] options which adjust the execution of the command.
       # @return [Kitchen::Terraform::CommandExecutor]
       def initialize(command:, logger:, options:)
         self.command = command
         self.logger = logger
         self.shell_out = ::Mixlib::ShellOut.new(
           command,
-          options.merge(
-            environment: { "LC_ALL" => nil, "TF_IN_AUTOMATION" => "true", "TF_WARN_OUTPUT_ERRORS" => "1" },
+          {
+            environment: { "LC_ALL" => nil, "TF_IN_AUTOMATION" => "true" },
             live_stream: logger,
-          )
+          }.merge(options)
         )
       end
 

data/lib/kitchen/terraform/version.rb

@@ -71,7 +71,7 @@ module Kitchen
 
         # @api private
         def value
-          self.value = ::Gem::Version.new "5.4.0" if not @value
+          self.value = ::Gem::Version.new "5.7.2" if not @value
           @value
         end
 

data/lib/kitchen/verifier/terraform.rb

@@ -160,7 +160,7 @@ module Kitchen
       def load_outputs(state:)
         logger.warn "Reading the Terraform output variables from the Kitchen instance state..."
         ::Kitchen::Terraform::OutputsManager.new.load outputs: outputs, state: state
-        logger.warn "Finished reading the Terraform output varibales from the Kitchen instance state."
+        logger.warn "Finished reading the Terraform output variables from the Kitchen instance state."
       end
 
       def profile_locations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.7.2
 platform: ruby
 authors:
 - Aaron Lane
@@ -62,7 +62,7 @@ cert_chain:
   JH4yGDzVEYaZHaohSDcYuGLK6OQylPu7oM75S+TNLWseDIT8bWgQk6NelVjtQQ2Q
   XSbgfu863jyey/0qO01cUo3+iTqzl85cWg==
   -----END CERTIFICATE-----
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -205,145 +205,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: mini_racer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: pry-coolline
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rufo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: reek
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rufo
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 6.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: delegate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
+        version: 0.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
+        version: '0.13'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: inspec
   requirement: !ruby/object:Gem::Requirement
@@ -351,6 +337,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 4.24.26
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 4.24.28
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 4.24.32
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -361,6 +356,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 4.24.26
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 4.24.28
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 4.24.32
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -370,28 +374,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: mixlib-shellout
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -552,7 +542,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- Terraform >= v0.11.4, < v0.13.0
+- Terraform >= v0.11.4, < v0.15.0
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4