kitchen-terraform 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a27ab58eeb77a3f295cac3a661cb62fa5ef3cd0
-  data.tar.gz: 6ac7e39c7633a958f5d8cc11de98efbe937bdaa3
+  metadata.gz: 125efdc0ccfadc12dbc06c1f2d19f94337b7e514
+  data.tar.gz: f63a2992bfcdb73ecf9a60b0d68752b6d1dcc543
 SHA512:
-  metadata.gz: e1fa7f9220fde72842c57dd646b0fa0a04dd758fd98c6a21540a53053cde99d50aad13ce0fa9a128eaaf1f1579f1ac3d575b87c0d36d672f9c92623f58a6f25a
-  data.tar.gz: b8c77cd97d2735d5f8427cd405402a08aa34234859e90faaa0ef1bdcd77f46d3c19f11352e68b6729fbb586f930cb6501020dfd9d2bb323e85321846c729b3b7
+  metadata.gz: 680b4c300b78faeb2992aa52b7d915dfa5ec573c77f2fa57e6dbc8d3c44f80ef831d17ee30a377ec4c870246936971e7c6192753c3a472b3bfdf5f6d3c3bf0b0
+  data.tar.gz: ade3ff2a56a9ba6febb281de8257006462680d16540c156804128c8b842b669d9cbf772f057f5bd8cb37334f743aede63ed45f292ed937150cfd7b69dda45ce4

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-���Y���eqW/�ޏvg |l�&C��2����ٜ`��Ut
��U;)�)��]�s�8j"q��Z�c�=˴<��7�0���"l����[�J)�� x�������H���3~�"-S�%w����
��+�/�<�7����n�Au�	`Ԅ�_7<�ǂ��a~ȏ78�j}��3��;D��}I��[DB¹4�ܥ���n"|�P�)U�u[g��2	��:2�1�8j�;�d<Ȳ7�="�$/^X?�o���K
+@�K��R�-�Q��G4�w[�6�Lo���1�Ίiy����;>�U�>��x�p|M������5����F�)���,l��ѵ,+��3��ޖ�Ml�"�56
+�_,��*��߇�N����rɌ�pX���G�
+@���L�72��َ��8�j�������V[�{Uoc0�G��h)�����Z�ZK�O��d��r���öل�+�

data.tar.gz.sig

@@ -1,3 +1,3 @@
-��(5U������ԯ1�c⠇�����������l�P�ž+[
-�%�%�lT��"V�ɝ��-#�(��<r)}�|��XCW��o��t���'����&���&$�E%�`�<yH��]�w��
-�8@��&��b�}o�ptzI�i�
HIU�)�x��ȍ9�69�jka
�}X��M������6�Nx���}���;�׏��n�cV�ϸ
�(D�[[��e�3$�C�;�{�e��C+��(�a�X	�
+<z� nZCZ������-0�~�>a*﹈�e8o�	v櫘M���h�1�=DԬ��'��X��ø�z�Iu��ZҪ�廂1K{Cˉ�y0�����M@9�W�P:�Z��8s��+6�w�4���{E�u�YrX�75ؓ
+I����I����N,��'�]�=��
+��&�l�4��u���?3���:�#��z��J��^�Ӄ�w�& @���9�?Ȏ���z'�PLAdR�c�8?��<�}�-j�p�v�s8

data/README.md

@@ -36,7 +36,8 @@ source 'https://rubygems.org'
 gem 'kitchen-terraform', '~> 0.1'
 ```
 
-Before running `bundle`, the author's public key must be added as a trusted certificate:
+Before running `bundle`, the author's public key must be added as a
+trusted certificate:
 
 ```sh
 gem cert --add <(curl --location --silent \
@@ -95,9 +96,7 @@ provisioner.
 
 There are no configuration options for the driver.
 
-##### Example
-
-*.kitchen.yml*
+##### Example .kitchen.yml
 
 ```yaml
 ---
@@ -120,6 +119,41 @@ Terraform state based on the provided Terraform configuration.
 
 #### Configuration
 
+##### apply_timeout
+
+The number of seconds to wait for the Terraform `apply` command to be
+successful before raising an error.
+
+###### Example .kitchen.yml
+
+```yaml
+---
+provisioner:
+  name: terraform
+  apply_timeout: 1000
+```
+
+###### Default
+
+The default `apply_timeout` is 600 seconds.
+
+##### color
+
+Enable or disable colored output from the Terraform command.
+
+###### Example .kitchen.yml
+
+```yaml
+---
+provisioner:
+  name: terraform
+  color: false
+```
+
+###### Default
+
+The default value for `color` is true.
+
 ##### directory
 
 The pathname of the directory containing the Terraform configuration
@@ -128,9 +162,7 @@ Terraform commands.
 
 [directory specified]: https://www.terraform.io/docs/configuration/load.html
 
-###### Example
-
-*.kitchen.yml*
+###### Example .kitchen.yml
 
 ```yaml
 ---
@@ -150,9 +182,7 @@ for the configuration.
 
 [Terraform variable files]: https://www.terraform.io/docs/configuration/variables.html#variable-files
 
-###### Examples
-
-*.kitchen.yml*
+###### Example .kitchen.yml
 
 ```yaml
 ---
@@ -173,26 +203,27 @@ The default `variable_files` collection is empty.
 
 ##### variables
 
-A collection of [Terraform variables] to be set in the configuration;
-the syntax matches that of [assigning variables] with command-line
-flags.
+A mapping of [Terraform variables] to be set in the configuration.
 
 [Terraform variables]: https://www.terraform.io/docs/configuration/variables.html
 
-[assigning variables]: https://www.terraform.io/intro/getting-started/variables.html#assigning-variables
-
-###### Examples
-
-*.kitchen.yml*
+###### Example .kitchen.yml
 
 ```yaml
 ---
+provisioner:
+  name: terraform
+  variables:
+    foo: bar
+# deprecated
+---
 provisioner:
   name: terraform
   variables:
     - foo=bar
     - biz=baz
 ---
+# deprecated
 provisioner:
   name: terraform
   variables: foo=bar
@@ -250,9 +281,7 @@ Each group consists of:
 
 - the username to use when connecting to the group's hosts
 
-###### Example
-
-*.kitchen.yml*
+###### Example .kitchen.yml
 
 ```yaml
 ---

data/lib/kitchen/driver/terraform.rb

@@ -15,15 +15,14 @@
 # limitations under the License.
 
 require 'kitchen'
-require 'terraform/client_holder'
-require 'terraform/invalid_version'
+require 'terraform/configurable'
 require 'terraform/version'
 
 module Kitchen
   module Driver
     # Terraform state lifecycle activities manager
     class Terraform < Base
-      include ::Terraform::ClientHolder
+      include ::Terraform::Configurable
 
       kitchen_driver_api_version 2
 
@@ -32,25 +31,14 @@ module Kitchen
       no_parallel_for
 
       def create(_state = nil)
-        client.fetch_version do |output|
-          raise ::Terraform::InvalidVersion, supported_version, caller unless
-            output.match supported_version
-        end
-      rescue => error
-        raise Kitchen::ActionFailed, error.message, error.backtrace
+        provisioner.validate_version
       end
 
       def destroy(_state = nil)
-        client.validate_configuration_files
-        client.download_modules
-        client.plan_destructive_execution
-        client.apply_execution_plan
-      rescue => error
-        raise Kitchen::ActionFailed, error.message, error.backtrace
-      end
-
-      def supported_version
-        'v0.6'
+        provisioner.validate_configuration_files
+        provisioner.download_modules
+        provisioner.plan_destructive_execution
+        provisioner.apply_execution_plan
       end
     end
   end

data/lib/kitchen/provisioner/terraform.rb

@@ -15,43 +15,166 @@
 # limitations under the License.
 
 require 'kitchen'
-require 'pathname'
-require 'terraform/client_holder'
+require 'terraform/apply_command'
+require 'terraform/configurable'
+require 'terraform/get_command'
+require 'terraform/group'
+require 'terraform/output_command'
+require 'terraform/plan_command'
+require 'terraform/validate_command'
 require 'terraform/version'
+require 'terraform/version_command'
 
 module Kitchen
   module Provisioner
     # Terraform configuration applier
     class Terraform < Base
-      include ::Terraform::ClientHolder
+      SUPPORTED_VERSION = /v0.6/
+
+      include ::Terraform::Configurable
 
       kitchen_provisioner_api_version 2
 
       plugin_version ::Terraform::VERSION
 
+      required_config :apply_timeout do |_, value, provisioner|
+        provisioner.coerce_apply_timeout value: value
+      end
+
+      default_config :apply_timeout, 600
+
+      default_config :color, true
+
+      required_config :color do |_, value, provisioner|
+        provisioner.coerce_color value: value
+      end
+
+      default_config(:directory) { |provisioner| provisioner[:kitchen_root] }
+
+      expand_path_for :directory
+
+      default_config :plan do |provisioner|
+        provisioner.instance_pathname filename: 'terraform.tfplan'
+      end
+
+      expand_path_for :plan
+
+      default_config :state do |provisioner|
+        provisioner.instance_pathname filename: 'terraform.tfstate'
+      end
+
+      expand_path_for :state
+
+      required_config :variable_files do |_, value, provisioner|
+        provisioner.coerce_variable_files value: value
+      end
+
+      default_config :variable_files, []
+
+      expand_path_for :variable_files
+
+      required_config :variables do |_, value, provisioner|
+        provisioner.coerce_variables value: value
+      end
+
+      default_config :variables, {}
+
+      def apply_execution_plan
+        ::Terraform::ApplyCommand.execute \
+          logger: logger, state: config[:state], target: config[:plan],
+          color: config[:color], timeout: config[:apply_timeout]
+      end
+
       def call(_state = nil)
-        client.validate_configuration_files
-        client.download_modules
-        client.plan_execution
-        client.apply_execution_plan
-      rescue => error
-        raise Kitchen::ActionFailed, error.message, error.backtrace
+        validate_configuration_files
+        download_modules
+        plan_constructive_execution
+        apply_execution_plan
+      end
+
+      def coerce_apply_timeout(value:)
+        config[:apply_timeout] = Integer value
+      rescue ArgumentError, TypeError
+        config_error attribute: 'apply_timeout', expected: 'an integer'
+      end
+
+      def coerce_color(value:)
+        raise TypeError unless [TrueClass, FalseClass].include?(value.class)
+        config[:color] = value
+      rescue TypeError
+        config_error attribute: 'color', expected: 'a boolean'
       end
 
-      def directory
-        config.fetch(:directory) { kitchen_root }
+      def coerce_variable_files(value:)
+        config[:variable_files] = Array value
       end
 
-      def kitchen_root
-        Pathname.new config.fetch :kitchen_root
+      def coerce_variables(value:)
+        config[:variables] =
+          if value.is_a?(Array) || value.is_a?(String)
+            deprecated_variables_format value: value
+          else
+            Hash value
+          end
+      rescue ArgumentError, TypeError
+        config_error attribute: 'variables',
+                     expected: 'a mapping of Terraform variable assignments'
       end
 
-      def variable_files
-        config.fetch(:variable_files) { [] }
+      def download_modules
+        ::Terraform::GetCommand.execute logger: logger,
+                                        target: config[:directory]
       end
 
-      def variables
-        config.fetch(:variables) { [] }
+      def each_list_output(name:, &block)
+        output(name: name).split(',').each(&block)
+      end
+
+      def instance_pathname(filename:)
+        File.join config[:kitchen_root], '.kitchen', 'kitchen-terraform',
+                  instance.name, filename
+      end
+
+      def output(name:)
+        ::Terraform::OutputCommand
+          .execute logger: logger, state: config[:state], target: name, &:chomp
+      end
+
+      def plan_constructive_execution
+        ::Terraform::PlanCommand
+          .execute destroy: false, logger: logger, out: config[:plan],
+                   state: config[:state], target: config[:directory],
+                   variables: config[:variables], color: config[:color],
+                   variable_files: config[:variable_files]
+      end
+
+      def plan_destructive_execution
+        ::Terraform::PlanCommand
+          .execute destroy: true, logger: logger, out: config[:plan],
+                   state: config[:state], target: config[:directory],
+                   variables: config[:variables], color: config[:color],
+                   variable_files: config[:variable_files]
+      end
+
+      def validate_configuration_files
+        ::Terraform::ValidateCommand.execute logger: logger,
+                                             target: config[:directory]
+      end
+
+      def validate_version
+        ::Terraform::VersionCommand.execute logger: logger do |output|
+          raise UserError,
+                "Terraform version must match #{SUPPORTED_VERSION}" unless
+                  SUPPORTED_VERSION.match output
+        end
+      end
+
+      private
+
+      def deprecated_variables_format(value:)
+        config_deprecated attribute: 'variables',
+                          expected: 'a mapping rather than a list or string'
+        Hash[Array(value).map { |string| string.split '=' }]
       end
     end
   end

data/lib/kitchen/verifier/terraform.rb

@@ -16,8 +16,7 @@
 
 require 'kitchen'
 require 'kitchen/verifier/inspec'
-require 'terraform/client_holder'
-require 'terraform/inspec_runner'
+require 'terraform/configurable'
 require 'terraform/version'
 
 module Kitchen
@@ -25,84 +24,40 @@ module Kitchen
     # Runs tests post-converge to confirm that instances in the Terraform state
     # are in an expected state
     class Terraform < Inspec
-      include ::Terraform::ClientHolder
+      include ::Terraform::Configurable
 
       kitchen_verifier_api_version 2
 
       plugin_version ::Terraform::VERSION
 
-      def attributes(group:)
-        group.fetch(:attributes) { {} }
+      required_config :groups do |_, value, verifier|
+        verifier.coerce_groups value: value
       end
 
-      def call(state)
-        groups.each do |group|
-          client.extract_list_output name: group.fetch(:hostnames) do |output|
-            verify group: group, hostnames: output, state: state
-          end
-        end
-      rescue => error
-        raise ActionFailed, error.message, error.backtrace
-      end
-
-      def controls(group:)
-        group.fetch(:controls) { [] }
-      end
-
-      def evaluate(exit_code:)
-        raise "Inspec Runner returns #{exit_code}" unless exit_code.zero?
-      end
-
-      def groups
-        config.fetch(:groups) { [] }
-      end
+      default_config :groups, []
 
-      def initialize_runner(group:, hostname:, state:)
-        ::Terraform::InspecRunner
-          .new runner_options_for_terraform group: group, hostname: hostname,
-                                            state: state do |runner|
-          resolve_attributes group: group do |name, value|
-            runner.define_attribute name: name, value: value
-          end
-          runner.add targets: collect_tests
-          yield runner
+      def call(state)
+        config[:groups].each do |group|
+          group.verify_each_host options: runner_options(transport, state)
         end
       end
 
-      def port(group:)
-        # FIXME: apply the principle of least knowledge
-        group.fetch(:port) { instance.transport.send(:config).fetch :port }
-      end
-
-      def resolve_attributes(group:)
-        attributes(group: group).each_pair do |method_name, variable_name|
-          client.extract_output name: variable_name do |output|
-            yield method_name, output
-          end
+      def coerce_groups(value:)
+        config[:groups] = Array(value).map do |raw_group|
+          ::Terraform::Group.new value: raw_group, verifier: self
         end
+      rescue UserError
+        config_error attribute: 'groups',
+                     expected: 'a collection of group mappings'
       end
 
-      def runner_options_for_terraform(group:, hostname:, state:)
-        runner_options(instance.transport, state)
-          .merge controls: controls(group: group), host: hostname,
-                 port: port(group: group), user: username(group: group)
-      end
-
-      def username(group:)
-        # FIXME: apply the principle of least knowledge
-        group.fetch :username do
-          instance.transport.send(:config).fetch :username
-        end
+      def evaluate(exit_code:)
+        raise InstanceFailure, "Inspec Runner returns #{exit_code}" unless
+          exit_code.zero?
       end
 
-      def verify(group:, hostnames:, state:)
-        hostnames.each do |hostname|
-          info "Verifying group: #{group.fetch :name}; hostname #{hostname}\n"
-          initialize_runner group: group, hostname: hostname,
-                            state: state do |runner|
-            runner.verify_run verifier: self
-          end
-        end
+      def populate(runner:)
+        collect_tests.each { |test| runner.add target: test }
       end
     end
   end

data/lib/terraform/apply_command.rb

@@ -15,18 +15,28 @@
 # limitations under the License.
 
 require_relative 'command'
+require_relative 'color_switch'
 
 module Terraform
   # Command to apply an execution plan
-  class ApplyCommand
-    include Command
+  class ApplyCommand < Command
+    include ColorSwitch
+
+    def name
+      'apply'
+    end
+
+    def options
+      "-input=false -state=#{state}#{color_switch}"
+    end
 
     private
 
-    def initialize_attributes(state:, plan:)
-      self.name = 'apply'
-      self.options = { input: false, state: state }
-      self.target = plan
+    attr_accessor :color, :state
+
+    def initialize_attributes(color:, state:)
+      self.color = color
+      self.state = state
     end
   end
 end

data/lib/terraform/{output_not_found.rb → color_switch.rb}

@@ -14,10 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative 'error'
-
 module Terraform
-  # Error of an output not found
-  class OutputNotFound < Error
+  # Shared color switche for Terraform
+  module ColorSwitch
+    def color_switch
+      color ? '' : ' -no-color'
+    end
   end
 end

data/lib/terraform/command.rb

@@ -14,45 +14,54 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'kitchen'
 require 'mixlib/shellout'
-require 'pathname'
-require_relative 'command_options'
-require_relative 'error'
 
 module Terraform
-  # Common logic for Mixlib::ShellOut Terraform commands
-  module Command
-    attr_reader :name, :options, :target
+  # Interface to the Terraform command line client
+  class Command
+    def self.execute(**keyword_arguments, &block)
+      new(**keyword_arguments).execute(&block)
+    end
 
     def execute
-      # TODO: use the live output stream
       shell_out.run_command
       shell_out.error!
       yield shell_out.stdout if block_given?
-    rescue => error
-      handle error: error
-      raise Error, error.message, error.backtrace
+    rescue Errno::EACCES, Errno::ENOENT => error
+      command_error error: error, type: Kitchen::InstanceFailure
+    rescue Mixlib::ShellOut::CommandTimeout,
+           Mixlib::ShellOut::ShellCommandFailed => error
+      command_error error: error, type: Kitchen::TransientFailure
     end
 
-    def handle(**_)
+    def name
+      ''
     end
 
-    def to_s
-      CommandOptions.new options do |command_options|
-        return "terraform #{name} #{command_options} #{target}"
-      end
+    def options
+      '--help'
     end
 
     private
 
     attr_accessor :shell_out
 
-    attr_writer :name, :options, :target
+    def command_error(error:, type:)
+      raise type, %(`#{shell_out.command}` failed: "#{error}")
+    end
 
-    def initialize(**keyword_arguments)
+    def initialize(
+      logger:, target: '', timeout: Mixlib::ShellOut::DEFAULT_READ_TIMEOUT,
+      **keyword_arguments
+    )
       initialize_attributes(**keyword_arguments)
-      self.shell_out = Mixlib::ShellOut.new to_s, returns: 0
-      yield self if block_given?
+      self.shell_out = Mixlib::ShellOut
+                       .new "terraform #{name} #{options} #{target}",
+                            live_stream: logger, returns: 0, timeout: timeout
+    end
+
+    def initialize_attributes(**_keyword_arguments)
     end
   end
 end

data/lib/terraform/{command_options.rb → configurable.rb}

@@ -14,32 +14,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module Terraform
-  # Manages options for Terraform commands
-  class CommandOptions
-    def to_s
-      key_flags.each_with_object String.new('') do |(flag, values), string|
-        values.each { |value| string.concat "#{flag}=#{value} " }
-      end.chomp ' '
-    end
+require 'forwardable'
+require 'kitchen'
 
-    private
+module Terraform
+  # Common logic for classes that include Kitchen::Configurable
+  module Configurable
+    extend Forwardable
 
-    attr_accessor :options
+    def_delegators :instance, :provisioner, :transport
 
-    def key_flags
-      options
-        .map { |key, value| [key.to_s.tr('_', '-').prepend('-'), value] }.to_h
+    def config_deprecated(attribute:, expected:)
+      logger.warn 'DEPRECATION NOTICE'
+      logger.warn formatted attribute: attribute,
+                            message: "should be #{expected}"
     end
 
-    def initialize(**options)
-      self.options = options
-      normalize_values
-      yield self if block_given?
+    def config_error(attribute:, expected:)
+      raise Kitchen::UserError, formatted(
+        attribute: attribute, message: "must be interpretable as #{expected}"
+      )
     end
 
-    def normalize_values
-      options.each_pair { |key, value| options.store key, Array(value) }
+    private
+
+    def formatted(attribute:, message:)
+      "#{self.class}#{instance.to_str}#config[:#{attribute}] #{message}"
     end
   end
 end

data/lib/terraform/get_command.rb

@@ -18,15 +18,13 @@ require_relative 'command'
 
 module Terraform
   # Command to get modules
-  class GetCommand
-    include Command
-
-    private
+  class GetCommand < Command
+    def name
+      'get'
+    end
 
-    def initialize_attributes(dir:)
-      self.name = 'get'
-      self.options = { update: true }
-      self.target = dir
+    def options
+      '-update=true'
     end
   end
 end

data/lib/terraform/group.rb

@@ -0,0 +1,94 @@
+# 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 'delegate'
+
+module Terraform
+  # Group to be verified
+  class Group < DelegateClass Hash
+    def populate(runner:)
+      dig(:attributes).each_pair do |key, output_name|
+        runner.set_attribute key: key,
+                             value: provisioner.output(name: output_name)
+      end
+    end
+
+    def verify_each_host(options:)
+      require 'terraform/inspec_runner'
+      provisioner.each_list_output name: dig(:hostnames) do |hostname|
+        store :host, hostname
+        verifier.info "Verifying group: #{dig :name}; current host #{hostname}"
+        InspecRunner.run_and_verify group: self, options: options.merge(self),
+                                    verifier: verifier
+      end
+    end
+
+    private
+
+    attr_accessor :provisioner, :transport, :verifier
+
+    def coerce_attributes
+      store :attributes, Hash(dig(:attributes))
+    rescue ArgumentError, TypeError
+      verifier.config_error attribute: "groups][#{self}][:attributes",
+                            expected: 'a mapping of Inspec attribute names ' \
+                                        'to Terraform output variable names'
+    end
+
+    def coerce_controls
+      store :controls, Array(dig(:controls))
+    end
+
+    def coerce_hostnames
+      store :hostnames, String(dig(:hostnames))
+    end
+
+    def coerce_name
+      store :name, String(dig(:name))
+    end
+
+    def coerce_parameters
+      coerce_attributes
+      coerce_controls
+      coerce_hostnames
+      coerce_name
+      coerce_port
+      coerce_username
+    end
+
+    def coerce_port
+      store :port, Integer(dig(:port) || transport[:port])
+    rescue ArgumentError, TypeError
+      verifier.config_error attribute: "groups][#{self}][:port",
+                            expected: 'an integer'
+    end
+
+    def coerce_username
+      store :user, String(dig(:username) || transport[:username])
+    end
+
+    def initialize(value:, verifier:)
+      super Hash value
+      self.provisioner = verifier.provisioner
+      self.transport = verifier.transport
+      self.verifier = verifier
+      coerce_parameters
+    rescue ArgumentError, TypeError
+      verifier.config_error attribute: "groups][#{self}",
+                            expected: 'a group mapping'
+    end
+  end
+end

data/lib/terraform/inspec_runner.rb

@@ -22,23 +22,27 @@ module Terraform
   class InspecRunner < Inspec::Runner
     attr_reader :conf
 
-    def add(targets:)
-      targets.each { |target| add_target target, conf }
+    def self.run_and_verify(group:, options:, verifier:)
+      new(options).tap do |runner|
+        group.populate runner: runner
+        verifier.populate runner: runner
+        verifier.evaluate exit_code: runner.run
+      end
     end
 
-    def define_attribute(name:, value:)
-      conf.fetch('attributes').store name.to_s, value
+    def add(target:)
+      add_target target, conf
     end
 
-    def verify_run(verifier:)
-      verifier.evaluate exit_code: run
+    def set_attribute(key:, value:)
+      conf[:attributes].store key.to_s, value
     end
 
     private
 
     def initialize(conf = {})
+      conf.store :attributes, conf.fetch(:attributes, {}).clone
       super
-      yield self if block_given?
     end
   end
 end

data/lib/terraform/output_command.rb

@@ -15,24 +15,24 @@
 # limitations under the License.
 
 require_relative 'command'
-require_relative 'output_not_found'
 
 module Terraform
   # Command to extract values of output variables
-  class OutputCommand
-    include Command
+  class OutputCommand < Command
+    def name
+      'output'
+    end
 
-    def handle(error:)
-      raise OutputNotFound, error.message, error.backtrace if
-        error.message =~ /no(?:thing to)? output/
+    def options
+      "-state=#{state}"
     end
 
     private
 
-    def initialize_attributes(state:, name:)
-      self.name = 'output'
-      self.options = { state: state }
-      self.target = name
+    attr_accessor :state
+
+    def initialize_attributes(state:)
+      self.state = state
     end
   end
 end

data/lib/terraform/plan_command.rb

@@ -15,21 +15,48 @@
 # limitations under the License.
 
 require_relative 'command'
+require_relative 'color_switch'
 
 module Terraform
   # Command to plan an execution
-  class PlanCommand
-    include Command
+  class PlanCommand < Command
+    include ColorSwitch
+
+    def name
+      'plan'
+    end
+
+    def options
+      "-destroy=#{destroy} -input=false -out=#{out} -state=#{state}" \
+        "#{color_switch}" \
+        "#{processed_variables}#{processed_variable_files}"
+    end
 
     private
 
-    def initialize_attributes(destroy:, out:, state:, var:, var_file:, dir:)
-      self.name = 'plan'
-      self.options = {
-        destroy: destroy, input: false, out: out, state: state, var: var,
-        var_file: var_file
-      }
-      self.target = dir
+    attr_accessor :color, :destroy, :out, :state, :variables, :variable_files
+
+    def initialize_attributes(
+      color:, destroy:, out:, state:, variables:, variable_files:
+    )
+      self.color = color
+      self.destroy = destroy
+      self.out = out
+      self.state = state
+      self.variables = variables
+      self.variable_files = variable_files
+    end
+
+    def processed_variable_files
+      variable_files.each_with_object String.new do |pathname, string|
+        string.concat " -var-file=#{pathname}"
+      end
+    end
+
+    def processed_variables
+      variables.each_with_object String.new do |(key, value), string|
+        string.concat " -var='#{key}=#{value}'"
+      end
     end
   end
 end

data/lib/terraform/validate_command.rb

@@ -18,15 +18,9 @@ require_relative 'command'
 
 module Terraform
   # Command to valdidate configuration files
-  class ValidateCommand
-    include Command
-
-    private
-
-    def initialize_attributes(dir:)
-      self.name = 'validate'
-      self.options = {}
-      self.target = dir
+  class ValidateCommand < Command
+    def name
+      'validate'
     end
   end
 end

data/lib/terraform/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Terraform
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/terraform/version_command.rb

@@ -18,15 +18,9 @@ require_relative 'command'
 
 module Terraform
   # Command to obtain the version
-  class VersionCommand
-    include Command
-
-    private
-
-    def initialize_attributes(**_)
-      self.name = 'version'
-      self.options = {}
-      self.target = ''
+  class VersionCommand < Command
+    def name
+      'version'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Aaron Lane
@@ -32,7 +32,7 @@ cert_chain:
   KucGZX3OeACVUSpmCOCQyma6sDHYWQZM/IgWi7tbLtG5b2GslkauPm4S3wadHi6W
   LOU=
   -----END CERTIFICATE-----
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit
@@ -194,6 +194,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.2
+- !ruby/object:Gem::Dependency
+  name: inspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.33.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.33.2
 - !ruby/object:Gem::Dependency
   name: kitchen-inspec
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +269,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.10.0
 description: 
-email: aaron.lane@newcontext.com
+email: kitchen-terraform@newcontext.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -266,16 +280,13 @@ files:
 - lib/kitchen/provisioner/terraform.rb
 - lib/kitchen/verifier/terraform.rb
 - lib/terraform/apply_command.rb
-- lib/terraform/client.rb
-- lib/terraform/client_holder.rb
+- lib/terraform/color_switch.rb
 - lib/terraform/command.rb
-- lib/terraform/command_options.rb
-- lib/terraform/error.rb
+- lib/terraform/configurable.rb
 - lib/terraform/get_command.rb
+- lib/terraform/group.rb
 - lib/terraform/inspec_runner.rb
-- lib/terraform/invalid_version.rb
 - lib/terraform/output_command.rb
-- lib/terraform/output_not_found.rb
 - lib/terraform/plan_command.rb
 - lib/terraform/validate_command.rb
 - lib/terraform/version.rb

data/lib/terraform/client.rb

@@ -1,102 +0,0 @@
-# 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_relative 'apply_command'
-require_relative 'get_command'
-require_relative 'output_command'
-require_relative 'plan_command'
-require_relative 'validate_command'
-require_relative 'version_command'
-
-module Terraform
-  # Runs Mixlib Terraform Command instances
-  class Client
-    extend Forwardable
-
-    def_delegators :provisioner, :directory, :info, :kitchen_root,
-                   :variable_files, :variables
-
-    def apply_execution_plan
-      run command_class: ApplyCommand, state: state_pathname,
-          plan: plan_pathname
-    end
-
-    def download_modules
-      run command_class: GetCommand, dir: directory
-    end
-
-    def extract_list_output(name:)
-      extract_output(name: name) { |output| yield output.split ',' }
-    end
-
-    def extract_output(name:)
-      run(
-        command_class: OutputCommand, state: state_pathname, name: name
-      ) { |output| yield output.chomp }
-    end
-
-    def fetch_version
-      run(command_class: VersionCommand) { |output| yield output }
-    end
-
-    def instance_directory
-      kitchen_root.join '.kitchen', 'kitchen-terraform', instance_name
-    end
-
-    def plan_destructive_execution
-      run command_class: PlanCommand, destroy: true, out: plan_pathname,
-          state: state_pathname, var: variables, var_file: variable_files,
-          dir: directory
-    end
-
-    def plan_execution
-      run command_class: PlanCommand, destroy: false, out: plan_pathname,
-          state: state_pathname, var: variables, var_file: variable_files,
-          dir: directory
-    end
-
-    def plan_pathname
-      instance_directory.join 'terraform.tfplan'
-    end
-
-    def run(command_class:, **parameters)
-      command_class.new(**parameters) do |command|
-        info command
-        command.execute do |output|
-          info output
-          yield output if block_given?
-        end
-      end
-    end
-
-    def state_pathname
-      instance_directory.join 'terraform.tfstate'
-    end
-
-    def validate_configuration_files
-      run command_class: ValidateCommand, dir: directory
-    end
-
-    private
-
-    attr_accessor :instance_name, :provisioner
-
-    def initialize(instance:)
-      self.instance_name = instance.name
-      self.provisioner = instance.provisioner
-    end
-  end
-end

data/lib/terraform/client_holder.rb

@@ -1,26 +0,0 @@
-# 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_relative 'client'
-
-module Terraform
-  # Logic to provide a lazily initialized Client instance
-  module ClientHolder
-    def client
-      @client ||= Client.new instance: instance
-    end
-  end
-end

data/lib/terraform/error.rb

@@ -1,20 +0,0 @@
-# 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.
-
-module Terraform
-  class Error < StandardError
-  end
-end

data/lib/terraform/invalid_version.rb

@@ -1,34 +0,0 @@
-# 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_relative 'error'
-
-module Terraform
-  # Error of an invalid Terraform version
-  class InvalidVersion < Error
-    def message
-      "Terraform version must match #{supported_version}"
-    end
-
-    private
-
-    attr_accessor :supported_version
-
-    def initialize(supported_version)
-      self.supported_version = supported_version
-    end
-  end
-end