kitchen-terraform 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf0dc03c57101fc1ec8ea5a7910687185af00612
-  data.tar.gz: e0388efadde2ab8ee75d2cd47289c9d96a910e74
+  metadata.gz: 9c484cfa1fce45ee648ee3e184937331b74e2d92
+  data.tar.gz: 6feb2f68cf8e842426720b8a4f5b036243529e9f
 SHA512:
-  metadata.gz: 64d24a44a89f19009e8d9e32882688d6d9d9e02490d9a2755cec8ff0e9f098be0aa8000a5da35516833bd561ae4599162bce62065faa38e2ac888f8126bc85ee
-  data.tar.gz: 26382da8eca826218c70450749969b7c734fbea01e32d8b0ab19ac6a2bae8b713582ee3b6641a45347f2d0ba3b2e254bf7c636d201d87c8136c10b7dae88b95f
+  metadata.gz: 2add7730329949a50da2911e2fd05868f67c7a2dab984aa68343f49c2bfd956a23174378907801bca3a17fc597dda7eebfb9344fbc4bbb3c55d0d5e5e1c1fa6e
+  data.tar.gz: e67c2f15793a4a0dde35df3b24228228fec45af008b3d202d96cc294c365b8d4e079fc544af00d6a1b6ceab0ec9cbefc6270c8996586854ac0b5b2a2dd5faa97

data/lib/kitchen/terraform/config_attribute/groups.rb

@@ -17,7 +17,7 @@
 require "kitchen/terraform/config_attribute"
 require "kitchen/terraform/config_attribute_cacher"
 require "kitchen/terraform/config_attribute_definer"
-require "kitchen/terraform/config_schemas/array_of_hashes_of_symbols_and_strings"
+require "kitchen/terraform/config_schemas/groups"
 
 # The +:groups+ configuration attribute is an optional array including hashes comprising properties to manage the
 # execution of InSpec profiles against different resources in the Terraform state.
@@ -51,14 +51,21 @@ require "kitchen/terraform/config_schemas/array_of_hashes_of_symbols_and_strings
 #
 # ==== port
 #
-# An optional integer which represents the port to use when connecting to the hosts of the group with Secure Shell
-# (SSH).
+# An optional integer which represents the port to use when connecting with Secure Shell (SSH) to the hosts of the
+# group.
 #
 # If this key is omitted then the port of the Test Kitchen SSH Transport will be used.
 #
+# ==== ssh_key
+#
+# An optional string which contains the path to the private SSH key to use when connecting with SSH to the hosts of the
+# group.
+#
+# If this key is omitted then the private SSH key of the Test Kitchen SSH Transport will be used.
+#
 # ==== username
 #
-# An optional string which contains the username to use when connecting to the hosts of the group with SSH.
+# An optional string which contains the username to use when connecting with SSH to the hosts of the group.
 #
 # If this key is omitted then the username of the Test Kitcen SSH Transport will be used.
 #
@@ -77,7 +84,7 @@ module ::Kitchen::Terraform::ConfigAttribute::Groups
     ::Kitchen::Terraform::ConfigAttributeDefiner
       .new(
         attribute: self,
-        schema: ::Kitchen::Terraform::ConfigSchemas::ArrayOfHashesOfSymbolsAndStrings
+        schema: ::Kitchen::Terraform::ConfigSchemas::Groups
       )
       .define plugin_class: plugin_class
   end

data/lib/kitchen/terraform/config_schemas/{array_of_hashes_of_symbols_and_strings.rb → groups.rb}

@@ -18,11 +18,11 @@ require "dry-validation"
 require "kitchen/terraform/config_predicates/hash_of_symbols_and_strings"
 require "kitchen/terraform/config_schemas"
 
-# A validation schema for a configuration attribute which is an array of hashes including only symbol keys and string
-# values.
+# A validation schema for the groups configuration attribute which is an array of hashes including only symbol keys and
+# string values.
 #
 # @see http://dry-rb.org/gems/dry-validation/basics/working-with-schemas/ DRY Validation Working With Schemas
-::Kitchen::Terraform::ConfigSchemas::ArrayOfHashesOfSymbolsAndStrings =
+::Kitchen::Terraform::ConfigSchemas::Groups =
   ::Dry::Validation
     .Schema do
       configure do
@@ -41,6 +41,11 @@ require "kitchen/terraform/config_schemas"
               )
             optional(:hostnames).value :str?
             optional(:port).value :int?
+            optional(:ssh_key)
+              .maybe(
+                :str?,
+                :filled?
+              )
             optional(:username).value :str?
           end
         end

data/lib/kitchen/terraform/version.rb

@@ -16,4 +16,5 @@
 
 require "kitchen/terraform"
 
-::Kitchen::Terraform::VERSION = "2.0.0".freeze
+# The version of the kitchen-terraform gem.
+::Kitchen::Terraform::VERSION = "2.1.0".freeze

data/lib/kitchen/verifier/terraform.rb

@@ -109,6 +109,12 @@ class ::Kitchen::Verifier::Terraform < ::Kitchen::Verifier::Inspec
       self.class::ConfigureInspecRunnerBackend.call hostname: state.fetch(:hostname), options: options
       self.class::ConfigureInspecRunnerHost.call hostname: state.fetch(:hostname), options: options
       self.class::ConfigureInspecRunnerPort.call group: state.fetch(:group), options: options
+      self
+        .class::ConfigureInspecRunnerSSHKey
+        .call(
+          group: state.fetch(:group),
+          options: options
+        )
       self.class::ConfigureInspecRunnerUser.call group: state.fetch(:group), options: options
       self.class::ConfigureInspecRunnerAttributes
         .call(driver: driver, group: state.fetch(:group), terraform_state: driver[:state]).bind do |attributes|
@@ -124,5 +130,6 @@ require "kitchen/verifier/terraform/configure_inspec_runner_backend"
 require "kitchen/verifier/terraform/configure_inspec_runner_controls"
 require "kitchen/verifier/terraform/configure_inspec_runner_host"
 require "kitchen/verifier/terraform/configure_inspec_runner_port"
+require "kitchen/verifier/terraform/configure_inspec_runner_ssh_key"
 require "kitchen/verifier/terraform/configure_inspec_runner_user"
 require "kitchen/verifier/terraform/enumerate_groups_and_hostnames"

data/lib/kitchen/verifier/terraform/configure_inspec_runner_ssh_key.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# Copyright 2016 New Context Services, 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/monads"
+require "kitchen/verifier/terraform"
+
+# Configures the private SSH key to be used by the verifier's InSpec Runner to verify a group.
+#
+# The default value is the Test Kitchen SSH Transport's +:ssh_key+ configuration attribute.
+#
+# @see https://github.com/chef/inspec/blob/master/lib/inspec/runner.rb InSpec Runner
+# @see https://github.com/test-kitchen/test-kitchen/blob/v1.16.0/lib/kitchen/transport/ssh.rb Test Kitchen SSH Transport
+module ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerSSHKey
+  extend ::Dry::Monads::Maybe::Mixin
+
+  # Invoke the function.
+  #
+  # @param group [::Hash] the group being verified.
+  # @param options [::Hash] the Inspec::Runner's options.
+  def self.call(group:, options:)
+    Maybe(group[:ssh_key])
+      .bind do |ssh_key|
+        options
+          .store(
+            "key_files",
+            [ssh_key]
+          )
+      end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Aaron Lane
@@ -54,7 +54,7 @@ cert_chain:
   XjOfZudLs1zJ8ZNOuwj6KkGJ9J3XHd9hM95MtBEWlxAfYdCuW1+v7zCTfbieBEba
   UIyyldg4TuVcuRs8uKJyempT0hqx2DniseBWw3nvtgom3A==
   -----END CERTIFICATE-----
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -315,9 +315,9 @@ files:
 - 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_hashes_of_symbols_and_strings.rb
 - lib/kitchen/terraform/config_schemas/array_of_strings.rb
 - lib/kitchen/terraform/config_schemas/boolean.rb
+- lib/kitchen/terraform/config_schemas/groups.rb
 - lib/kitchen/terraform/config_schemas/hash_of_symbols_and_strings.rb
 - lib/kitchen/terraform/config_schemas/integer.rb
 - lib/kitchen/terraform/config_schemas/optional_string.rb
@@ -332,6 +332,7 @@ files:
 - lib/kitchen/verifier/terraform/configure_inspec_runner_controls.rb
 - lib/kitchen/verifier/terraform/configure_inspec_runner_host.rb
 - lib/kitchen/verifier/terraform/configure_inspec_runner_port.rb
+- lib/kitchen/verifier/terraform/configure_inspec_runner_ssh_key.rb
 - lib/kitchen/verifier/terraform/configure_inspec_runner_user.rb
 - lib/kitchen/verifier/terraform/enumerate_groups_and_hostnames.rb
 homepage: https://github.com/newcontext-oss/kitchen-terraform
@@ -358,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Terraform ~> 0.10.2
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Test Kitchen plugins for testing Terraform configuration