kitchen-terraform 5.7.1 → 6.1.0

data/lib/kitchen/terraform/unsupported_client_version_error.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/variables_manager.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/verify_version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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/verify_version_rescue_strategy/permissive.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/verify_version_rescue_strategy/strict.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/verify_version_rescue_strategy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/verify_version_rescue_strategy_factory.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ module Kitchen
 
         # @api private
         def value
-          self.value = ::Gem::Version.new "5.7.1" if not @value
+          self.value = ::Gem::Version.new "6.1.0" if not @value
           @value
         end
 

data/lib/kitchen/terraform/version_verifier.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/version_verifier_strategy/supported.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/version_verifier_strategy/unsupported.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/version_verifier_strategy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/version_verifier_strategy_factory.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/verifier/terraform.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 5.7.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Aaron Lane
@@ -62,36 +62,8 @@ cert_chain:
   JH4yGDzVEYaZHaohSDcYuGLK6OQylPu7oM75S+TNLWseDIT8bWgQk6NelVjtQQ2Q
   XSbgfu863jyey/0qO01cUo3+iTqzl85cWg==
   -----END CERTIFICATE-----
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -204,20 +176,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
@@ -247,75 +233,81 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.16.1
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 6.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
-  name: reek
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: delegate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -386,30 +378,36 @@ dependencies:
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 description: kitchen-terraform is a set of Test Kitchen plugins for testing Terraform
   configuration
 email: kitchen-terraform@newcontext.com
@@ -428,8 +426,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
@@ -459,19 +463,18 @@ files:
 - lib/kitchen/terraform/config_attribute/variables.rb
 - lib/kitchen/terraform/config_attribute/verify_version.rb
 - lib/kitchen/terraform/config_attribute_cacher.rb
+- lib/kitchen/terraform/config_attribute_contract.rb
+- lib/kitchen/terraform/config_attribute_contract/array_of_strings.rb
+- lib/kitchen/terraform/config_attribute_contract/boolean.rb
+- lib/kitchen/terraform/config_attribute_contract/hash_of_symbols_and_strings.rb
+- lib/kitchen/terraform/config_attribute_contract/integer.rb
+- lib/kitchen/terraform/config_attribute_contract/optional_string.rb
+- lib/kitchen/terraform/config_attribute_contract/string.rb
+- lib/kitchen/terraform/config_attribute_contract/systems.rb
 - lib/kitchen/terraform/config_attribute_definer.rb
 - lib/kitchen/terraform/config_attribute_type.rb
 - lib/kitchen/terraform/config_attribute_type/hash_of_symbols_and_strings.rb
 - lib/kitchen/terraform/config_attribute_type/integer.rb
-- lib/kitchen/terraform/config_predicates.rb
-- lib/kitchen/terraform/config_predicates/hash_of_symbols_and_strings.rb
-- lib/kitchen/terraform/config_schemas.rb
-- lib/kitchen/terraform/config_schemas/array_of_strings.rb
-- lib/kitchen/terraform/config_schemas/boolean.rb
-- lib/kitchen/terraform/config_schemas/optional_string.rb
-- lib/kitchen/terraform/config_schemas/string.rb
-- lib/kitchen/terraform/config_schemas/system.rb
-- lib/kitchen/terraform/config_schemas/systems.rb
 - lib/kitchen/terraform/configurable.rb
 - lib/kitchen/terraform/debug_logger.rb
 - lib/kitchen/terraform/deprecating.rb
@@ -532,18 +535,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '2.8'
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- Terraform >= v0.11.4, < v0.15.0
-rubygems_version: 3.0.3
+- Terraform >= v0.11.4, < v2.0.0
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Test Kitchen plugins for testing Terraform configuration

data/lib/kitchen/terraform/config_predicates/hash_of_symbols_and_strings.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2016-2019 New Context, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "dry/logic"
-require "kitchen/terraform/config_predicates"
-
-# Behaviour to provide a configuration attribute predicate for a hash including only symbol keys and string values.
-#
-# This module must be declared as providing predicates and extended in a schema's configuration in order to be used.
-#
-# @see http://dry-rb.org/gems/dry-validation/custom-predicates/ DRY Logic Custom Predicates
-module ::Kitchen::Terraform::ConfigPredicates::HashOfSymbolsAndStrings
-  # A callback to configure an extending schema with this predicate.
-  #
-  # @param schema [Dry::Validation::Schema] the schema to be configured.
-  # @return [self]
-  def self.extended(schema)
-    schema.predicates self
-    self
-  end
-
-  include ::Dry::Logic::Predicates
-
-  predicate :hash_of_symbols_and_strings? do |value|
-    value.kind_of? ::Hash and
-      all_symbols? keys: value.keys and
-      all_strings? values: value.values
-  end
-
-  private_class_method
-
-  # If all keys are symbols then the result is +true+; else the result is +false+.
-  #
-  # @api private
-  # @param keys [Enumerable] keys that must be only symbols
-  # @return [TrueClass, ::FalseClass] the result
-  def self.all_symbols?(keys:)
-    keys
-      .all? do |key|
-      key.kind_of? ::Symbol
-    end
-  end
-
-  # If all values are strings then the result is +true+; else the result is +false+.
-  #
-  # @api private
-  # @param values [Enumerable] values that must be only strings
-  # @return [TrueClass, ::FalseClass] the result
-  def self.all_strings?(values:)
-    values
-      .all? do |value|
-      value.kind_of? ::String
-    end
-  end
-
-  private
-
-  def messages
-    super
-      .merge(
-        en: {
-          errors: {
-            hash_of_symbols_and_strings?: "must be a hash which includes only symbol keys and string values",
-          },
-        },
-      )
-  end
-end

data/lib/kitchen/terraform/config_schemas/array_of_strings.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2016-2019 New Context, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "dry/validation"
-
-module Kitchen
-  module Terraform
-    module ConfigSchemas
-      # A validation schema for a configuration attribute which is an array including only strings.
-      #
-      # @see http://dry-rb.org/gems/dry-validation/basics/working-with-schemas/ DRY Validation Working With Schemas
-      ArrayOfStrings = ::Dry::Validation.Schema do
-        required(:value)
-          .each(
-            :filled?,
-            :str?
-          )
-      end.dup
-
-      ArrayOfStrings.define_singleton_method :to_s do
-        "Kitchen::Terraform::ConfigSchemas::ArrayOfStrings"
-      end
-    end
-  end
-end

data/lib/kitchen/terraform/config_schemas/optional_string.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2016-2019 New Context, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "dry/validation"
-
-module Kitchen
-  module Terraform
-    module ConfigSchemas
-      # A validation schema for a configuration attribute which is an optional string.
-      #
-      # @see http://dry-rb.org/gems/dry-validation/basics/working-with-schemas/ DRY Validation Working With Schemas
-      OptionalString = ::Dry::Validation.Schema do
-        required(:value)
-          .maybe(
-            :str?,
-            :filled?
-          )
-      end.dup
-
-      OptionalString.define_singleton_method :to_s do
-        "Kitchen::Terraform::ConfigSchemas::OptionalString"
-      end
-    end
-  end
-end