test-kitchen 1.23.2 → 1.23.3

data/docs/themes/kitchen/static/sass/vendor/fontawesome/fa-brands.scss

@@ -0,0 +1,21 @@
+/*!
+ * Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@import 'variables';
+
+@font-face {
+  font-family: 'Font Awesome 5 Brands';
+  font-style: normal;
+  font-weight: normal;
+  src: url('#{$fa-font-path}/fa-brands-400.eot');
+  src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
+  url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
+  url('#{$fa-font-path}/fa-brands-400.woff') format('woff'),
+  url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'),
+  url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg');
+}
+
+.fab {
+  font-family: 'Font Awesome 5 Brands';
+}

data/docs/themes/kitchen/static/sass/vendor/fontawesome/fa-regular.scss

@@ -0,0 +1,22 @@
+/*!
+ * Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@import 'variables';
+
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 400;
+  src: url('#{$fa-font-path}/fa-regular-400.eot');
+  src: url('#{$fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'),
+  url('#{$fa-font-path}/fa-regular-400.woff2') format('woff2'),
+  url('#{$fa-font-path}/fa-regular-400.woff') format('woff'),
+  url('#{$fa-font-path}/fa-regular-400.ttf') format('truetype'),
+  url('#{$fa-font-path}/fa-regular-400.svg#fontawesome') format('svg');
+}
+
+.far {
+  font-family: 'Font Awesome 5 Free';
+  font-weight: 400;
+}

data/docs/themes/kitchen/static/sass/vendor/fontawesome/fa-solid.scss

@@ -0,0 +1,23 @@
+/*!
+ * Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@import 'variables';
+
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 900;
+  src: url('#{$fa-font-path}/fa-solid-900.eot');
+  src: url('#{$fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
+  url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'),
+  url('#{$fa-font-path}/fa-solid-900.woff') format('woff'),
+  url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype'),
+  url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg');
+}
+
+.fa,
+.fas {
+  font-family: 'Font Awesome 5 Free';
+  font-weight: 900;
+}

data/docs/themes/kitchen/static/sass/vendor/fontawesome/fontawesome.scss

@@ -0,0 +1,16 @@
+/*!
+ * Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@import 'variables';
+@import 'mixins';
+@import 'core';
+@import 'larger';
+@import 'fixed-width';
+@import 'list';
+@import 'bordered-pulled';
+@import 'animated';
+@import 'rotated-flipped';
+@import 'stacked';
+@import 'icons';
+@import 'screen-reader';

data/docs/themes/kitchen/theme.toml

@@ -0,0 +1,8 @@
+name = "kitchen"
+license = "Apache-2"
+licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE.md"
+description = "The theme used for KitchenCI"
+homepage = "http://github.com/chef/chef-hugo-theme"
+tags = []
+features = []
+min_version = "0.38"

data/lib/kitchen/provisioner/chef_base.rb

@@ -62,7 +62,7 @@ module Kitchen
       # backend cookbook downloader on every kitchen run.
       default_config :always_update_cookbooks, false
       default_config :cookbook_files_glob, %w(
-        README.* metadata.{json,rb}
+        README.* VERSION metadata.{json,rb} attributes.rb recipe.rb
         attributes/**/* definitions/**/* files/**/* libraries/**/*
         providers/**/* recipes/**/* resources/**/* templates/**/*
       ).join(",")
@@ -551,7 +551,7 @@ module Kitchen
       # @api private
       def prepare_config_rb
         data = default_config_rb.merge(config[config_filename.tr(".", "_").to_sym])
-        data = data.merge(:named_run_list => config[:named_run_list]) if config[:named_run_list]
+        data = data.merge(named_run_list: config[:named_run_list]) if config[:named_run_list]
 
         info("Preparing #{config_filename}")
         debug("Creating #{config_filename} from #{data.inspect}")
@@ -615,16 +615,16 @@ module Kitchen
       # @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? }
+          [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? }
+            [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
         end

data/lib/kitchen/transport/ssh.rb

@@ -314,7 +314,7 @@ module Kitchen
         # @api private
         def establish_connection_via_gateway(opts)
           retry_connection(opts) do
-            gateway_options = options.merge(:port => ssh_gateway_port)
+            gateway_options = options.merge(port: ssh_gateway_port)
             Net::SSH::Gateway.new(ssh_gateway,
                                   ssh_gateway_username, gateway_options).ssh(hostname, username, options)
           end
@@ -337,7 +337,7 @@ module Kitchen
           end
         end
 
-        # Connecto to a host executing passed block and properly handling retreis.
+        # Connect to a host executing passed block and properly handling retries.
         #
         # @param opts [Hash] retry options
         # @option opts [Integer] :retries the number of times to retry before

data/lib/kitchen/transport/winrm.rb

@@ -20,8 +20,8 @@
 
 require "rbconfig"
 require "uri"
-
 require "kitchen"
+require "winrm"
 
 module Kitchen
   module Transport
@@ -46,6 +46,8 @@ module Kitchen
       default_config :rdp_port, 3389
       default_config :connection_retries, 5
       default_config :connection_retry_sleep, 1
+      default_config :operation_timeout, 60
+      default_config :receive_timeout, 70
       default_config :max_wait_until_ready, 600
       default_config :winrm_transport, :negotiate
       default_config :scheme do |transport|
@@ -160,12 +162,25 @@ module Kitchen
             retry_delay: delay
           )
           execute(PING_COMMAND.dup)
+        rescue *RESCUE_EXCEPTIONS_ON_ESTABLISH => e
+          retries ||= connection_retries.to_i
+          raise e if (retries -= 1) < 0
+          logger.debug("[WinRM] PING_COMMAND failed. Retrying...")
+          logger.debug("#{e.class}::#{e.message}")
+          sleep(connection_retry_sleep.to_i)
+          retry
         end
 
         private
 
         PING_COMMAND = "Write-Host '[WinRM] Established\n'".freeze
 
+        RESCUE_EXCEPTIONS_ON_ESTABLISH = [
+          Errno::EACCES, Errno::EALREADY, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
+          Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH, Errno::EPIPE,
+          OpenSSL::SSL::SSLError, WinRM::WinRMHTTPTransportError
+        ].freeze
+
         # @return [Integer] how many times to retry when failing to execute
         #   a command or transfer files
         # @api private
@@ -237,10 +252,14 @@ module Kitchen
             session = unelevated_session
           end
 
-          response = session.run(command) do |stdout, _|
-            logger << stdout if stdout
+          begin
+            response = session.run(command) do |stdout, _|
+              logger << stdout if stdout
+            end
+            [response.exitcode, response.stderr]
+          ensure
+            close
           end
-          [response.exitcode, response.stderr]
         end
 
         def unelevated_temp_dir
@@ -256,13 +275,15 @@ module Kitchen
         # (see Base#init_options)
         def init_options(options)
           super
-          @instance_name      = @options.delete(:instance_name)
-          @kitchen_root       = @options.delete(:kitchen_root)
-          @rdp_port           = @options.delete(:rdp_port)
+          @instance_name = @options.delete(:instance_name)
+          @kitchen_root = @options.delete(:kitchen_root)
+          @rdp_port = @options.delete(:rdp_port)
           @connection_retries = @options.delete(:connection_retries)
           @connection_retry_sleep = @options.delete(:connection_retry_sleep)
-          @max_wait_until_ready   = @options.delete(:max_wait_until_ready)
-          @elevated           = @options.delete(:elevated)
+          @operation_timeout = @options.delete(:operation_timeout)
+          @receive_timeout = @options.delete(:receive_timeout)
+          @max_wait_until_ready = @options.delete(:max_wait_until_ready)
+          @elevated = @options.delete(:elevated)
         end
 
         # Logs formatted standard error output at the warning level.
@@ -407,6 +428,8 @@ module Kitchen
           rdp_port: data[:rdp_port],
           connection_retries: data[:connection_retries],
           connection_retry_sleep: data[:connection_retry_sleep],
+          operation_timeout: data[:operation_timeout],
+          receive_timeout: data[:receive_timeout],
           max_wait_until_ready: data[:max_wait_until_ready],
           transport: data[:winrm_transport],
           elevated: data[:elevated],

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "1.23.2".freeze
+  VERSION = "1.23.3".freeze
 end

data/spec/kitchen/data_munger_spec.rb

@@ -2695,7 +2695,7 @@ module Kitchen # rubocop:disable Metrics/ModuleLength
         DataMunger.new(
           {
             lifecycle: {
-              pre_create: "echo foo"
+              pre_create: "echo foo",
             },
             platforms: [{ name: "plat" }],
             suites: [{ name: "sweet" }],
@@ -2730,19 +2730,19 @@ module Kitchen # rubocop:disable Metrics/ModuleLength
           {
             lifecycle: {
               pre_create: "echo foo",
-              post_create: "echo post"
+              post_create: "echo post",
             },
             platforms: [{
               name: "plat",
               lifecycle: {
-                pre_create: "echo bar"
-              }
+                pre_create: "echo bar",
+              },
             }],
             suites: [{
               name: "sweet",
               lifecycle: {
-                pre_create: "echo baz"
-              }
+                pre_create: "echo baz",
+              },
             }],
           },
           {}
@@ -2756,10 +2756,10 @@ module Kitchen # rubocop:disable Metrics/ModuleLength
         DataMunger.new(
           {
             driver: {
-              pre_create_command: "echo bar"
+              pre_create_command: "echo bar",
             },
             lifecycle: {
-              pre_create: "echo foo"
+              pre_create: "echo foo",
             },
             platforms: [{ name: "plat" }],
             suites: [{ name: "sweet" }],
@@ -2774,19 +2774,19 @@ module Kitchen # rubocop:disable Metrics/ModuleLength
         DataMunger.new(
           {
             lifecycle: {
-              pre_create: "echo foo"
+              pre_create: "echo foo",
             },
             platforms: [{
               name: "plat",
               driver: {
-                pre_create_command: "echo bar"
-              }
+                pre_create_command: "echo bar",
+              },
             }],
             suites: [{
               name: "sweet",
               driver: {
-                pre_create_command: "echo baz"
-              }
+                pre_create_command: "echo baz",
+              },
             }],
           },
           {}

data/spec/kitchen/driver/exec_spec.rb

@@ -26,7 +26,7 @@ describe Kitchen::Driver::Exec do
   end
 
   let(:instance) do
-    stub(name: "coolbeans", logger: logger, to_str: "instance", :"transport=" => nil)
+    stub(name: "coolbeans", logger: logger, to_str: "instance", "transport=": nil)
   end
 
   let(:driver) do

data/spec/kitchen/lifecycle_hooks_spec.rb

@@ -44,8 +44,8 @@ describe Kitchen::LifecycleHooks do
       "KITCHEN_SUITE_NAME" => "default",
       "KITCHEN_PLATFORM_NAME" => "toaster-1.0",
       "KITCHEN_INSTANCE_HOSTNAME" => "localhost",
-    }
-  }
+    },
+  }.freeze
 
   it "runs a single local command" do
     config.update(post_create: ["echo foo"])
@@ -77,7 +77,7 @@ describe Kitchen::LifecycleHooks do
         "KITCHEN_SUITE_NAME" => "default",
         "KITCHEN_PLATFORM_NAME" => "toaster-1.0",
         "KITCHEN_INSTANCE_HOSTNAME" => "localhost",
-      }
+      },
     })
     run_lifecycle_hooks
   end
@@ -93,7 +93,7 @@ describe Kitchen::LifecycleHooks do
         "KITCHEN_SUITE_NAME" => "default",
         "KITCHEN_PLATFORM_NAME" => "toaster-1.0",
         "KITCHEN_INSTANCE_HOSTNAME" => "localhost",
-      }
+      },
     })
     run_lifecycle_hooks
   end
@@ -107,7 +107,7 @@ describe Kitchen::LifecycleHooks do
         "KITCHEN_SUITE_NAME" => "default",
         "KITCHEN_PLATFORM_NAME" => "toaster-1.0",
         "KITCHEN_INSTANCE_HOSTNAME" => "localhost",
-      }
+      },
     })
     run_lifecycle_hooks
   end
@@ -121,7 +121,7 @@ describe Kitchen::LifecycleHooks do
         "KITCHEN_SUITE_NAME" => "default",
         "KITCHEN_PLATFORM_NAME" => "toaster-1.0",
         "KITCHEN_INSTANCE_HOSTNAME" => "localhost",
-      }
+      },
     })
     run_lifecycle_hooks
   end

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -103,8 +103,8 @@ describe Kitchen::Provisioner::ChefBase do
       provisioner[:log_file].must_be_nil
     end
 
-    it ":cookbook_files_glob includes recipes" do
-      provisioner[:cookbook_files_glob].must_match %r{,recipes/}
+    it ":cookbook_files_glob includes a metadata file" do
+      provisioner[:cookbook_files_glob].must_match %r{,metadata.\{json,rb\}}
     end
 
     it ":data_path uses calculate_path and is expanded" do
@@ -1077,17 +1077,17 @@ describe Kitchen::Provisioner::ChefBase do
         describe "with the default name `Policyfile.rb`" do
           before do
             File.open("#{kitchen_root}/Policyfile.rb", "wb") do |file|
-              file.write(<<-POLICYFILE)
-name 'wat'
-run_list 'wat'
-cookbook 'wat'
+              file.write(<<~POLICYFILE)
+                name 'wat'
+                run_list 'wat'
+                cookbook 'wat'
 POLICYFILE
             end
             File.open("#{kitchen_root}/Policyfile.lock.json", "wb") do |file|
-              file.write(<<-POLICYFILE)
-{
-  "name": "wat"
-}
+              file.write(<<~POLICYFILE)
+                {
+                  "name": "wat"
+                }
 POLICYFILE
             end
             Kitchen::Provisioner::Chef::Policyfile.stubs(:new).returns(resolver)
@@ -1172,17 +1172,17 @@ POLICYFILE
 
             before do
               File.open(policyfile_path, "wb") do |file|
-                file.write(<<-POLICYFILE)
-name 'wat'
-run_list 'wat'
-cookbook 'wat'
+                file.write(<<~POLICYFILE)
+                  name 'wat'
+                  run_list 'wat'
+                  cookbook 'wat'
 POLICYFILE
               end
               File.open(policyfile_lock_path, "wb") do |file|
-                file.write(<<-POLICYFILE)
-{
-  "name": "wat"
-}
+                file.write(<<~POLICYFILE)
+                  {
+                    "name": "wat"
+                  }
 POLICYFILE
               end
             end
@@ -1251,17 +1251,17 @@ POLICYFILE
 
             before do
               File.open(policyfile_path, "wb") do |file|
-                file.write(<<-POLICYFILE)
-name 'wat'
-run_list 'wat'
-cookbook 'wat'
+                file.write(<<~POLICYFILE)
+                  name 'wat'
+                  run_list 'wat'
+                  cookbook 'wat'
 POLICYFILE
               end
               File.open(policyfile_lock_path, "wb") do |file|
-                file.write(<<-POLICYFILE)
-{
-  "name": "wat"
-}
+                file.write(<<~POLICYFILE)
+                  {
+                    "name": "wat"
+                  }
 POLICYFILE
               end
             end