kitchen-terraform 5.7.1 → 6.1.0

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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_factory.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+# Copyright 2016-2021 Copado NCS LLC
+#
+# 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/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/command_executor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,14 +40,12 @@ module Kitchen
       # @yieldparam standard_output [String] the standard output of the command.
       # @raise [Kitchen::TransientFailure] if running the command results in failure.
       # @return [self]
-      def run(command:, options:)
+      def run(command:, options:, &block)
         ::Kitchen::Terraform::ShellOut.new(
           command: "#{client} #{command}",
           logger: logger,
           options: options,
-        ).run do |standard_output:|
-          yield standard_output: standard_output
-        end
+        ).run(&block)
 
         self
       end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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/command_flag/var.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/kitchen/terraform/command_flag.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 require "kitchen/terraform/config_attribute_cacher"
-require "kitchen/terraform/config_schemas/string"
+require "kitchen/terraform/config_attribute_contract/string"
 require "kitchen/terraform/config_attribute_definer"
 require "tty/which"
 
@@ -47,7 +47,7 @@ module Kitchen
           def included(plugin_class)
             ::Kitchen::Terraform::ConfigAttributeDefiner.new(
               attribute: self,
-              schema: ::Kitchen::Terraform::ConfigSchemas::String,
+              schema: ::Kitchen::Terraform::ConfigAttributeContract::String.new,
             ).define plugin_class: plugin_class
             plugin_class.expand_path_for to_sym do |plugin|
               !::TTY::Which.exist? plugin[to_sym]

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 require "kitchen"
 require "kitchen/terraform/config_attribute"
-require "kitchen/terraform/config_schemas/boolean"
+require "kitchen/terraform/config_attribute_contract/boolean"
 
 module Kitchen
   module Terraform
@@ -37,7 +37,7 @@ module Kitchen
           default_value: lambda do
             ::Kitchen.tty?
           end,
-          schema: ::Kitchen::Terraform::ConfigSchemas::Boolean,
+          schema: ::Kitchen::Terraform::ConfigAttributeContract::Boolean.new,
         ).apply config_attribute: self
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 require "kitchen"
 require "kitchen/terraform/config_attribute"
-require "kitchen/terraform/config_schemas/boolean"
+require "kitchen/terraform/config_attribute_contract/boolean"
 
 module Kitchen
   module Terraform
@@ -36,7 +36,7 @@ module Kitchen
           default_value: lambda do
             true
           end,
-          schema: ::Kitchen::Terraform::ConfigSchemas::Boolean,
+          schema: ::Kitchen::Terraform::ConfigAttributeContract::Boolean.new,
         ).apply config_attribute: self
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 require "kitchen"
 require "kitchen/terraform/config_attribute"
-require "kitchen/terraform/config_schemas/boolean"
+require "kitchen/terraform/config_attribute_contract/boolean"
 
 module Kitchen
   module Terraform
@@ -33,7 +33,7 @@ module Kitchen
           default_value: lambda do
             true
           end,
-          schema: ::Kitchen::Terraform::ConfigSchemas::Boolean,
+          schema: ::Kitchen::Terraform::ConfigAttributeContract::Boolean.new,
         ).apply config_attribute: self
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 require "kitchen/terraform/config_attribute"
 require "kitchen/terraform/config_attribute_cacher"
-require "kitchen/terraform/config_schemas/optional_string"
+require "kitchen/terraform/config_attribute_contract/optional_string"
 require "kitchen/terraform/file_path_config_attribute_definer"
 
 module Kitchen
@@ -41,7 +41,7 @@ module Kitchen
           def included(plugin_class)
             ::Kitchen::Terraform::FilePathConfigAttributeDefiner.new(
               attribute: self,
-              schema: ::Kitchen::Terraform::ConfigSchemas::OptionalString,
+              schema: ::Kitchen::Terraform::ConfigAttributeContract::OptionalString.new,
             ).define plugin_class: plugin_class
           end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2016-2019 New Context, Inc.
+# Copyright 2016-2021 Copado NCS LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 require "kitchen/terraform/config_attribute"
 require "kitchen/terraform/config_attribute_cacher"
-require "kitchen/terraform/config_schemas/string"
+require "kitchen/terraform/config_attribute_contract/string"
 require "kitchen/terraform/file_path_config_attribute_definer"
 
 module Kitchen
@@ -38,7 +38,7 @@ module Kitchen
           def included(plugin_class)
             ::Kitchen::Terraform::FilePathConfigAttributeDefiner.new(
               attribute: self,
-              schema: ::Kitchen::Terraform::ConfigSchemas::String,
+              schema: ::Kitchen::Terraform::ConfigAttributeContract::String.new,
             ).define plugin_class: plugin_class
           end