kitchen-terraform 5.5.0 → 5.8.0

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/verify_version.rb

@@ -27,13 +27,12 @@ module Kitchen
     class VerifyVersion
       # #call invokes the verification.
       #
-      # @param command [Kitchen::Terraform::Command::Version] the version command.
-      # @param options [Hash] options for running the command.
+      # @param version [Gem::Version] the Terraform client version.
       # @raise [Kitchen::ActionFailed] if the verification fails.
       # @return [self]
-      def call(command:, options:)
+      def call(version:)
         logger.warn start_message
-        run_version_and_verify command: command, options: options
+        version_verifier.verify version: version
         logger.warn finish_message
       rescue ::Kitchen::Terraform::UnsupportedClientVersionError
         rescue_strategy.call
@@ -49,8 +48,7 @@ module Kitchen
       # @option config [Boolean] :verify_version a toggle of strict or permissive verification of support for the
       #   version of the Terraform client.
       # @return [Kitchen::Terraform::VerifyVersion]
-      def initialize(command_executor:, config:, logger:, version_requirement:)
-        self.command_executor = command_executor
+      def initialize(config:, logger:, version_requirement:)
         self.finish_message = "Finished verifying the Terraform client version."
         self.logger = logger
         self.rescue_strategy = ::Kitchen::Terraform::VerifyVersionRescueStrategyFactory.new(
@@ -64,22 +62,12 @@ module Kitchen
       private
 
       attr_accessor(
-        :command_executor,
         :finish_message,
         :logger,
-        :options,
         :rescue_strategy,
         :start_message,
         :version_verifier
       )
-
-      def run_version_and_verify(command:, options:)
-        logger.warn "Reading the Terraform client version..."
-        command_executor.run command: command, options: options do |standard_output:|
-          logger.warn "Finished reading the Terraform client version."
-          version_verifier.verify version: ::Gem::Version.new(standard_output.slice(/Terraform v(\d+\.\d+\.\d+)/, 1))
-        end
-      end
     end
   end
 end

data/lib/kitchen/terraform/version.rb

@@ -71,7 +71,7 @@ module Kitchen
 
         # @api private
         def value
-          self.value = ::Gem::Version.new "5.5.0" if not @value
+          self.value = ::Gem::Version.new "5.8.0" 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.5.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Aaron Lane
@@ -62,7 +62,7 @@ cert_chain:
   JH4yGDzVEYaZHaohSDcYuGLK6OQylPu7oM75S+TNLWseDIT8bWgQk6NelVjtQQ2Q
   XSbgfu863jyey/0qO01cUo3+iTqzl85cWg==
   -----END CERTIFICATE-----
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2021-05-19 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.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.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
@@ -438,8 +428,14 @@ files:
 - lib/kitchen/terraform/command/destroy.rb
 - lib/kitchen/terraform/command/get.rb
 - lib/kitchen/terraform/command/init.rb
+- lib/kitchen/terraform/command/init/post_zero_fifteen_zero.rb
+- lib/kitchen/terraform/command/init/pre_zero_fifteen_zero.rb
+- lib/kitchen/terraform/command/init_factory.rb
 - lib/kitchen/terraform/command/output.rb
 - lib/kitchen/terraform/command/validate.rb
+- lib/kitchen/terraform/command/validate/post_zero_fifteen_zero.rb
+- lib/kitchen/terraform/command/validate/pre_zero_fifteen_zero.rb
+- lib/kitchen/terraform/command/validate_factory.rb
 - lib/kitchen/terraform/command/version.rb
 - lib/kitchen/terraform/command/workspace_delete.rb
 - lib/kitchen/terraform/command/workspace_new.rb
@@ -552,8 +548,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- Terraform >= v0.11.4, < v0.14.0
-rubygems_version: 3.0.3
+- Terraform >= v0.11.4, < v1.1.0
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Test Kitchen plugins for testing Terraform configuration