test-kitchen 3.0.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cff7935683511121e07b20e636078776ae80c20fc007b5b08a922ce76e0ce94
-  data.tar.gz: 8207e168e7faf42b8239438753c58f2a9a37fc4f4f2dcd9728948f67b4a5afb9
+  metadata.gz: d13b33db25f75d1d7f7a89d6da2a7eb2e78da9a8c7416ed6cf7a8d72e2e690a2
+  data.tar.gz: bb0352e0588277a0cff8d03364e09608cbd4f68218824a041d26d2f7c3c74a4b
 SHA512:
-  metadata.gz: 46356119baf46a5ec115cc036c81778e8f17ac2dca6a21733d7bb4ef8779d7d23724ef295cd1f0557083abe577578ff28eec2bb5d9a4596359d8c5c34ea0379b
-  data.tar.gz: 7770f0e415279795ecf2106a6005f7b1514bd692be9a5839d24e992ad4e03dcbbe33dd86892904b1dd87a73473a3484d3f44518f7b87211d1c340c3f94abd6a3
+  metadata.gz: 3d6cd7cdfff82e128a602f8eab578834168051940aadb50fdee9988f45ae9baa1b20053dc8580e69ce70ad160edb4d46e8bdf458cf36245a4dff97d13f128175
+  data.tar.gz: f05de5e3be22a367cdafb162e70651fcf9b9f881d8948654988c93648f650619ef63b2b2cf70d55b0818e94f057695c06465cf59f5a9168aa085ebb4710aa1f3

data/Gemfile

@@ -17,5 +17,5 @@ group :debug do
 end
 
 group :chefstyle do
-  gem "chefstyle", "2.0.5"
+  gem "chefstyle", "2.1.0"
 end

data/lib/kitchen/provisioner/chef_base.rb

@@ -69,7 +69,7 @@ module Kitchen
         README.* VERSION metadata.{json,rb} attributes.rb recipe.rb
         attributes/**/* definitions/**/* files/**/* libraries/**/*
         providers/**/* recipes/**/* resources/**/* templates/**/*
-        ohai/**/*
+        ohai/**/* compliance/**/*
       ).join(",")
       # to ease upgrades, allow the user to turn deprecation warnings into errors
       default_config :deprecations_as_errors, false
@@ -681,25 +681,42 @@ module Kitchen
         chef_cmds(base_cmd).join(separator)
       end
 
-      # Gives an array of command
+      # Gives an array of commands
       # @api private
       def chef_cmds(base_cmd)
-        cmd = prefix_command(wrap_shell_code(
-          [base_cmd, *chef_args(config_filename), last_exit_code].join(" ")
-          .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
-        ))
-
-        cmds = [cmd].cycle(config[:multiple_converge].to_i).to_a
-
-        if config[:enforce_idempotency]
-          idempotent_cmd = prefix_command(wrap_shell_code(
-            [base_cmd, *chef_args("client_no_updated_resources.rb"), last_exit_code].join(" ")
-            .tap { |str| str.insert(0, reload_ps1_path) if windows_os? }
-          ))
-          cmds[-1] = idempotent_cmd
+        cmds = []
+        num_converges = config[:multiple_converge].to_i
+        idempotency   = config[:enforce_idempotency]
+
+        # Execute Chef Client n-1 times, without exiting
+        (num_converges - 1).times do
+          cmds << wrapped_chef_cmd(base_cmd, config_filename)
         end
+
+        # Append another execution with Windows specific Exit code helper or (for
+        # idempotency check) a specific config file which assures no changed resources.
+        cmds << unless idempotency
+                  wrapped_chef_cmd(base_cmd, config_filename, append: last_exit_code)
+                else
+                  wrapped_chef_cmd(base_cmd, "client_no_updated_resources.rb", append: last_exit_code)
+                end
         cmds
       end
+
+      # Concatenate all arguments and wrap it with shell-specifics
+      # @api private
+      def wrapped_chef_cmd(base_cmd, configfile, append: "")
+        args = []
+
+        args << base_cmd
+        args << chef_args(configfile)
+        args << append
+
+        shell_cmd = args.flatten.join(" ")
+        shell_cmd = shell_cmd.prepend(reload_ps1_path) if windows_os?
+
+        prefix_command(wrap_shell_code(shell_cmd))
+      end
     end
   end
 end

data/lib/kitchen/transport/ssh.rb

@@ -176,9 +176,11 @@ module Kitchen
             Array(locals).map do |local|
               opts = File.directory?(local) ? { recursive: true } : {}
 
-              waits.push session.scp.upload(local, remote, opts) do |_ch, name, sent, total|
-                logger.debug("Async Uploaded #{name} (#{total} bytes)") if sent == total
-              end
+              waits.push(
+                session.scp.upload(local, remote, opts) do |_ch, name, sent, total|
+                  logger.debug("Async Uploaded #{name} (#{total} bytes)") if sent == total
+                end
+              )
               waits.shift.wait while waits.length >= max_ssh_sessions
             end
             waits.each(&:wait)

data/lib/kitchen/transport/winrm.rb

@@ -439,18 +439,31 @@ module Kitchen
           elevated_username: data[:elevated_username] || data[:username],
           elevated_password: elevated_password,
         }
-        opts.merge!(additional_transport_args(opts[:transport]))
+        opts.merge!(additional_transport_args(data, opts[:transport]))
+        if opts[:transport].to_sym == :ssl && opts.key?(:client_cert) && opts.key?(:client_key)
+          opts.delete(:user)
+          opts.delete(:password)
+        end
         opts
       end
 
-      def additional_transport_args(transport_type)
+      def additional_transport_args(data, transport_type)
+        opts = {
+          disable_sspi: false,
+          basic_auth_only: false,
+        }
+
         case transport_type.to_sym
-        when :ssl, :negotiate
-          {
-            no_ssl_peer_verification: true,
-            disable_sspi: false,
-            basic_auth_only: false,
-          }
+        when :ssl
+          if data.key?(:client_cert) && data.key?(:client_key)
+            opts[:client_cert] = data[:client_cert]
+            opts[:client_key] = data[:client_key]
+          end
+          opts[:no_ssl_peer_verification] = data.key?(:no_ssl_peer_verification) ? data[:no_ssl_peer_verification] : true
+          opts
+        when :negotiate
+          opts[:no_ssl_peer_verification] = true
+          opts
         when :plaintext
           {
             disable_sspi: true,

data/lib/kitchen/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "3.0.0".freeze
+  VERSION = "3.2.1".freeze
 end

data/test-kitchen.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.executables   = %w{kitchen}
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.6"
 
   gem.add_dependency "mixlib-shellout",    ">= 1.2", "< 4.0"
   gem.add_dependency "net-scp",            ">= 1.1", "< 4.0" # pinning until we can confirm 4+ works
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "fakefs",    "~> 1.0"
   gem.add_development_dependency "minitest",  "~> 5.3", "< 5.15"
   gem.add_development_dependency "mocha",     "~> 1.1"
-  gem.add_development_dependency "cucumber",  ">= 2.1", "< 4.0" # we just need to validate 4.0 when it comes out
+  gem.add_development_dependency "cucumber",  ">= 2.1", "< 8.0"
   gem.add_development_dependency "countloc",  "~> 0.4"
   gem.add_development_dependency "maruku",    "~> 0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -347,7 +347,7 @@ dependencies:
         version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -357,7 +357,7 @@ dependencies:
         version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
@@ -513,14 +513,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure