kitchen-terraform 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef9e77a8ac8243cd10180f14702d8c496bdc343a9d781819ec6beca036f6e05
-  data.tar.gz: c09c903e660799f72db02456358c0fd4447dbe846901d54b234de2b4324eabb8
+  metadata.gz: e2c1885da5297ea917cc40b1051430ce2cb273d155b6ada091e6f9cf7a6efadf
+  data.tar.gz: fd52cc7bd0d9a572ff4c9d329759508b101255be6bc4ab6ebf1a6ad27d7ffc7d
 SHA512:
-  metadata.gz: 0f6672ac40da3df640e4971962c47f9604d91502d0f07e8b5f075c753def38c3607e5480919aebb74165c149b52410daff6c0c651c2db2e8c92ded5d95a5eddf
-  data.tar.gz: e998e5fa5997e6198244df8e350cd40c420202269dbc118863e781417efe91a9175350de6785fefe71901b6c202b6ebcd13a1ca36151adae420e6d3c1832417d
+  metadata.gz: fc75638d21b316bd4cc2b50af1e3f859e9f2e2c9ec37199004b5b5cb0cd431444eb0f4c43b6e16ad933a1fd435ce759422c83b4ec42fdfa8c91f09120efca68a
+  data.tar.gz: 7e80c7ccc2fc267fa926171943e330dfad0b6e4919b58e58a463b2cbc27a84c2e1b6a0edbcbe5eac713854a994204ab8b76780bba4c8e37551e14aa0faf55b93

data/lib/kitchen/driver/terraform.rb

@@ -222,16 +222,14 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
     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
-      )
+    ::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.
@@ -273,97 +271,76 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
   # @raise [::Kitchen::UserError] if the version is not supported.
   # @return [void]
   def verify_dependencies
-    logger
-      .warn(
-        ::Kitchen::Terraform::ClientVersionVerifier
-          .new
-          .verify(
-            version_output:
-              ::Kitchen::Terraform::ShellOut
-                .run(
-                  command: "version",
-                  options:
-                    {
-                      cwd: ::Dir.pwd,
-                      live_stream: logger,
-                      timeout: 600
-                    }
-                )
-          )
-      )
-  rescue ::Kitchen::Terraform::Error => error
-    raise(
-      ::Kitchen::UserError,
-      error.message
+    logger.warn ::Kitchen::Terraform::ClientVersionVerifier.new.verify(
+      version_output: ::Kitchen::Terraform::ShellOut.run(
+        command: "version",
+        options: {
+          cwd: ::Dir.pwd,
+          live_stream: logger,
+          timeout: 600,
+        },
+      ),
     )
+  rescue ::Kitchen::Terraform::Error => error
+    raise ::Kitchen::UserError, error.message
   end
 
   private
 
   # @api private
   def apply_run_apply
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command:
-          "apply " \
-            "#{lock_flag} " \
-            "#{lock_timeout_flag} " \
-            "-input=false " \
-            "-auto-approve=true " \
-            "#{color_flag} " \
-            "#{parallelism_flag} " \
-            "-refresh=true " \
-            "#{variables_flags} " \
-            "#{variable_files_flags}",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "apply " \
+      "#{lock_flag} " \
+      "#{lock_timeout_flag} " \
+      "-input=false " \
+      "-auto-approve=true " \
+      "#{color_flag} " \
+      "#{parallelism_flag} " \
+      "-refresh=true " \
+      "#{variables_flags} " \
+      "#{variable_files_flags}",
+      options: {
+        cwd: config_root_module_directory,
+        live_stream: logger,
+        timeout: config_command_timeout,
+      },
+    )
   end
 
   # @api private
   def apply_run_get
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command: "get -update",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "get -update",
+      options: {
+        cwd: config_root_module_directory,
+        live_stream: logger,
+        timeout: config_command_timeout,
+      },
+    )
   end
 
   # @api private
   def apply_run_validate
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command:
-          "validate " \
-            "-check-variables=true " \
-            "#{color_flag} " \
-            "#{variables_flags} " \
-            "#{variable_files_flags}",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "validate " \
+      "-check-variables=true " \
+      "#{color_flag} " \
+      "#{variables_flags} " \
+      "#{variable_files_flags}",
+      options: {
+        cwd: config_root_module_directory,
+        live_stream: logger,
+        timeout: config_command_timeout,
+      },
+    )
   end
 
   # @api private
   def backend_configurations_flags
-    config_backend_configurations
-      .map do |key, value|
-        "-backend-config=#{::Shellwords.escape "#{key}=#{value}"}"
-      end
-      .join " "
+    config_backend_configurations.map do |key, value|
+      "-backend-config=\"#{::Shellwords.escape key}=#{::Shellwords.escape value}\""
+    end.join " "
   end
 
   # api private
@@ -373,112 +350,94 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
 
   # @api private
   def create_run_init
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command:
-          "init " \
-            "-input=false " \
-            "#{lock_flag} " \
-            "#{lock_timeout_flag} " \
-            "#{color_flag} " \
-            "-upgrade " \
-            "-force-copy " \
-            "-backend=true " \
-            "#{backend_configurations_flags} " \
-            "-get=true " \
-            "-get-plugins=true " \
-            "#{plugin_directory_flag} " \
-            "-verify-plugins=true",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "init " \
+      "-input=false " \
+      "#{lock_flag} " \
+      "#{lock_timeout_flag} " \
+      "#{color_flag} " \
+      "-upgrade " \
+      "-force-copy " \
+      "-backend=true " \
+      "#{backend_configurations_flags} " \
+      "-get=true " \
+      "-get-plugins=true " \
+      "#{plugin_directory_flag} " \
+      "-verify-plugins=true",
+      options: {
+        cwd: config_root_module_directory,
+        live_stream: logger,
+        timeout: config_command_timeout,
+      },
+    )
   end
 
   # @api private
   def destroy_run_destroy
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command:
-          "destroy " \
-            "-auto-approve " \
-            "#{lock_flag} " \
-            "#{lock_timeout_flag} " \
-            "-input=false " \
-            "#{color_flag} " \
-            "#{parallelism_flag} " \
-            "-refresh=true " \
-            "#{variables_flags} " \
-            "#{variable_files_flags}",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "destroy " \
+      "-auto-approve " \
+      "#{lock_flag} " \
+      "#{lock_timeout_flag} " \
+      "-input=false " \
+      "#{color_flag} " \
+      "#{parallelism_flag} " \
+      "-refresh=true " \
+      "#{variables_flags} " \
+      "#{variable_files_flags}",
+      options: {
+        cwd: config_root_module_directory,
+        live_stream: logger,
+        timeout: config_command_timeout,
+      },
+    )
   end
 
   # @api private
   def destroy_run_init
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command:
-          "init " \
-            "-input=false " \
-            "#{lock_flag} " \
-            "#{lock_timeout_flag} " \
-            "#{color_flag} " \
-            "-force-copy " \
-            "-backend=true " \
-            "#{backend_configurations_flags} " \
-            "-get=true " \
-            "-get-plugins=true " \
-            "#{plugin_directory_flag} " \
-            "-verify-plugins=true",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "init " \
+      "-input=false " \
+      "#{lock_flag} " \
+      "#{lock_timeout_flag} " \
+      "#{color_flag} " \
+      "-force-copy " \
+      "-backend=true " \
+      "#{backend_configurations_flags} " \
+      "-get=true " \
+      "-get-plugins=true " \
+      "#{plugin_directory_flag} " \
+      "-verify-plugins=true",
+      options: {
+        cwd: config_root_module_directory,
+        live_stream: logger,
+        timeout: config_command_timeout,
+      },
+    )
   end
 
   # @api private
   def destroy_run_workspace_delete_instance
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command: "workspace delete kitchen-terraform-#{instance_name}",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "workspace delete #{workspace_name}",
+      options: {
+        cwd: config_root_module_directory,
+        live_stream: logger,
+        timeout: config_command_timeout,
+      },
+    )
   end
 
   # @api private
   def destroy_run_workspace_select_default
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command: "workspace select default",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
-  end
-
-  # @api private
-  def instance_name
-    @instance_name ||= instance.name
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "workspace select default",
+      options: {
+        cwd: config_root_module_directory,
+        live_stream: logger,
+        timeout: config_command_timeout,
+      },
+    )
   end
 
   # @api private
@@ -498,9 +457,11 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
 
   # @api private
   def plugin_directory_flag
-    config_plugin_directory and
-      "-plugin-dir=#{::Shellwords.escape config_plugin_directory}" or
+    if config_plugin_directory
+      "-plugin-dir=\"#{::Shellwords.shelljoin ::Shellwords.shellsplit config_plugin_directory}\""
+    else
       ""
+    end
   end
 
   # @api private
@@ -510,44 +471,40 @@ class ::Kitchen::Driver::Terraform < ::Kitchen::Driver::Base
 
   # @api private
   def run_workspace_select_instance
-    ::Kitchen::Terraform::ShellOut
-      .run(
-        command: "workspace select kitchen-terraform-#{instance_name}",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "workspace select #{workspace_name}",
+      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}",
-        options:
-          {
-            cwd: config_root_module_directory,
-            live_stream: logger,
-            timeout: config_command_timeout
-          }
-      )
+    ::Kitchen::Terraform::ShellOut.run(
+      command: "workspace new #{workspace_name}",
+      options: {
+        cwd: config_root_module_directory,
+        live_stream: logger,
+        timeout: config_command_timeout,
+      },
+    )
   end
 
   # @api private
   def variable_files_flags
-    config_variable_files
-      .map do |path|
-        "-var-file=#{::Shellwords.escape path}"
-      end
-      .join " "
+    config_variable_files.map do |path|
+      "-var-file=\"#{::Shellwords.shelljoin ::Shellwords.shellsplit path}\""
+    end.join " "
   end
 
   # @api private
   def variables_flags
-    config_variables
-      .map do |key, value|
-        "-var=#{::Shellwords.escape "#{key}=#{value}"}"
-      end
-      .join " "
+    config_variables.map do |key, value|
+      "-var=\"#{::Shellwords.escape key}=#{::Shellwords.join ::Shellwords.split value}\""
+    end.join " "
+  end
+
+  def workspace_name
+    @workspace_name ||= "kitchen-terraform-#{::Shellwords.escape instance.name}"
   end
 end

data/lib/kitchen/terraform/inspec_options_mapper.rb

@@ -27,6 +27,8 @@ class ::Kitchen::Terraform::InSpecOptionsMapper
     system_keys.&(options_keys).each do |key|
       options.store system_to_options.dig(key), system.fetch(key)
     end
+
+    options
   end
 
   private

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.3" if not @value
+      self.value = ::Gem::Version.new "4.0.4" if not @value
       @value
     end
 

data/lib/kitchen/verifier/terraform.rb

@@ -127,10 +127,6 @@ module Kitchen
         )
       end
 
-      def configure_inspec_system_options(system:)
-        ::Kitchen::Terraform::InSpecOptionsMapper.new(system: system).map options: @inspec_options
-      end
-
       def load_outputs(kitchen_state:)
         @outputs = ::Kitchen::Util.stringified_hash Hash kitchen_state.fetch :kitchen_terraform_outputs
       rescue ::KeyError => key_error
@@ -173,6 +169,10 @@ module Kitchen
         @system_hosts_resolver ||= ::Kitchen::Terraform::SystemHostsResolver.new outputs: @outputs
       end
 
+      def system_inspec_options(system:)
+        ::Kitchen::Terraform::InSpecOptionsMapper.new(system: system).map options: @inspec_options.dup
+      end
+
       def transport_connection_options
         ::Kitchen::Util.stringified_hash(
           instance.transport.diagnose.select do |key|
@@ -184,12 +184,11 @@ module Kitchen
       end
 
       def verify(system:)
-        configure_inspec_system_options system: system
         ::Kitchen::Terraform::System
           .new(mapping: system)
           .resolve_attrs(system_attrs_resolver: system_attrs_resolver)
           .resolve_hosts(system_hosts_resolver: system_hosts_resolver)
-          .verify(inspec_options: @inspec_options, inspec_profile_path: inspec_profile_path)
+          .verify(inspec_options: system_inspec_options(system: system), inspec_profile_path: inspec_profile_path)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Aaron Lane
@@ -57,8 +57,22 @@ cert_chain:
   BVaY4PA1920fVWRcwrNEzxNhWvlAlNCU9d63OhVIo1rD46E5/+fuWunp4ZyEJHIX
   lema55cN
   -----END CERTIFICATE-----
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -311,6 +325,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: tty-which
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -505,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Terraform >= 0.11.4, < 0.12.0
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Test Kitchen plugins for testing Terraform configuration