kitchen-terraform 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c1a4aa48257c95ba2c104c02546843d43fc16f67c8f95b7c930da4867dbd4c
-  data.tar.gz: 53b09b266f62d36e1f7695fa1851c39f186db01f384cf655bd0e4d26ed714115
+  metadata.gz: a48b699368e638e6b55874c18b1880c0e44d86f07bd04efacc00e62f3ec70fe3
+  data.tar.gz: 79bb729336e5fa7344e586c169d3b11e0d177ff66f5a31d9cdab2f3fe1b4e0b4
 SHA512:
-  metadata.gz: 8787b576af2b5d0c5875ed8bb5938b562ac0e51757707d01c1405b6221745de57b00b601d93d304a71bd28c479c43ecdae9c0ff8f9060bd206e1963804388d14
-  data.tar.gz: 663ec394575f7c7bc6046f1df57b1400a417a3c5df5eeae28db84afb771e9887d67e5458c1460b8bf844eca9865bead513ab7347284ef679542724d4687889c4
+  metadata.gz: 3c141bf3e1608c70eca5a0b3c9b2ef7970f3eadca210eb8f4b07e13a85556d2ec35de82cc1fdb20eada1e62eca7bb5cc8c15d49697a648279891d571b1fc3a47
+  data.tar.gz: 2340ce65d820b817a5c63ace5d60825d802a3ff9e7af646bbca6e484022015f439e16d22583e7603160130bd9d3d8b177d387c286a4ff884d8da6df4e3a6428b

data/lib/kitchen/driver/terraform.rb

@@ -212,24 +212,15 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   include ::Kitchen::Terraform::Configurable
 
   # 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.
+  # module, and applying the state changes.
   #
   # @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(
-      options: {
-        cwd: config_root_module_directory,
-        live_stream: logger,
-        timeout: config_command_timeout,
-      },
-      &block
-    )
   end
 
   # Creates a Test Kitchen instance by initializing the working directory and creating a test workspace.
@@ -266,6 +257,19 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
     )
   end
 
+  # Retrieves the Terraform state outputs.
+  #
+  # @raise [::Kitchen::Terraform::Error] if the retrieval fails.
+  # @return [void]
+  # @yieldparam output [::String] the state output.
+  def retrieve_outputs(&block)
+    ::Kitchen::Terraform::Command::Output.run(
+      options: {
+        cwd: config_root_module_directory, live_stream: logger, timeout: config_command_timeout,
+      }, &block
+    )
+  end
+
   # Verifies that the Terraform version available to the driver is supported.
   #
   # @raise [::Kitchen::UserError] if the version is not supported.

data/lib/kitchen/provisioner/terraform.rb

@@ -66,10 +66,6 @@ end
 #     [-var-file=<variable_files.first>...] \
 #     <directory>
 #
-# ===== Retrieving the Terraform Output
-#
-#   terraform output -json
-#
 # === Configuration Attributes
 #
 # The provisioner has no configuration attributes, but the +provisioner+ mapping must be declared with the plugin name
@@ -90,18 +86,10 @@ class ::Kitchen::Provisioner::Terraform < ::Kitchen::Provisioner::Base
 
   # Converges a Test Kitchen instance.
   #
-  # @param state [::Hash] the mutable instance and provisioner state.
+  # @param _state [::Hash] the mutable instance and provisioner state.
   # @raise [::Kitchen::ActionFailed] if the result of the action is a failure.
-  def call(state)
-    instance
-      .driver
-      .apply do |output:|
-        state
-          .store(
-            :kitchen_terraform_outputs,
-            output
-          )
-      end
+  def call(_state)
+    instance.driver.apply
   rescue ::Kitchen::Terraform::Error => error
     raise(
       ::Kitchen::ActionFailed,

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

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 require "json"
+require "kitchen"
 require "kitchen/terraform/command"
 require "kitchen/terraform/error"
 require "kitchen/terraform/shell_out"
@@ -57,7 +58,7 @@ module ::Kitchen::Terraform::Command::Output
     # @api private
     def handle_kitchen_terraform(error:)
       /no\\ outputs\\ defined/.match ::Regexp.escape error.to_s or raise error
-      yield output: {}
+      yield outputs: {}
     end
 
     # @api private
@@ -67,7 +68,7 @@ module ::Kitchen::Terraform::Command::Output
           command: "output -json",
           options: options,
         ) do |standard_output:|
-        yield output: ::JSON.parse(standard_output)
+        yield outputs: ::JSON.parse(standard_output)
       end
     end
   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.0.5" if not @value
+      self.value = ::Gem::Version.new "4.0.6" if not @value
       @value
     end
 

data/lib/kitchen/verifier/terraform.rb

@@ -37,8 +37,13 @@ module Kitchen
     #
     # ==== kitchen verify
     #
-    # A Test Kitchen instance is verified by iterating through the systems and executing the associated InSpec controls
-    # against the hosts of each system.
+    # A Kitchen instance is verified by iterating through the systems and executing the associated InSpec controls
+    # against the hosts of each system. The outputs of the Terraform state are retrieved and exposed as attributes to
+    # the InSpec controls.
+    #
+    # ===== Retrieving the Terraform Output
+    #
+    #   terraform output -json
     #
     # === Configuration Attributes
     #
@@ -74,11 +79,11 @@ module Kitchen
       #
       # @example
       #   `kitchen verify suite-name`
-      # @param kitchen_state [::Hash] the mutable instance and verifier state.
+      # @param _kitchen_state [::Hash] the mutable instance and verifier state.
       # @raise [::Kitchen::ActionFailed] if the result of the action is a failure.
       # @return [void]
-      def call(kitchen_state)
-        load_outputs kitchen_state: kitchen_state
+      def call(_kitchen_state)
+        load_outputs
         config_systems.each do |system|
           verify system: system
         end
@@ -127,12 +132,10 @@ module Kitchen
         )
       end
 
-      def load_outputs(kitchen_state:)
-        @outputs = ::Kitchen::Util.stringified_hash Hash kitchen_state.fetch :kitchen_terraform_outputs
-      rescue ::KeyError => key_error
-        raise ::Kitchen::Terraform::Error,
-              "Loading Terraform outputs from the Kitchen state failed; this implies that the " \
-              "Kitchen-Terraform provisioner has not successfully converged\n#{key_error}"
+      def load_outputs
+        instance.driver.retrieve_outputs do |outputs:|
+          @outputs.replace ::Kitchen::Util.stringified_hash outputs
+        end
       end
 
       def initialize(configuration = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Aaron Lane
@@ -57,7 +57,7 @@ cert_chain:
   BVaY4PA1920fVWRcwrNEzxNhWvlAlNCU9d63OhVIo1rD46E5/+fuWunp4ZyEJHIX
   lema55cN
   -----END CERTIFICATE-----
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler