kitchen-terraform 3.0.0 → 3.1.0

data/lib/kitchen/terraform/version.rb

@@ -17,4 +17,4 @@
 require "kitchen/terraform"
 
 # The version of the kitchen-terraform gem.
-::Kitchen::Terraform::VERSION = "3.0.0".freeze
+::Kitchen::Terraform::VERSION = "3.1.0".freeze

data/lib/kitchen/verifier/terraform.rb

@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry/monads"
 require "kitchen/verifier"
 require "kitchen/terraform/config_attribute/color"
 require "kitchen/terraform/config_attribute/groups"
 require "kitchen/terraform/configurable"
+require "kitchen/terraform/error"
 require "kitchen/verifier/inspec"
 
 # The verifier utilizes the {https://www.inspec.io/ InSpec infrastructure testing framework} to verify the behaviour and
@@ -71,10 +71,6 @@ require "kitchen/verifier/inspec"
 class ::Kitchen::Verifier::Terraform < ::Kitchen::Verifier::Inspec
   kitchen_verifier_api_version 2
 
-  include ::Dry::Monads::Either::Mixin
-
-  include ::Dry::Monads::Maybe::Mixin
-
   include ::Kitchen::Terraform::ConfigAttribute::Color
 
   include ::Kitchen::Terraform::ConfigAttribute::Groups
@@ -87,16 +83,17 @@ class ::Kitchen::Verifier::Terraform < ::Kitchen::Verifier::Inspec
   #   `kitchen verify suite-name`
   # @param state [::Hash] the mutable instance and verifier state.
   # @raise [::Kitchen::ActionFailed] if the result of the action is a failure.
-  # @return [::Dry::Monads::Either] the result of the action.
+  # @return [void]
   def call(state)
-    Maybe(state[:kitchen_terraform_output])
-      .or do
-        Left(
+    state
+      .fetch :kitchen_terraform_output do
+        raise(
+          ::Kitchen::Terraform::Error,
           "The Test Kitchen state does not include :kitchen_terraform_output; this implies that the " \
             "kitchen-terraform provisioner has not successfully converged"
         )
       end
-      .bind do |output|
+      .tap do |output|
         ::Kitchen::Verifier::Terraform::EnumerateGroupsAndHostnames
           .call(
             groups: config_groups,
@@ -116,12 +113,11 @@ class ::Kitchen::Verifier::Terraform < ::Kitchen::Verifier::Inspec
             super state
           end
       end
-      .or do |failure|
-        raise(
-          ::Kitchen::ActionFailed,
-          failure
-        )
-      end
+  rescue ::Kitchen::Terraform::Error => error
+    raise(
+      ::Kitchen::ActionFailed,
+      error.message
+    )
   end
 
   private
@@ -160,18 +156,15 @@ class ::Kitchen::Verifier::Terraform < ::Kitchen::Verifier::Inspec
             group: state.fetch(:kitchen_terraform_group),
             options: options
           )
-        ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerAttributes
-          .call(
-            group: state.fetch(:kitchen_terraform_group),
-            output: ::Kitchen::Util.stringified_hash(state.fetch(:kitchen_terraform_output))
-          )
-          .bind do |attributes|
-            options
-              .store(
-                :attributes,
-                attributes
+        options
+          .store(
+            :attributes,
+            ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerAttributes
+              .call(
+                group: state.fetch(:kitchen_terraform_group),
+                output: ::Kitchen::Util.stringified_hash(state.fetch(:kitchen_terraform_output))
               )
-          end
+          )
         ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerControls
           .call(
             group: state.fetch(:kitchen_terraform_group),

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

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry/monads"
+require "kitchen/terraform/error"
 require "kitchen/verifier/terraform"
 
 # Configures the InSpec profile attributes for the Inspec::Runner used by the verifier to verify a group.
@@ -55,27 +55,20 @@ require "kitchen/verifier/terraform"
 # @see https://www.terraform.io/docs/configuration/outputs.html Terraform output variables
 # @see https://www.terraform.io/docs/state/index.html Terraform state
 module ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerAttributes
-  extend ::Dry::Monads::Either::Mixin
-
-  extend ::Dry::Monads::Maybe::Mixin
-
-  extend ::Dry::Monads::Try::Mixin
-
   # Invokes the function
   #
   # @param group [::Hash] a kitchen-terraform verifier group.
   # @param output [::String] the output of the Terraform state.
-  # @return [::Dry::Monads::Either] the result of the function.
+  # @raise [::Kitchen::Terraform::Error] if the configuration fails.
+  # @return [::Hash] the configured attributes.
   def self.call(group:, output:)
-    Right(
-      group
-        .fetch(
-          :attributes,
-          {}
-        )
-    )
-      .bind do |group_attributes|
-        Right(
+    group
+      .fetch(
+        :attributes,
+        {}
+      )
+      .tap do |group_attributes|
+        return(
           output
             .keys
             .+(group_attributes.keys)
@@ -84,11 +77,6 @@ module ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerAttributes
                 .keys
                 .+(group_attributes.values)
             )
-        )
-      end
-      .bind do |unresolved_attributes|
-        Try ::KeyError do
-          unresolved_attributes
             .reduce ::Hash.new do |resolved_attributes, (attribute_name, output_name)|
               resolved_attributes
                 .merge(
@@ -99,11 +87,12 @@ module ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerAttributes
                         .fetch("value")
                 )
             end
-        end
-      end
-      .to_either
-      .or do |error|
-        Left "Configuring InSpec runner attributes resulted in failure: #{error}"
+        )
       end
+  rescue ::KeyError => error
+    raise(
+      ::Kitchen::Terraform::Error,
+      "Configuring InSpec runner attributes resulted in failure: #{error.message}"
+    )
   end
 end

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

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry/monads"
 require "kitchen/verifier/terraform"
 
 # Configures a group's InSpec profile controls to be inclued by the Inspec::Runner used by the verifier.
@@ -24,16 +23,19 @@ require "kitchen/verifier/terraform"
 # @see https://github.com/chef/inspec/blob/master/lib/inspec/runner.rb ::Inspec::Runner
 # @see https://www.inspec.io/docs/reference/profiles/ InSpec profiles
 module ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerControls
-  extend ::Dry::Monads::Either::Mixin
-  extend ::Dry::Monads::Maybe::Mixin
-
   # Invokes the function
   #
   # @param group [::Hash] the group being verified.
   # @param options [:Hash] the verifier's Inspec::Runner's options.
   def self.call(group:, options:)
-    Maybe(group[:controls]).bind do |controls|
-      options.store :controls, controls
-    end
+    group[:controls]
+      .tap do |controls|
+        controls and
+          options
+            .store(
+              :controls,
+              controls
+            )
+      end
   end
 end

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

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry/monads"
 require "kitchen/verifier/terraform"
 
 # Configures the port for the Inspec::Runner used by the verifier to verify a group.
@@ -23,15 +22,19 @@ require "kitchen/verifier/terraform"
 #
 # @see https://github.com/chef/inspec/blob/master/lib/inspec/runner.rb Inspec::Runner
 module ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerPort
-  extend ::Dry::Monads::Maybe::Mixin
-
   # Invokes the function.
   #
   # @param group [::Hash] the group being verified.
   # @param options [::Hash] the Inspec::Runner's options.
   def self.call(group:, options:)
-    Maybe(group[:port]).bind do |port|
-      options.store "port", port
-    end
+    group[:port]
+      .tap do |port|
+        port and
+          options
+            .store(
+              "port",
+              port
+            )
+      end
   end
 end

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

@@ -14,7 +14,6 @@
 # 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.
@@ -24,20 +23,19 @@ require "kitchen/verifier/terraform"
 # @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]
-          )
+    group[:ssh_key]
+      .tap do |ssh_key|
+        ssh_key and
+          options
+            .store(
+              "key_files",
+              [ssh_key]
+            )
       end
   end
 end

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

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry/monads"
 require "kitchen/verifier/terraform"
 
 # Configures the user for the Inspec::Runner used by the verifier to verify a group.
@@ -23,15 +22,19 @@ require "kitchen/verifier/terraform"
 #
 # @see https://github.com/chef/inspec/blob/master/lib/inspec/runner.rb Inspec::Runner
 module ::Kitchen::Verifier::Terraform::ConfigureInspecRunnerUser
-  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[:username]).bind do |username|
-      options.store "user", username
-    end
+    group[:username]
+      .tap do |username|
+        username and
+          options
+            .store(
+              "user",
+              username
+            )
+      end
   end
 end

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

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "dry/monads"
+require "kitchen/terraform/error"
 require "kitchen/verifier/terraform"
 
 # Enumerates each group and the hostnames of each group.
@@ -31,55 +31,52 @@ require "kitchen/verifier/terraform"
 # @see https://www.terraform.io/docs/configuration/outputs.html Terraform output variables
 # @see https://www.terraform.io/docs/state/index.html Terraform state
 module ::Kitchen::Verifier::Terraform::EnumerateGroupsAndHostnames
-  extend ::Dry::Monads::Either::Mixin
-  extend ::Dry::Monads::List::Mixin
-  extend ::Dry::Monads::Maybe::Mixin
-  extend ::Dry::Monads::Try::Mixin
-
   # Invokes the function.
   #
   # @param groups [::Array] a collection of groups.
-  # @return [::Dry::Monads::Either] the result of the function.
+  # @raise [::Kitchen::Terraform::Error] if the enumeration fails.
+  # @return [void]
   # @yieldparam group [::Hash] the group from which hostnamess are being enumerated.
   # @yieldparam hostname [::String] a hostname from the group.
-  def self.call(groups:, output:)
-    List(groups)
-      .fmap(&method(:Right))
-      .typed(::Dry::Monads::Either)
-      .traverse do |member|
-        member
-          .bind do |group|
-            Try ::KeyError do
-              Maybe(group[:hostnames])
-                .fmap do |hostnames_output_name|
-                  output
-                    .fetch(hostnames_output_name)
-                    .fetch("value")
-                end
-                .or do
-                  Right "localhost"
-                end
-                .fmap do |hostnames|
-                  Array(hostnames)
-                    .each do |hostname|
-                      yield(
-                        group: group,
-                        hostname: hostname
-                      )
-                    end
-                end
-            end
-              .to_either
-          end
-      end
-      .bind do
-        Right "Enumeration of groups and hostnames resulted in success"
-      end
-      .or do |error|
-        Left(
-          "Enumeration of groups and hostnames resulted in failure due to the omission of the configured :hostnames " \
-            "output or an unexpected output structure: #{error}"
+  def self.call(groups:, output:, &block)
+    groups
+      .each do |group|
+        each_resolved_hostname_and_group(
+          group: group,
+          hostnames: group[:hostnames],
+          output: output,
+          &block
         )
       end
+  rescue ::KeyError => error
+    raise(
+      ::Kitchen::Terraform::Error,
+      "Enumeration of groups and hostnames resulted in failure due to the omission of the configured :hostnames " \
+        "output or an unexpected output structure: #{error.message}"
+    )
+  end
+
+  private_class_method
+
+  # @api private
+  def self.each_resolved_hostname_and_group(group:, hostnames:, output:)
+    if hostnames
+      Array(
+        output
+          .fetch(hostnames)
+          .fetch("value")
+      )
+        .each do |hostname|
+          yield(
+            group: group,
+            hostname: hostname
+          )
+        end
+    else
+      yield(
+        group: group,
+        hostname: "localhost"
+      )
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Aaron Lane
@@ -18,6 +18,7 @@ authors:
 - Nick Willever
 - Steven A. Burns
 - Walter Dolce
+- curleighbraces
 autorequire: 
 bindir: bin
 cert_chain:
@@ -54,8 +55,22 @@ cert_chain:
   XjOfZudLs1zJ8ZNOuwj6KkGJ9J3XHd9hM95MtBEWlxAfYdCuW1+v7zCTfbieBEba
   UIyyldg4TuVcuRs8uKJyempT0hqx2DniseBWw3nvtgom3A==
   -----END CERTIFICATE-----
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +113,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +155,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: middleman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: middleman-autoprefixer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: middleman-favicon-maker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: middleman-livereload
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: middleman-syntax
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: mini_racer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -155,69 +268,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: dry-monads
+  name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
+        version: '1.8'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -225,39 +338,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: inspec
+  name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.34.0
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.8
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.34.0
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.8
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: kitchen-inspec
   requirement: !ruby/object:Gem::Requirement
@@ -292,14 +399,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '1.16'
 description: kitchen-terraform is a set of Test Kitchen plugins for testing Terraform
   configuration
 email: kitchen-terraform@newcontext.com
@@ -315,6 +422,8 @@ files:
 - lib/kitchen/provisioner/terraform.rb
 - lib/kitchen/terraform.rb
 - lib/kitchen/terraform/client_version_verifier.rb
+- lib/kitchen/terraform/command.rb
+- lib/kitchen/terraform/command/output.rb
 - lib/kitchen/terraform/config_attribute.rb
 - lib/kitchen/terraform/config_attribute/backend_configurations.rb
 - lib/kitchen/terraform/config_attribute/color.rb
@@ -339,6 +448,7 @@ files:
 - lib/kitchen/terraform/config_schemas/optional_string.rb
 - lib/kitchen/terraform/config_schemas/string.rb
 - lib/kitchen/terraform/configurable.rb
+- lib/kitchen/terraform/error.rb
 - lib/kitchen/terraform/file_path_config_attribute_definer.rb
 - lib/kitchen/terraform/shell_out.rb
 - lib/kitchen/terraform/version.rb
@@ -376,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Terraform >= 0.10.2, < 0.12.0
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Test Kitchen plugins for testing Terraform configuration