kitchen-terraform 4.9.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a813450fa1afe86fd62985090cc347738e315da3b75e58c6912aad618f143a28
-  data.tar.gz: d63d2b9af931d6a85964b5073b7aa429341e3dab952e99acf2444461d14ff1d1
+  metadata.gz: 23cdadc08458f2760b38239da6ddbf6b395c2b5804f81a87f80a44c76e619685
+  data.tar.gz: ab73966fb25e94f3472edf2cb36340f2a12f20397bd8fead5017f78cbc1f38f3
 SHA512:
-  metadata.gz: c05f769239e6799985dcd68438511357fe2ba84f7e562b8bd4e5e343654ddd47a302512e60db936af38efccbee46d10f6df4974446e4d4f7ae9fb88fa8f8b38c
-  data.tar.gz: 76e885f39f4ca3042ff775a565cd153a63e7ad2eb0b9fc4f74b24d4b6e72ccce4a1e2ea979473bef5c9b76d7ca9ab342e7284387c7f1dbeab83e41dfe95d324c
+  metadata.gz: ff54a17d05adc652c1dd00b60391cb95c7f8cfdda2c691807d6edfaf97695fd495e0eb806b66dcad91280984e877d0bd1bc00865e58245cfd11baab37d23795f
+  data.tar.gz: 76a2669d4e001dd3a1349170718cd1addc6784a108b4404fb7dab6e96b75477b4eabf2c5491d286f5bd0d66e92ff0fabc6056dd54a6befc4356470fd70efb1b4

data/README.md

@@ -6,7 +6,8 @@
 [![Gem downloads version][gem-downloads-version-shield]][kitchen-terraform-gem]
 [![Gem downloads total][gem-downloads-total-shield]][kitchen-terraform-gem]
 
-[![Build status][build-status-shield]][build-status]
+[![Travis CI Build status][travis-build-status-shield]][travis-build-status]
+[![AppVeyor Build status][appveyor-build-status-shield]][appveyor-build-status]
 [![Code coverage][code-coverage-shield]][code-coverage]
 [![Maintainability][maintainability-shield]][maintainability]
 [![Technical debt][technical-debt-shield]][technical-debt]
@@ -49,7 +50,7 @@ Installation instructions can be found in the
 
 Kitchen-Terraform aims to support all versions of Ruby that are in
 ["normal" or "security" maintenance][ruby-branches], which is currently
-the interval of `>= 2.3, <= 2.6`.
+the interval of `>= 2.4, < 2.7`.
 
 [rbenv] can be used to manage versions of Ruby on the system.
 
@@ -356,8 +357,8 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 
 <!-- Markdown links and image definitions -->
 
-[build-status-shield]: https://img.shields.io/travis/com/newcontext-oss/kitchen-terraform.svg
-[build-status]: https://travis-ci.com/newcontext-oss/kitchen-terraform
+[appveyor-build-status-shield]: https://ci.appveyor.com/api/projects/status/8d7t014gij5grk5r/branch/master?svg=true
+[appveyor-build-status]: https://ci.appveyor.com/project/aaron-lane/kitchen-terraform/branch/master
 [bundler-getting-started]: https://bundler.io/#getting-started
 [bundler-in-depth]: https://bundler.io/gemfile.html
 [bundler]: https://bundler.io/index.html#getting-started
@@ -404,3 +405,5 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 [test-kitchen-configuration-file]: https://docs.chef.io/config_yml_kitchen.html
 [test-kitchen]: http://kitchen.ci/index.html
 [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/config_attribute_type/hash_of_symbols_and_strings.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry-validation"
+require "dry/validation"
 require "kitchen/terraform/config_attribute"
 require "kitchen/terraform/config_attribute_type"
 require "kitchen/terraform/config_predicates/hash_of_symbols_and_strings"

data/lib/kitchen/terraform/config_attribute_type/integer.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry-validation"
+require "dry/validation"
 require "kitchen/terraform/config_attribute"
 require "kitchen/terraform/config_attribute_type"
 

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

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry-validation"
+require "dry/validation"
 require "kitchen/terraform/config_schemas"
 
 # A validation schema for a configuration attribute which is an array including only strings.

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

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry-validation"
+require "dry/validation"
 require "kitchen/terraform/config_schemas"
 
 # A validation schema for a configuration attribute which is a boolean.

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

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry-validation"
+require "dry/validation"
 require "kitchen/terraform/config_schemas"
 
 # A validation schema for a configuration attribute which is an optional string.

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

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry-validation"
+require "dry/validation"
 require "kitchen/terraform/config_schemas"
 
 # Defines a validation schema for a string.

data/lib/kitchen/terraform/inspec_options_mapper.rb

@@ -18,14 +18,45 @@ require "kitchen/terraform"
 
 # Kitchen::Terraform::InSpecOptionsMapper maps system configuration attributes to an InSpec options hash.
 class ::Kitchen::Terraform::InSpecOptionsMapper
+  SYSTEM_ATTRIBUTES_TO_OPTIONS = {
+    attrs: :input_file,
+    backend_cache: :backend_cache,
+    backend: :backend,
+    bastion_host: :bastion_host,
+    bastion_port: :bastion_port,
+    bastion_user: :bastion_user,
+    controls: :controls,
+    enable_password: :enable_password,
+    key_files: :key_files,
+    password: :password,
+    path: :path,
+    port: :port,
+    proxy_command: :proxy_command,
+    reporter: "reporter",
+    self_signed: :self_signed,
+    shell_command: :shell_command,
+    shell_options: :shell_options,
+    shell: :shell,
+    show_progress: :show_progress,
+    ssl: :ssl,
+    sudo_command: :sudo_command,
+    sudo_options: :sudo_options,
+    sudo_password: :sudo_password,
+    sudo: :sudo,
+    user: :user,
+    vendor_cache: :vendor_cache,
+  }
+
   # map populates an InSpec options hash based on the intersection between the system keys and the supported options
   # keys, converting keys from symbols to strings as required by InSpec.
   #
   # @param options [::Hash] the InSpec options hash to be populated.
   # @return [void]
-  def map(options:)
-    system_keys.&(options_keys).each do |key|
-      options.store system_to_options.dig(key), system.fetch(key)
+  def map(options:, system:)
+    system.lazy.select do |attribute_name, _|
+      system_attributes_to_options.key?(attribute_name)
+    end.each do |attribute_name, attribute_value|
+      options.store system_attributes_to_options.fetch(attribute_name), attribute_value
     end
 
     options
@@ -33,19 +64,10 @@ class ::Kitchen::Terraform::InSpecOptionsMapper
 
   private
 
-  attr_accessor :system, :system_keys, :system_to_options, :options_keys
+  attr_accessor :system_attributes_to_options
 
   # @api private
-  def initialize(system:)
-    self.system = system
-    self.system_keys = system.keys
-    self.system_to_options = ::Hash.new do |hash, key|
-      hash.store key, key
-    end
-    system_to_options.store :reporter, "reporter"
-    self.options_keys = [:attrs, :backend, :backend_cache, :bastion_host, :bastion_port, :bastion_user, :controls,
-                         :enable_password, :key_files, :password, :path, :port, :proxy_command, :reporter, :self_signed,
-                         :shell, :shell_command, :shell_options, :show_progress, :ssl, :sudo, :sudo_command,
-                         :sudo_options, :sudo_password, :user, :vendor_cache]
+  def initialize
+    self.system_attributes_to_options = ::Kitchen::Terraform::InSpecOptionsMapper::SYSTEM_ATTRIBUTES_TO_OPTIONS.dup
   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.9.0" if not @value
+      self.value = ::Gem::Version.new "5.0.0" if not @value
       @value
     end
 

data/lib/kitchen/verifier/terraform.rb

@@ -79,6 +79,8 @@ module Kitchen
       include ::Kitchen::Terraform::Configurable
       @api_version = 2
 
+      attr_reader :inputs, :outputs
+
       # The verifier enumerates through each host of each system and verifies the associated InSpec controls.
       #
       # @example
@@ -89,8 +91,8 @@ module Kitchen
       def call(_kitchen_state)
         load_variables
         verify_systems
-        if !@error_messages.empty?
-          raise ::Kitchen::ActionFailed, @error_messages.join("\n\n")
+        if !error_messages.empty?
+          raise ::Kitchen::ActionFailed, error_messages.join("\n\n")
         end
       rescue ::Kitchen::Terraform::Error => error
         raise ::Kitchen::ActionFailed, error.message
@@ -107,28 +109,32 @@ module Kitchen
 
       private
 
+      attr_accessor :inspec_options_mapper, :error_messages
+      attr_writer :inputs, :outputs
+
       def handle_error(message:)
         if config_fail_fast
           raise ::Kitchen::Terraform::Error, message
         else
           logger.error message
-          @error_messages.push message
+          error_messages.push message
         end
       end
 
       def load_variables
         instance.driver.retrieve_outputs do |outputs:|
-          @outputs.replace outputs
+          self.outputs.replace outputs
         end.retrieve_inputs do |inputs:|
-          @inputs.replace inputs
+          self.inputs.replace inputs
         end
       end
 
       def initialize(configuration = {})
         init_config configuration
-        @error_messages = []
-        @inputs = {}
-        @outputs = {}
+        self.inspec_options_mapper = ::Kitchen::Terraform::InSpecOptionsMapper.new
+        self.error_messages = []
+        self.inputs = {}
+        self.outputs = {}
       end
 
       # load_needed_dependencies! loads the InSpec libraries required to verify a Terraform state.
@@ -144,15 +150,14 @@ module Kitchen
       end
 
       def system_inspec_options(system:)
-        ::Kitchen::Terraform::InSpecOptionsMapper.new(system: system)
-          .map(options: { "color" => config_color, "distinct_exit" => false })
+        inspec_options_mapper.map(options: { "color" => config_color, "distinct_exit" => false }, system: system)
       end
 
       def verify(system:)
         ::Kitchen::Terraform::System.new(
           mapping: { profile_locations: [::File.join(config.fetch(:test_base_path), instance.suite.name)] }
             .merge(system),
-        ).verify(inputs: @inputs, inspec_options: system_inspec_options(system: system), outputs: @outputs)
+        ).verify(inputs: inputs, inspec_options: system_inspec_options(system: system), outputs: outputs)
       rescue => error
         handle_error message: error.message
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Aaron Lane
@@ -61,7 +61,7 @@ cert_chain:
   XAjP/LERlXAwM+NCUycJw7BZMn7L2wIdnq6Le1rL6VJS17CZt2heuRtsF+3g0egR
   x97GmUumeM67PGeVodlIV65tdXrdlqKlHcE=
   -----END CERTIFICATE-----
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-bundler
@@ -288,89 +288,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: inspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: inspec
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: rbnacl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
@@ -458,7 +458,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
   - - "<"
     - !ruby/object:Gem::Version
       version: '2.7'