kitchen-terraform 5.7.2 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24be7336ab4c7262f10b788ee1a05d46128685d73ad1a68ce01ab3f3249c1f57
-  data.tar.gz: 6049b0f5dc6956fb216179cb6c151e66c2479d9512f818f8b6541296a9642aa9
+  metadata.gz: 449214862b898292af37271daa4aa2926650f252544bd1d72b778f5402631653
+  data.tar.gz: c7ea868e644097ff0302c12264a98d205da4368d30f926d860779fb5cf88bb98
 SHA512:
-  metadata.gz: '081a8c15bb44c3abf56f31c7dba176bd64ba4205c03e560af0e39d78b4c3294c02dd2829facb7c92f133f360ae2aa92ecb5d46ed195123dbc3d614b1d01107e6'
-  data.tar.gz: ff5019b5f8e9db143108c8f5e49d570f60e7b8cae1ae43f8b3705b2b8def44fc62a9126f70b29762e5c04962196ac22a7bc405b013ea67377ee8d41322b7495e
+  metadata.gz: 98e59c3a77923430fbff7319968572174c54e52bcb987750e92a70e4dc35a74c8c590422d5467048fbda7480e2bb2d95710cbe6e5b3f576bd071038ba2e135ce
+  data.tar.gz: 6279a30cecd3b277bcac512c6da9c80b91f8fd7e6aa307876206161171e773291c94fe406b8ef88b00cd35a3b0745008b3b3a1324cd4a5e78844801b96ac7378

data/README.md

@@ -36,7 +36,7 @@ Installation instructions can be found in the
 [Terraform: Install Terraform][terraform-install] article.
 
 Kitchen-Terraform supports versions of Terraform in the interval of
-`>= 0.11.4, < 0.15.0`.
+`>= 0.11.4, < 1.1.0`.
 
 [tfenv] can be used to manage versions of Terraform on the system.
 
@@ -102,7 +102,7 @@ example.
 > Installing Kitchen-Terraform with RubyGems
 
 ```sh
-gem install kitchen-terraform --version 5.7.2
+gem install kitchen-terraform --version 5.8.0
 ```
 
 This approach is not recommended as it requires more effort to install

data/lib/kitchen/terraform/command/init.rb

@@ -14,88 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/terraform/command_flag/backend_config"
-require "kitchen/terraform/command_flag/color"
-require "kitchen/terraform/command_flag/lock_timeout"
-require "kitchen/terraform/command_flag/plugin_dir"
-require "kitchen/terraform/command_flag/upgrade"
-
 module Kitchen
   module Terraform
     module Command
-      # The working directory is initialized by running a command like the following example:
-      #   terraform init \
-      #     -input=false \
-      #     -lock=<lock> \
-      #     -lock-timeout=<lock_timeout>s \
-      #     [-no-color] \
-      #     [-upgrade] \
-      #     -force-copy \
-      #     -backend=true \
-      #     [-backend-config=<backend_configurations[0]> ...] \
-      #     -get=true \
-      #     -get-plugins=true \
-      #     [-plugin-dir=<plugin_directory>] \
-      #     -verify-plugins=true \
-      #     <root_module_directory>
-      class Init
-        # #initialize prepares a new instance of the class.
-        #
-        # @param config [Hash] the configuration of the driver.
-        # @option config [Hash{String=>String}] :backend_configurations Terraform backend configuration arguments to
-        #   complete a partial backend configuration.
-        # @option config [Boolean] :color a toggle of colored output from the Terraform client.
-        # @option config [Integer] :command_timeout the the number of seconds to wait for the command to finish running.
-        # @option config [Boolean] :lock a toggle of locking for the Terraform state file.
-        # @option config [Integer] :lock_timeout the number of seconds that the Terraform client will wait for a lock
-        #   on the state to be obtained during operations.
-        # @option config [String] :plugin_directory the pathname of the directory which contains
-        #   customized Terraform provider plugins to install in place of the official Terraform provider plugins.
-        # @option config [String] :root_module_directory the pathname of the directory which contains the root
-        #   Terraform module.
-        # @option config [Boolean] :upgrade_during_init a toggle for upgrading modules and plugins.
-        # @return [Kitchen::Terraform::Command::Init]
-        def initialize(config:)
-          self.backend_config = ::Kitchen::Terraform::CommandFlag::BackendConfig.new arguments: config.fetch(
-            :backend_configurations
-          )
-          self.color = ::Kitchen::Terraform::CommandFlag::Color.new enabled: config.fetch(:color)
-          self.lock = config.fetch :lock
-          self.lock_timeout = ::Kitchen::Terraform::CommandFlag::LockTimeout.new duration: config.fetch(:lock_timeout)
-          self.plugin_dir = ::Kitchen::Terraform::CommandFlag::PluginDir.new pathname: config.fetch(
-            :plugin_directory
-          )
-          self.upgrade = ::Kitchen::Terraform::CommandFlag::Upgrade.new enabled: config.fetch(:upgrade_during_init)
-        end
-
-        # @return [String] the command with flags.
-        def to_s
-          "init " \
-          "-input=false " \
-          "-lock=#{lock} " \
-          "#{lock_timeout} " \
-          "#{color} " \
-          "#{upgrade} " \
-          "-force-copy " \
-          "-backend=true " \
-          "#{backend_config} " \
-          "-get=true " \
-          "-get-plugins=true " \
-          "#{plugin_dir} " \
-          "-verify-plugins=true"
-        end
-
-        private
-
-        attr_accessor(
-          :backend_config,
-          :color,
-          :lock,
-          :lock_timeout,
-          :options,
-          :plugin_dir,
-          :upgrade,
-        )
+      # Init is the namespace for Terraform Init commands.
+      module Init
       end
     end
   end

data/lib/kitchen/terraform/command/init/post_zero_fifteen_zero.rb

@@ -0,0 +1,89 @@
+# 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 "kitchen/terraform/command_flag/backend_config"
+require "kitchen/terraform/command_flag/color"
+require "kitchen/terraform/command_flag/lock_timeout"
+require "kitchen/terraform/command_flag/plugin_dir"
+require "kitchen/terraform/command_flag/upgrade"
+
+module Kitchen
+  module Terraform
+    module Command
+      module Init
+        # The working directory is initialized by running a command like the following example:
+        #   terraform init \
+        #     -backend=true \
+        #     [-backend-config=<backend_configurations[0]> ...] \
+        #     -force-copy \
+        #     -get=true \
+        #     -input=false \
+        #     [-no-color] \
+        #     [-plugin-dir=<plugin_directory>] \
+        #     [-upgrade=true] \
+        #     <root_module_directory>
+        class PostZeroFifteenZero
+          # #initialize prepares a new instance of the class.
+          #
+          # @param config [Hash] the configuration of the driver.
+          # @option config [Hash{String=>String}] :backend_configurations Terraform backend configuration arguments to
+          #   complete a partial backend configuration.
+          # @option config [Boolean] :color a toggle of colored output from the Terraform client.
+          #   on the state to be obtained during operations.
+          # @option config [String] :plugin_directory the pathname of the directory which contains
+          #   customized Terraform provider plugins to install in place of the official Terraform provider plugins.
+          # @option config [Boolean] :upgrade_during_init a toggle for upgrading modules and plugins.
+          # @return [Kitchen::Terraform::Command::Init::PostZeroFifteenZero]
+          def initialize(config:)
+            self.backend_config = ::Kitchen::Terraform::CommandFlag::BackendConfig.new arguments: config.fetch(
+              :backend_configurations
+            )
+            self.color = ::Kitchen::Terraform::CommandFlag::Color.new enabled: config.fetch(:color)
+            self.plugin_dir = ::Kitchen::Terraform::CommandFlag::PluginDir.new pathname: config.fetch(
+              :plugin_directory
+            )
+            self.upgrade = ::Kitchen::Terraform::CommandFlag::Upgrade.new enabled: config.fetch(:upgrade_during_init)
+          end
+
+          # @return [String] the command with flags.
+          def to_s
+            "init " \
+            "-backend=true " \
+            "#{backend_config} " \
+            "-force-copy=true " \
+            "-get=true " \
+            "-input=false " \
+            "#{color} " \
+            "#{plugin_dir} " \
+            "#{upgrade}"
+          end
+
+          private
+
+          attr_accessor(
+            :backend_config,
+            :color,
+            :lock,
+            :lock_timeout,
+            :options,
+            :plugin_dir,
+            :upgrade,
+          )
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/terraform/command/init/pre_zero_fifteen_zero.rb

@@ -0,0 +1,101 @@
+# 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 "kitchen/terraform/command_flag/backend_config"
+require "kitchen/terraform/command_flag/color"
+require "kitchen/terraform/command_flag/lock_timeout"
+require "kitchen/terraform/command_flag/plugin_dir"
+require "kitchen/terraform/command_flag/upgrade"
+
+module Kitchen
+  module Terraform
+    module Command
+      module Init
+        # The working directory is initialized by running a command like the following example:
+        #   terraform init \
+        #     -backend=true \
+        #     [-backend-config=<backend_configurations[0]> ...] \
+        #     -force-copy \
+        #     -get=true \
+        #     -get-plugins=true \
+        #     -input=false \
+        #     -lock=<lock> \
+        #     -lock-timeout=<lock_timeout>s \
+        #     [-no-color] \
+        #     [-plugin-dir=<plugin_directory>] \
+        #     [-upgrade=true] \
+        #     -verify-plugins=true \
+        #     <root_module_directory>
+        class PreZeroFifteenZero
+          # #initialize prepares a new instance of the class.
+          #
+          # @param config [Hash] the configuration of the driver.
+          # @option config [Hash{String=>String}] :backend_configurations Terraform backend configuration arguments to
+          #   complete a partial backend configuration.
+          # @option config [Boolean] :color a toggle of colored output from the Terraform client.
+          # @option config [Boolean] :lock a toggle of locking for the Terraform state file.
+          # @option config [Integer] :lock_timeout the number of seconds that the Terraform client will wait for a lock
+          #   on the state to be obtained during operations.
+          # @option config [String] :plugin_directory the pathname of the directory which contains
+          #   customized Terraform provider plugins to install in place of the official Terraform provider plugins.
+          # @option config [Boolean] :upgrade_during_init a toggle for upgrading modules and plugins.
+          # @return [Kitchen::Terraform::Command::Init::PreZeroFifteenZero]
+          def initialize(config:)
+            self.backend_config = ::Kitchen::Terraform::CommandFlag::BackendConfig.new arguments: config.fetch(
+              :backend_configurations
+            )
+            self.color = ::Kitchen::Terraform::CommandFlag::Color.new enabled: config.fetch(:color)
+            self.lock = config.fetch :lock
+            self.lock_timeout = ::Kitchen::Terraform::CommandFlag::LockTimeout.new duration: config.fetch(:lock_timeout)
+            self.plugin_dir = ::Kitchen::Terraform::CommandFlag::PluginDir.new pathname: config.fetch(
+              :plugin_directory
+            )
+            self.upgrade = ::Kitchen::Terraform::CommandFlag::Upgrade.new enabled: config.fetch(:upgrade_during_init)
+          end
+
+          # @return [String] the command with flags.
+          def to_s
+            "init " \
+            "-backend=true " \
+            "#{backend_config} " \
+            "-force-copy=true " \
+            "-get=true " \
+            "-get-plugins=true " \
+            "-input=false " \
+            "-lock=#{lock} " \
+            "#{lock_timeout} " \
+            "#{color} " \
+            "#{plugin_dir} " \
+            "#{upgrade} " \
+            "-verify-plugins=true"
+          end
+
+          private
+
+          attr_accessor(
+            :backend_config,
+            :color,
+            :lock,
+            :lock_timeout,
+            :options,
+            :plugin_dir,
+            :upgrade,
+          )
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/terraform/command/init_factory.rb

@@ -0,0 +1,52 @@
+# 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 "kitchen/terraform/command/init/post_zero_fifteen_zero"
+require "kitchen/terraform/command/init/pre_zero_fifteen_zero"
+require "rubygems"
+
+module Kitchen
+  module Terraform
+    module Command
+      # InitFactory is the class of objects which build Init objects.
+      class InitFactory
+        # #build creates a new instance of an Init object.
+        #
+        # @param config [Hash] the configuration of the driver.
+        # @return [Kitchen::Terraform::Command::Init::PreZeroFifteenZero,
+        #   Kitchen::Terraform::Command::Init::PostZeroFifteenZero]
+        def build(config:)
+          return ::Kitchen::Terraform::Command::Init::PreZeroFifteenZero.new config: config if requirement.satisfied_by? version
+
+          ::Kitchen::Terraform::Command::Init::PostZeroFifteenZero.new config: config
+        end
+
+        # #initialize prepares a new instance of the class
+        #
+        # @param version [Gem::Version] a client version.
+        # @return [Kitchen::Terraform::Command::InitFactory]
+        def initialize(version:)
+          self.requirement = ::Gem::Requirement.new "< 0.15.0"
+          self.version = version
+        end
+
+        private
+
+        attr_accessor :requirement, :version
+      end
+    end
+  end
+end

data/lib/kitchen/terraform/command/validate.rb

@@ -14,49 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/terraform/command_flag/color"
-require "kitchen/terraform/command_flag/var_file"
-require "kitchen/terraform/command_flag/var"
-require "shellwords"
-
 module Kitchen
   module Terraform
     module Command
-      # The root module is validated by running a command like the following example:
-      #   terraform validate \
-      #     [-no-color] \
-      #     [-var=<variables.first>...] \
-      #     [-var-file=<variable_files.first>...] \
-      #     <directory>
-      class Validate
-        # #initialize prepares a new instance of the class.
-        #
-        # @param config [Hash] the configuration of the driver.
-        # @option config [Boolean] :color a toggle of colored output from the Terraform client.
-        # @option config [Array<String>] :variable_files a list of pathnames of Terraform variable files to evaluate.
-        # @option config [Hash{String=>String}] :variables a mapping of Terraform variables to evaluate.
-        # @return [Kitchen::Terraform::Command::Validate]
-        def initialize(config:)
-          self.color = ::Kitchen::Terraform::CommandFlag::Color.new enabled: config.fetch(:color)
-          self.var_file = ::Kitchen::Terraform::CommandFlag::VarFile.new pathnames: config.fetch(:variable_files)
-          self.var = ::Kitchen::Terraform::CommandFlag::Var.new arguments: config.fetch(:variables)
-        end
-
-        # @return [String] the command with flags.
-        def to_s
-          "validate " \
-          "#{color} " \
-          "#{var} " \
-          "#{var_file}"
-        end
-
-        private
-
-        attr_accessor(
-          :color,
-          :var_file,
-          :var,
-        )
+      # Validate is the namespace for Terraform Validate commands.
+      module Validate
       end
     end
   end

data/lib/kitchen/terraform/command/validate/post_zero_fifteen_zero.rb

@@ -0,0 +1,51 @@
+# 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 "kitchen/terraform/command_flag/color"
+require "shellwords"
+
+module Kitchen
+  module Terraform
+    module Command
+      module Validate
+        # The root module is validated by running a command like the following example:
+        #   terraform validate \
+        #     [-no-color] \
+        #     <directory>
+        class PostZeroFifteenZero
+          # #initialize prepares a new instance of the class.
+          #
+          # @param config [Hash] the configuration of the driver.
+          # @option config [Boolean] :color a toggle of colored output from the Terraform client.
+          # @return [Kitchen::Terraform::Command::Validate]
+          def initialize(config:)
+            self.color = ::Kitchen::Terraform::CommandFlag::Color.new enabled: config.fetch(:color)
+          end
+
+          # @return [String] the command with flags.
+          def to_s
+            "validate " \
+            "#{color}"
+          end
+
+          private
+
+          attr_accessor :color
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/terraform/command/validate/pre_zero_fifteen_zero.rb

@@ -0,0 +1,65 @@
+# 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 "kitchen/terraform/command_flag/color"
+require "kitchen/terraform/command_flag/var_file"
+require "kitchen/terraform/command_flag/var"
+require "shellwords"
+
+module Kitchen
+  module Terraform
+    module Command
+      module Validate
+        # The root module is validated by running a command like the following example:
+        #   terraform validate \
+        #     [-no-color] \
+        #     [-var=<variables.first>...] \
+        #     [-var-file=<variable_files.first>...] \
+        #     <directory>
+        class PreZeroFifteenZero
+          # #initialize prepares a new instance of the class.
+          #
+          # @param config [Hash] the configuration of the driver.
+          # @option config [Boolean] :color a toggle of colored output from the Terraform client.
+          # @option config [Array<String>] :variable_files a list of pathnames of Terraform variable files to evaluate.
+          # @option config [Hash{String=>String}] :variables a mapping of Terraform variables to evaluate.
+          # @return [Kitchen::Terraform::Command::Validate]
+          def initialize(config:)
+            self.color = ::Kitchen::Terraform::CommandFlag::Color.new enabled: config.fetch(:color)
+            self.var_file = ::Kitchen::Terraform::CommandFlag::VarFile.new pathnames: config.fetch(:variable_files)
+            self.var = ::Kitchen::Terraform::CommandFlag::Var.new arguments: config.fetch(:variables)
+          end
+
+          # @return [String] the command with flags.
+          def to_s
+            "validate " \
+            "#{color} " \
+            "#{var} " \
+            "#{var_file}"
+          end
+
+          private
+
+          attr_accessor(
+            :color,
+            :var_file,
+            :var,
+          )
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/terraform/command/validate_factory.rb

@@ -0,0 +1,54 @@
+# 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 "kitchen/terraform/command/validate/post_zero_fifteen_zero"
+require "kitchen/terraform/command/validate/pre_zero_fifteen_zero"
+require "rubygems"
+
+module Kitchen
+  module Terraform
+    module Command
+      # ValidateFactory is the class of objects which build Validate objects.
+      class ValidateFactory
+        # #build creates a new instance of an Validate object.
+        #
+        # @param config [Hash] the configuration of the driver.
+        # @return [Kitchen::Terraform::Command::Validate::PreZeroFifteenZero,
+        #   Kitchen::Terraform::Command::Validate::PostZeroFifteenZero]
+        def build(config:)
+          if requirement.satisfied_by? version
+            return ::Kitchen::Terraform::Command::Validate::PreZeroFifteenZero.new config: config
+          end
+
+          ::Kitchen::Terraform::Command::Validate::PostZeroFifteenZero.new config: config
+        end
+
+        # #initialize prepares a new instance of the class
+        #
+        # @param version [Gem::Version] a client version.
+        # @return [Kitchen::Terraform::Command::ValidateFactory]
+        def initialize(version:)
+          self.requirement = ::Gem::Requirement.new "< 0.15.0"
+          self.version = version
+        end
+
+        private
+
+        attr_accessor :requirement, :version
+      end
+    end
+  end
+end

data/lib/kitchen/terraform/command_flag/upgrade.rb

@@ -30,7 +30,7 @@ module Kitchen
         # @return [String] the upgrade flag.
         def to_s
           if enabled
-            "-upgrade"
+            "-upgrade=true"
           else
             ""
           end

data/lib/kitchen/terraform/configurable.rb

@@ -42,7 +42,7 @@ module Kitchen
       # @see Kitchen::Configurable#finalize_config!
       def finalize_config!(instance)
         super instance
-        self.version_requirement = ::Gem::Requirement.new ">= 0.11.4", "< 0.15.0"
+        self.version_requirement = ::Gem::Requirement.new ">= 0.11.4", "< 1.1.0"
         self.workspace_name = "kitchen-terraform-#{::Shellwords.escape instance.name}"
       end
 

data/lib/kitchen/terraform/driver/create.rb

@@ -15,12 +15,13 @@
 # limitations under the License.
 
 require "kitchen"
-require "kitchen/terraform/command/init"
+require "kitchen/terraform/command/init_factory"
 require "kitchen/terraform/command/version"
 require "kitchen/terraform/command/workspace_new"
 require "kitchen/terraform/command/workspace_select"
 require "kitchen/terraform/command_executor"
 require "kitchen/terraform/verify_version"
+require "rubygems"
 
 module Kitchen
   module Terraform
@@ -29,7 +30,13 @@ module Kitchen
       #
       # ===== Initializing the Terraform Working Directory
       #
-      # {include:Kitchen::Terraform::Command::Init}
+      # ====== Terraform >= 0.15.0
+      #
+      # {include:Kitchen::Terraform::Command::Init::PostZeroFifteenZero}
+      #
+      # ====== Terraform < 0.15.0
+      #
+      # {include:Kitchen::Terraform::Command::Init::PreZeroFifteenZero}
       #
       # ===== Creating or Selecting the Test Terraform Workspace
       #
@@ -42,7 +49,8 @@ module Kitchen
         # @raise [Kitchen::TransientFailure] if a command fails.
         # @return [self]
         def call
-          verify_version.call command: version, options: options
+          read_client_version
+          verify_version.call version: client_version
           initialize_directory
           create_or_select_workspace
 
@@ -58,20 +66,22 @@ module Kitchen
         # @option config [String] :client the pathname of the Terraform client.
         # @return [Kitchen::Terraform::Driver::Create]
         def initialize(config:, logger:, version_requirement:, workspace_name:)
-          hash_config = config.to_hash.merge upgrade_during_init: true, workspace_name: workspace_name
+          self.complete_config = config.to_hash.merge upgrade_during_init: true, workspace_name: workspace_name
+          self.client_version = ::Gem::Version.new "0.0.0"
           self.command_executor = ::Kitchen::Terraform::CommandExecutor.new(
-            client: config.fetch(:client),
+            client: complete_config.fetch(:client),
             logger: logger,
           )
-          self.init = ::Kitchen::Terraform::Command::Init.new config: hash_config
           self.logger = logger
-          self.options = { cwd: config.fetch(:root_module_directory), timeout: config.fetch(:command_timeout) }
+          self.options = {
+            cwd: complete_config.fetch(:root_module_directory),
+            timeout: complete_config.fetch(:command_timeout),
+          }
           self.workspace_name = workspace_name
-          self.workspace_new = ::Kitchen::Terraform::Command::WorkspaceNew.new config: hash_config
-          self.workspace_select = ::Kitchen::Terraform::Command::WorkspaceSelect.new config: hash_config
+          self.workspace_new = ::Kitchen::Terraform::Command::WorkspaceNew.new config: complete_config
+          self.workspace_select = ::Kitchen::Terraform::Command::WorkspaceSelect.new config: complete_config
           self.verify_version = ::Kitchen::Terraform::VerifyVersion.new(
-            command_executor: command_executor,
-            config: config,
+            config: complete_config,
             logger: logger,
             version_requirement: version_requirement,
           )
@@ -81,8 +91,9 @@ module Kitchen
         private
 
         attr_accessor(
+          :client_version,
           :command_executor,
-          :init,
+          :complete_config,
           :logger,
           :options,
           :verify_version,
@@ -103,11 +114,23 @@ module Kitchen
 
         def initialize_directory
           logger.warn "Initializing the Terraform working directory..."
-          command_executor.run command: init, options: options do |standard_output:|
+          command_executor.run(
+            command: ::Kitchen::Terraform::Command::InitFactory.new(version: client_version)
+              .build(config: complete_config),
+            options: options,
+          ) do |standard_output:|
           end
           logger.warn "Finished initializing the Terraform working directory."
         end
 
+        def read_client_version
+          logger.warn "Reading the Terraform client version..."
+          command_executor.run command: version, options: options do |standard_output:|
+            self.client_version = ::Gem::Version.new standard_output.slice /Terraform v(\d+\.\d+\.\d+)/, 1
+          end
+          logger.warn "Finished reading the Terraform client version."
+        end
+
         def select_workspace
           logger.warn "Selecting the #{workspace_name} Terraform workspace..."
           command_executor.run command: workspace_select, options: options do |standard_output:|

data/lib/kitchen/terraform/driver/destroy.rb

@@ -17,12 +17,13 @@
 require "kitchen"
 require "kitchen/terraform/command_executor"
 require "kitchen/terraform/command/destroy"
-require "kitchen/terraform/command/init"
+require "kitchen/terraform/command/init_factory"
 require "kitchen/terraform/command/version"
 require "kitchen/terraform/command/workspace_delete"
 require "kitchen/terraform/command/workspace_new"
 require "kitchen/terraform/command/workspace_select"
 require "kitchen/terraform/verify_version"
+require "rubygems"
 
 module Kitchen
   module Terraform
@@ -31,7 +32,13 @@ module Kitchen
       #
       # ===== Initializing the Terraform Working Directory
       #
-      # {include:Kitchen::Terraform::Command::Init}
+      # ====== Terraform >= 0.15.0
+      #
+      # {include:Kitchen::Terraform::Command::Init::PostZeroFifteenZero}
+      #
+      # ====== Terraform < 0.15.0
+      #
+      # {include:Kitchen::Terraform::Command::Init::PreZeroFifteenZero}
       #
       # ===== Selecting or Creating the Test Terraform Workspace
       #
@@ -56,7 +63,8 @@ module Kitchen
         # @raise [Kitchen::TransientFailure] if a command fails.
         # @return [self]
         def call
-          verify_version.call command: version, options: options
+          read_client_version
+          verify_version.call version: client_version
           execute_workflow
 
           self
@@ -70,25 +78,24 @@ module Kitchen
         # @param workspace_name [String] the name of the Terraform workspace to select or to create.
         # @return [Kitchen::Terraform::Driver::Destroy]
         def initialize(config:, logger:, version_requirement:, workspace_name:)
-          hash_config = config.to_hash.merge upgrade_during_init: false, workspace_name: workspace_name
+          self.complete_config = config.to_hash.merge upgrade_during_init: false, workspace_name: workspace_name
+          self.client_version = ::Gem::Version.new "0.0.0"
           self.command_executor = ::Kitchen::Terraform::CommandExecutor.new(
-            client: config.fetch(:client),
+            client: complete_config.fetch(:client),
             logger: logger,
           )
           self.logger = logger
-          define_options config: config
+          define_options
           self.workspace_name = workspace_name
-          self.destroy = ::Kitchen::Terraform::Command::Destroy.new config: config
-          self.init = ::Kitchen::Terraform::Command::Init.new config: hash_config
-          self.workspace_delete_test = ::Kitchen::Terraform::Command::WorkspaceDelete.new config: hash_config
-          self.workspace_new_test = ::Kitchen::Terraform::Command::WorkspaceNew.new config: hash_config
-          self.workspace_select_test = ::Kitchen::Terraform::Command::WorkspaceSelect.new config: hash_config
+          self.destroy = ::Kitchen::Terraform::Command::Destroy.new config: complete_config
+          self.workspace_delete_test = ::Kitchen::Terraform::Command::WorkspaceDelete.new config: complete_config
+          self.workspace_new_test = ::Kitchen::Terraform::Command::WorkspaceNew.new config: complete_config
+          self.workspace_select_test = ::Kitchen::Terraform::Command::WorkspaceSelect.new config: complete_config
           self.workspace_select_default = ::Kitchen::Terraform::Command::WorkspaceSelect.new(
-            config: hash_config.merge(workspace_name: "default"),
+            config: complete_config.merge(workspace_name: "default"),
           )
           self.verify_version = ::Kitchen::Terraform::VerifyVersion.new(
-            command_executor: command_executor,
-            config: config,
+            config: complete_config,
             logger: logger,
             version_requirement: version_requirement,
           )
@@ -98,9 +105,11 @@ module Kitchen
         private
 
         attr_accessor(
+          :client_version,
           :command_executor,
-          :destroy,
+          :complete_config,
           :destroy_options,
+          :destroy,
           :init,
           :logger,
           :options,
@@ -120,10 +129,13 @@ module Kitchen
           logger.warn "Finished creating the #{workspace_name} Terraform workspace."
         end
 
-        def define_options(config:)
-          self.options = { cwd: config.fetch(:root_module_directory), timeout: config.fetch(:command_timeout) }
+        def define_options
+          self.options = {
+            cwd: complete_config.fetch(:root_module_directory),
+            timeout: complete_config.fetch(:command_timeout),
+          }
           self.destroy_options = options.merge(
-            environment: { "LC_ALL" => nil, "TF_IN_AUTOMATION" => "true", "TF_WARN_OUTPUT_ERRORS" => "true" }
+            environment: { "LC_ALL" => nil, "TF_IN_AUTOMATION" => "true", "TF_WARN_OUTPUT_ERRORS" => "true" },
           )
         end
 
@@ -151,11 +163,23 @@ module Kitchen
 
         def initialize_directory
           logger.warn "Initializing the Terraform working directory..."
-          command_executor.run command: init, options: options do |standard_output:|
+          command_executor.run(
+            command: ::Kitchen::Terraform::Command::InitFactory.new(version: client_version)
+              .build(config: complete_config),
+            options: options,
+          ) do |standard_output:|
           end
           logger.warn "Finished initializing the Terraform working directory."
         end
 
+        def read_client_version
+          logger.warn "Reading the Terraform client version..."
+          command_executor.run command: version, options: options do |standard_output:|
+            self.client_version = ::Gem::Version.new standard_output.slice /Terraform v(\d+\.\d+\.\d+)/, 1
+          end
+          logger.warn "Finished reading the Terraform client version."
+        end
+
         def select_default_workspace
           logger.warn "Selecting the default Terraform workspace..."
           command_executor.run command: workspace_select_default, options: options do |standard_output:|

data/lib/kitchen/terraform/inspec_runner.rb

@@ -65,7 +65,7 @@ module Kitchen
           loader.load_all
           loader.exit_on_load_error
         end
-        
+
         self.runner = ::Inspec::Runner.new options.merge logger: ::Inspec::Log.logger
 
         profile_locations.each do |profile_location|

data/lib/kitchen/terraform/provisioner/converge.rb

@@ -19,7 +19,7 @@ require "kitchen/terraform/command_executor"
 require "kitchen/terraform/command/apply"
 require "kitchen/terraform/command/get"
 require "kitchen/terraform/command/output"
-require "kitchen/terraform/command/validate"
+require "kitchen/terraform/command/validate_factory"
 require "kitchen/terraform/command/workspace_select"
 require "kitchen/terraform/debug_logger"
 require "kitchen/terraform/outputs_manager"
@@ -28,6 +28,7 @@ require "kitchen/terraform/outputs_reader"
 require "kitchen/terraform/variables_manager"
 require "kitchen/terraform/verify_version"
 require "kitchen/terraform/version"
+require "rubygems"
 
 module Kitchen
   module Terraform
@@ -44,7 +45,13 @@ module Kitchen
       #
       # ===== Validating the Terraform Root Module
       #
-      # {include:Kitchen::Terraform::Command::Validate}
+      # ====== Terraform >= 0.15.0
+      #
+      # {include:Kitchen::Terraform::Command::Validate::PostZeroFifteenZero}
+      #
+      # ====== Terraform < 0.15.0
+      #
+      # {include:Kitchen::Terraform::Command::Validate::PreZeroFifteenZero}
       #
       # ===== Applying the Terraform State Changes
       #
@@ -60,7 +67,8 @@ module Kitchen
         # @raise [Kitchen::TransientFailure] if a command fails.
         # @return [self]
         def call(state:)
-          verify_version.call command: version, options: options
+          read_client_version
+          verify_version.call version: client_version
           execute_workflow
           save_variables_and_outputs state: state
 
@@ -75,51 +83,50 @@ module Kitchen
         # @param workspace_name [String] the name of the Terraform workspace to select or to create.
         # @return [Kitchen::Terraform::Driver::Converge]
         def initialize(config:, logger:, version_requirement:, workspace_name:)
-          client = config.fetch :client
-          hash_config = config.to_hash.merge workspace_name: workspace_name
+          self.complete_config = config.to_hash.merge workspace_name: workspace_name
+          client = complete_config.fetch :client
+          self.client_version = ::Gem::Version.new "0.0.0"
           self.command_executor = ::Kitchen::Terraform::CommandExecutor.new(
             client: client,
             logger: logger,
           )
           self.logger = logger
-          self.options = { cwd: config.fetch(:root_module_directory), timeout: config.fetch(:command_timeout) }
+          self.options = {
+            cwd: complete_config.fetch(:root_module_directory),
+            timeout: complete_config.fetch(:command_timeout),
+          }
           self.workspace_name = workspace_name
-          self.apply = ::Kitchen::Terraform::Command::Apply.new config: config
-          self.get = ::Kitchen::Terraform::Command::Get.new
-          self.output = ::Kitchen::Terraform::Command::Output.new
+          initialize_commands
           initialize_outputs_handlers client: client, logger: logger
-          self.validate = ::Kitchen::Terraform::Command::Validate.new config: config
-          self.workspace_select = ::Kitchen::Terraform::Command::WorkspaceSelect.new config: hash_config
-          self.variables = config.fetch :variables
+          self.variables = complete_config.fetch :variables
           self.variables_manager = ::Kitchen::Terraform::VariablesManager.new
           self.verify_version = ::Kitchen::Terraform::VerifyVersion.new(
-            command_executor: command_executor,
-            config: config,
+            config: complete_config,
             logger: logger,
             version_requirement: version_requirement,
           )
-          self.version = ::Kitchen::Terraform::Command::Version.new
         end
 
         private
 
         attr_accessor(
-          :command_executor,
           :apply,
+          :client_version,
+          :command_executor,
+          :complete_config,
           :get,
-          :output,
-          :validate,
-          :workspace_select,
           :logger,
           :options,
+          :output,
           :outputs_manager,
           :outputs_parser,
           :outputs_reader,
-          :variables,
           :variables_manager,
+          :variables,
           :verify_version,
           :version,
           :workspace_name,
+          :workspace_select,
         )
 
         def build_infrastructure
@@ -143,6 +150,14 @@ module Kitchen
           build_infrastructure
         end
 
+        def initialize_commands
+          self.apply = ::Kitchen::Terraform::Command::Apply.new config: complete_config
+          self.get = ::Kitchen::Terraform::Command::Get.new
+          self.output = ::Kitchen::Terraform::Command::Output.new
+          self.workspace_select = ::Kitchen::Terraform::Command::WorkspaceSelect.new config: complete_config
+          self.version = ::Kitchen::Terraform::Command::Version.new
+        end
+
         def initialize_outputs_handlers(client:, logger:)
           self.outputs_manager = ::Kitchen::Terraform::OutputsManager.new
           self.outputs_parser = ::Kitchen::Terraform::OutputsParser.new
@@ -172,6 +187,14 @@ module Kitchen
           end
         end
 
+        def read_client_version
+          logger.warn "Reading the Terraform client version..."
+          command_executor.run command: version, options: options do |standard_output:|
+            self.client_version = ::Gem::Version.new standard_output.slice /Terraform v(\d+\.\d+\.\d+)/, 1
+          end
+          logger.warn "Finished reading the Terraform client version."
+        end
+
         def save_outputs(parsed_outputs:, state:)
           logger.warn "Writing the output variables to the Kitchen instance state..."
           outputs_manager.save outputs: parsed_outputs, state: state
@@ -196,7 +219,11 @@ module Kitchen
 
         def validate_files
           logger.warn "Validating the Terraform configuration files..."
-          command_executor.run command: validate, options: options do |standard_output:|
+          command_executor.run(
+            command: ::Kitchen::Terraform::Command::ValidateFactory.new(version: client_version)
+              .build(config: complete_config),
+            options: options,
+          ) do |standard_output:|
           end
           logger.warn "Finished validating the Terraform configuration files."
         end

data/lib/kitchen/terraform/verify_version.rb

@@ -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/version.rb

@@ -71,7 +71,7 @@ module Kitchen
 
         # @api private
         def value
-          self.value = ::Gem::Version.new "5.7.2" if not @value
+          self.value = ::Gem::Version.new "5.8.0" if not @value
           @value
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 5.7.2
+  version: 5.8.0
 platform: ruby
 authors:
 - Aaron Lane
@@ -62,7 +62,7 @@ cert_chain:
   JH4yGDzVEYaZHaohSDcYuGLK6OQylPu7oM75S+TNLWseDIT8bWgQk6NelVjtQQ2Q
   XSbgfu863jyey/0qO01cUo3+iTqzl85cWg==
   -----END CERTIFICATE-----
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -428,8 +428,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
@@ -542,8 +548,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- Terraform >= v0.11.4, < v0.15.0
-rubygems_version: 3.0.3
+- Terraform >= v0.11.4, < v1.1.0
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Test Kitchen plugins for testing Terraform configuration