kitchen-terraform 5.5.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83839e8130c2a9767f6fd28f5fc7f382ccdc6af319b00e1d282b6bb1f8e089f2
-  data.tar.gz: 39d379b085ec51381c80cdf7cc243fdc56cba9f10844e04c012eea6f6d18cf94
+  metadata.gz: 449214862b898292af37271daa4aa2926650f252544bd1d72b778f5402631653
+  data.tar.gz: c7ea868e644097ff0302c12264a98d205da4368d30f926d860779fb5cf88bb98
 SHA512:
-  metadata.gz: f800c55453edf301d0f9227d674922ad5f7df5c1b04e704f838ac88128cf02198ac7ade685e51b078b14f936ba057d25ec48d91737eaf3a8063ebd6e0c9311a7
-  data.tar.gz: 6403f2e106f88463cf2edc6a4d4dc2ee5aba68b3c7c62fd5e2b01797b654f041859548b79d9d2538c66bd2ccded02a9ec083a23b919c4882f1d842e4ff278d06
+  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.14.0`.
+`>= 0.11.4, < 1.1.0`.
 
 [tfenv] can be used to manage versions of Terraform on the system.
 
@@ -75,7 +75,7 @@ the semantic versioning of the Ruby gem.
 
 ```ruby
 source "https://rubygems.org/" do
-  gem "kitchen-terraform", "~> 5.5"
+  gem "kitchen-terraform", "~> 5.7"
 end
 ```
 
@@ -102,7 +102,7 @@ example.
 > Installing Kitchen-Terraform with RubyGems
 
 ```sh
-gem install kitchen-terraform --version 5.5.0
+gem install kitchen-terraform --version 5.8.0
 ```
 
 This approach is not recommended as it requires more effort to install
@@ -281,4 +281,3 @@ Kitchen-Terraform is distributed under the [Apache License][license].
 [tfenv]: https://github.com/kamatama41/tfenv
 [travis-build-status-shield]: https://img.shields.io/travis/com/newcontext-oss/kitchen-terraform.svg
 [travis-build-status]: https://travis-ci.com/newcontext-oss/kitchen-terraform
-

data/lib/kitchen/terraform/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