knife 18.8.68 → 19.0.102

data/lib/chef/knife/bootstrap/templates/chef-full.erb

@@ -172,11 +172,9 @@ do_download() {
   <%= @config[:bootstrap_install_command] %>
 <% else %>
   <% if @config[:bootstrap_url] %>
-  install_sh="<%= @config[:bootstrap_url] %>"
-  <% elsif license_available? %>
-  install_sh="<%= config[:license_url] %>"
+    install_sh="<%= @config[:bootstrap_url] %>"
   <% else %>
-  install_sh="https://omnitruck.chef.io/chef/install.sh"
+    install_sh="<%= config[:license_url] %>"
   <% end %>
 
   if test -f /usr/bin/<%= ChefUtils::Dist::Infra::CLIENT %>; then
@@ -184,7 +182,28 @@ do_download() {
   else
     echo "-----> Installing Chef Omnibus (<%= @config[:channel] %>/<%= version_to_install %>)"
     do_download ${install_sh} $tmp_dir/install.sh
-    sh $tmp_dir/install.sh -P <%= @config[:bootstrap_product] %> -c <%= @config[:channel] %> -v <%= version_to_install %>
+
+    # Extract license key/ID and modify install script if license is required
+    <% if chef_ice? %>
+      <% if config[:license_key] %>
+    license_key="<%= config[:license_key] %>"
+      <% elsif config[:license_id] %>
+    license_key="<%= config[:license_id] %>"
+      <% elsif config[:license_url] && config[:license_url].include?('license_id=') %>
+    # Extract license_id from the URL
+    license_id=$(echo "<%= config[:license_url] %>" | grep -o 'license_id=[^&]*' | cut -d'=' -f2)
+    license_key="${license_id}"
+      <% else %>
+    license_key=""
+      <% end %>
+
+    # If we have a license key/ID, set environment variable for the package manager
+    if [ ! -z "$license_key" ]; then
+      export CHEF_LICENSE_KEY="$license_key"
+    fi
+    <% end %>
+
+    sh $tmp_dir/install.sh -P <%= product_to_install %> -c <%= @config[:channel] %> -v <%= version_to_install %>
   fi
 <% end %>
 

data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb

@@ -123,10 +123,10 @@ If !ERRORLEVEL!==0 (
 @rem If user has provided the custom installation command, execute it
 <% if @config[:bootstrap_install_command] %>
   <%= @config[:bootstrap_install_command] %>
-<% else %>
+<% elsif msi_url %>
   @rem Install Chef using the MSI installer
 
-  @set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
+  @set "LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client.msi"
   @set "CHEF_CLIENT_MSI_LOG_PATH=%TEMP%\<%= ChefUtils::Dist::Infra::CLIENT %>-msi%RANDOM%.log"
 
   @rem Clear any pre-existing downloads
@@ -145,7 +145,7 @@ If !ERRORLEVEL!==0 (
   @if EXIST "%CHEF_CLIENT_MSI_LOG_PATH%" del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
 
   @echo Attempting to download client package using PowerShell if available...
-  @set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%', 'PowerShell') %>"
+  @set "REMOTE_SOURCE_MSI_URL=<%= msi_url %>"
   @set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -InputFormat None -NoProfile -NonInteractive -File  <%= bootstrap_directory %>\wget.ps1 "%REMOTE_SOURCE_MSI_URL%" "%LOCAL_DESTINATION_MSI_PATH%"
   @echo !powershell_download!
   @call !powershell_download!
@@ -172,7 +172,7 @@ If !ERRORLEVEL!==0 (
 
       @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
 
-      @set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%') %>"
+      @set "REMOTE_SOURCE_MSI_URL=<%= msi_url %>"
       cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
 
       @if NOT ERRORLEVEL 1 (
@@ -204,6 +204,123 @@ If !ERRORLEVEL!==0 (
       del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
   )
 
+<% else %>
+  @rem Install Chef using the PowerShell install script
+
+  @set "LOCAL_DESTINATION_SCRIPT_PATH=%TEMP%\install.ps1"
+
+  @rem Clear any pre-existing downloads
+  @echo Checking for existing downloaded script at "%LOCAL_DESTINATION_SCRIPT_PATH%"
+  @if EXIST "%LOCAL_DESTINATION_SCRIPT_PATH%" (
+      @echo Found existing downloaded script, deleting.
+      @del /f /q "%LOCAL_DESTINATION_SCRIPT_PATH%"
+      @if ERRORLEVEL 1 (
+          echo Warning: Failed to delete pre-existing script with status code !ERRORLEVEL! > "&2"
+      )
+  ) else (
+      echo No existing downloaded scripts to delete.
+    )
+
+  @echo Attempting to download install script using PowerShell...
+  <% if @config[:bootstrap_url] %>
+  @rem Using direct PowerShell call to avoid batch variable expansion issues with special characters in URLs
+  @rem Pass URL via environment variable to avoid percent sign interpretation
+  @set "BOOTSTRAP_DOWNLOAD_URL=<%= @config[:bootstrap_url].gsub('%', '%%') %>"
+  powershell.exe -ExecutionPolicy Unrestricted -InputFormat None -NoProfile -NonInteractive -Command "& '<%= bootstrap_directory.gsub("'", "''") %>\wget.ps1' -remoteUrl $env:BOOTSTRAP_DOWNLOAD_URL -localPath '%LOCAL_DESTINATION_SCRIPT_PATH%'"
+  <% else %>
+  @set "REMOTE_SOURCE_SCRIPT_URL=<%= install_ps1_url %>"
+  powershell.exe -ExecutionPolicy Unrestricted -InputFormat None -NoProfile -NonInteractive -File <%= bootstrap_directory %>\wget.ps1 "%REMOTE_SOURCE_SCRIPT_URL%" "%LOCAL_DESTINATION_SCRIPT_PATH%"
+  <% end %>
+
+  @set DOWNLOAD_ERROR_STATUS=!ERRORLEVEL!
+
+  @if ERRORLEVEL 1 (
+      @echo Failed PowerShell download with status code !DOWNLOAD_ERROR_STATUS! > "&2"
+      @if !DOWNLOAD_ERROR_STATUS!==0 set DOWNLOAD_ERROR_STATUS=2
+  ) else (
+      @rem Sometimes the error level is not set even when the download failed,
+      @rem so check for the file to be sure it is there -- if it is not, we will retry
+      @if NOT EXIST "%LOCAL_DESTINATION_SCRIPT_PATH%" (
+          echo Failed download: download completed, but downloaded file not found > "&2"
+          set DOWNLOAD_ERROR_STATUS=2
+      ) else (
+          echo Download via PowerShell succeeded.
+        )
+    )
+
+  @if NOT %DOWNLOAD_ERROR_STATUS%==0 (
+      <% if @config[:bootstrap_url] %>
+      @echo Warning: Failed to download install script via PowerShell
+      @echo Warning: Retrying download with cscript ...
+
+      @if EXIST "%LOCAL_DESTINATION_SCRIPT_PATH%" del /f /q "%LOCAL_DESTINATION_SCRIPT_PATH%"
+
+      @rem For custom bootstrap URLs, use environment variable to pass URL to cscript
+      cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"!BOOTSTRAP_DOWNLOAD_URL!" /path:"%LOCAL_DESTINATION_SCRIPT_PATH%"
+      <% else %>
+      @echo Warning: Failed to download "%REMOTE_SOURCE_SCRIPT_URL%" to "%LOCAL_DESTINATION_SCRIPT_PATH%"
+      @echo Warning: Retrying download with cscript ...
+
+      @if EXIST "%LOCAL_DESTINATION_SCRIPT_PATH%" del /f /q "%LOCAL_DESTINATION_SCRIPT_PATH%"
+
+      cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_SCRIPT_URL%" /path:"%LOCAL_DESTINATION_SCRIPT_PATH%"
+      <% end %>
+
+      @if NOT ERRORLEVEL 1 (
+          @rem Sometimes the error level is not set even when the download failed,
+          @rem so check for the file to be sure it is there.
+          @if NOT EXIST "%LOCAL_DESTINATION_SCRIPT_PATH%" (
+              echo Failed download: download completed, but downloaded file not found > "&2"
+              echo Exiting without bootstrapping due to download failure. > "&2"
+              exit /b 1
+          ) else (
+              echo Download via cscript succeeded.
+            )
+      ) else (
+          <% if @config[:bootstrap_url] %>
+          echo Failed to download install script with status code !ERRORLEVEL!. > "&2"
+          <% else %>
+          echo Failed to download "%REMOTE_SOURCE_SCRIPT_URL%" with status code !ERRORLEVEL!. > "&2"
+          <% end %>
+          echo Exiting without bootstrapping due to download failure. > "&2"
+          exit /b 1
+        )
+  )
+
+  @echo Installing <%= ChefUtils::Dist::Infra::PRODUCT %> using PowerShell install script...
+
+  @rem Set license environment variable if license is required
+  <% if chef_ice? %>
+    <% if config[:license_key] %>
+  @set CHEF_LICENSE_KEY=<%= config[:license_key] %>
+    <% elsif config[:license_id] %>
+  @set CHEF_LICENSE_KEY=<%= config[:license_id] %>
+    <% elsif config[:license_url] && config[:license_url].include?('license_id=') %>
+  @rem Extract license_id from the URL
+  @for /f "tokens=2 delims==" %%i in ("<%= config[:license_url] %>") do @set CHEF_LICENSE_KEY=%%i
+    <% end %>
+  <% end %>
+
+  @rem Execute the PowerShell install script with appropriate parameters
+  <% if @config[:bootstrap_url] %>
+  @rem Custom bootstrap URL - execute as-is without additional parameters
+  powershell.exe -ExecutionPolicy Unrestricted -File "%LOCAL_DESTINATION_SCRIPT_PATH%"
+  <% else %>
+  @rem Default Chef install script - invoke the install function with parameters
+  @echo Attempting installation with PowerShell parameters...
+  powershell.exe -ExecutionPolicy Unrestricted -Command "& { . '%LOCAL_DESTINATION_SCRIPT_PATH%'; install -Channel '<%= @config[:channel] %>' -Project '<%= product_to_install %>' -Version '<%= version_to_install %>' }"
+  <% end %>
+
+  @set INSTALL_ERROR_STATUS=!ERRORLEVEL!
+  @if !INSTALL_ERROR_STATUS! NEQ 0 (
+      echo <%= ChefUtils::Dist::Infra::CLIENT %> install script failed with status code !INSTALL_ERROR_STATUS!. > "&2"
+      echo See PowerShell output above for additional detail. > "&2"
+      exit /b !INSTALL_ERROR_STATUS!
+  )
+
+  @rem Clean up the downloaded script
+  @if EXIST "%LOCAL_DESTINATION_SCRIPT_PATH%" del /f /q "%LOCAL_DESTINATION_SCRIPT_PATH%"
+
 <% end %>
 
 @rem This line is required to separate the key_create label from the "block boundary"

data/lib/chef/knife/bootstrap.rb

@@ -23,7 +23,6 @@ require "license_acceptance/cli_flags/mixlib_cli"
 require "chef/json_compat" unless defined?(Chef::JSONCompat) # can't be lazy loaded since it's used in options
 require "chef/utils/licensing_config"
 require "chef/utils/licensing_handler"
-
 module LicenseAcceptance
   autoload :Acceptor, "license_acceptance/acceptor"
 end
@@ -300,8 +299,7 @@ class Chef
 
       option :bootstrap_product,
         long: "--bootstrap-product PRODUCT",
-        description: "Product to install.",
-        default: "chef"
+        description: "Product to install."
 
       option :msi_url, # Windows target only
         short: "-m URL",
@@ -350,6 +348,18 @@ class Chef
           accumulator[vault].push(item)
           accumulator
         }
+      option :disable_license_activation,
+        long: "--disable-license-activation",
+        description: "By default knife copies the local license key to the node and activates it. This options can be used to disable that.",
+        boolean: true
+
+      option :chef_license_key,
+        long: "--chef-license-key KEY",
+        description: "The Chef License key to be used for license activation. You can run `knife license` command to retrieve it."
+
+      option :chef_license_server,
+        long: "--chef-license-server URL",
+        description: "The Chef License server URL to be used for license activation. You can run `knife license` command to retrieve it."
 
       # Deprecated options. These must be declared after
       # regular options because they refer to the replacement
@@ -579,7 +589,6 @@ class Chef
         bootstrap_path = upload_bootstrap(content)
         perform_bootstrap(bootstrap_path)
         plugin_finalize
-        warn_license_usage
       ensure
         connection.del_file!(bootstrap_path) if connection && bootstrap_path
       end
@@ -1199,33 +1208,20 @@ class Chef
 
       # Fetch the workstation license stored in the system
       def fetch_license
-        license = Chef::Utils::LicensingHandler.validate!
-        config[:license_url] = license.install_sh_url
-        config[:license_id] = license.license_key
-        config[:license_type] = license.license_type
-        config[:omnitruck_url] = license.omnitruck_url
+        # The license is not needed if we are using a custom bootstrap URL, MSI URL, or template
+        return if config[:bootstrap_url] || config[:bootstrap_template] || (config[:msi_url] && !config[:msi_url].empty?)
+
+        # This block will mandate license acceptance
+        # require_license_for checks if distribution is official (skip licensing) or unofficial (enforce licensing)
+        ChefLicensing::Config.require_license_for do
+          license = Chef::Utils::LicensingHandler.validate!
+          config[:license_url] = license.install_sh_url
+          config[:license_id] = license.license_key
+          config[:omnitruck_url] = license.omnitruck_url
+          config[:license_type] = license.license_type
+        end
       end
 
-      def warn_license_usage
-        # remove the dependency on .present? from activesupport since this is the one usage
-        license_type = config[:license_type]
-        return unless license_type.nil? || (license_type.respond_to?(:empty?) && license_type.empty?)
-
-        ui.warn(<<~MSG
-
-        +---------------------------------------------------------------------------------------------------------------------+
-          To ensure uninterrupted downloads of Infra Client, Knife Bootstrap will soon require a license key.
-
-          Here's what you need to know:
-            * Adding a License: Use the < knife license > command to easily add a license key.
-            * For Commercial Customers: Obtain your license key from the customer portal.
-            * For Free/Trial Users: Non-commercial users can generate a license key from https://www.chef.io/license-generation-free-trial
-
-          No action is require at this time, but please prepare for this change.
-        +---------------------------------------------------------------------------------------------------------------------+
-        MSG
-               )
-      end
     end
   end
 end

data/lib/chef/knife/config_get.rb

@@ -18,7 +18,7 @@
 #
 
 require_relative "../knife"
-require_relative "./config_show"
+require_relative "config_show"
 
 class Chef
   class Knife

data/lib/chef/knife/config_get_profile.rb

@@ -16,7 +16,7 @@
 #
 
 require_relative "../knife"
-require_relative "./config_use"
+require_relative "config_use"
 
 class Chef
   class Knife

data/lib/chef/knife/config_list_profiles.rb

@@ -16,7 +16,7 @@
 #
 
 require_relative "../knife"
-require_relative "./config_list"
+require_relative "config_list"
 
 class Chef
   class Knife

data/lib/chef/knife/config_show.rb

@@ -75,7 +75,7 @@ class Chef
               # It's a regex.
               filter_re = Regexp.new($1, $2 ? Regexp::IGNORECASE : 0)
               config_data.each do |key, value|
-                output_data[key] = value if key.to_s&.match?(filter_re)
+                output_data[key] = value if key.to_s.match?(filter_re)
               end
             else
               # It's a dotted path string.

data/lib/chef/knife/config_use_profile.rb

@@ -16,7 +16,7 @@
 #
 
 require_relative "../knife"
-require_relative "./config_use"
+require_relative "config_use"
 
 class Chef
   class Knife
@@ -31,8 +31,8 @@ class Chef
       def run
         Chef::Log.warn("knife config use-profile has been deprecated in favor of knife config use. This will be removed in the major release version!")
 
-        credentials_data = self.class.config_loader.parse_credentials_file
-        context_file = ChefConfig::PathHelper.home(".chef", "context").freeze
+        self.class.config_loader.parse_credentials_file
+        ChefConfig::PathHelper.home(".chef", "context").freeze
         profile = @name_args[0]&.strip
         if profile.nil? || profile.empty?
           show_usage

data/lib/chef/knife/configure_client.rb

@@ -24,7 +24,7 @@ class Chef
       banner "knife configure client DIRECTORY"
 
       def run
-        unless @config_dir = @name_args[0]
+        unless (@config_dir = @name_args[0])
           ui.fatal "You must provide the directory to put the files in"
           show_usage
           exit(1)

data/lib/chef/knife/cookbook_bulk_delete.rb

@@ -33,7 +33,7 @@ class Chef
       banner "knife cookbook bulk delete REGEX (options)"
 
       def run
-        unless regex_str = @name_args.first
+        unless (regex_str = @name_args.first)
           ui.fatal("You must supply a regular expression to match the results against")
           exit 42
         end

data/lib/chef/knife/cookbook_delete.rb

@@ -113,7 +113,7 @@ class Chef
           exit(1)
         end
         versions = responses.map do |response|
-          if version = valid_responses[response]
+          if (version = valid_responses[response])
             version
           else
             ui.error("#{response} is not a valid choice, skipping it")

data/lib/chef/knife/cookbook_download.rb

@@ -130,7 +130,7 @@ class Chef
         question += "\n"
         response = ask_question(question).strip
 
-        unless @version = valid_responses[response]
+        unless (@version = valid_responses[response])
           ui.error("'#{response}' is not a valid value.")
           exit(1)
         end

data/lib/chef/knife/cookbook_upload.rb

@@ -58,7 +58,7 @@ class Chef
         long: "--concurrency NUMBER_OF_THREADS",
         description: "How many concurrent threads will be used.",
         default: 10,
-        proc: lambda { |o| o.to_i }
+        proc: lambda(&:to_i)
 
       option :environment,
         short: "-E",

data/lib/chef/knife/core/bootstrap_context.rb

@@ -192,7 +192,16 @@ class Chef
             s << " -l debug"
           end
           s << " -E #{bootstrap_environment}" unless bootstrap_environment.nil?
-          s << " --no-color" unless config[:color]
+          s << " --no-color" if config.key?(:color) && !config[:color]
+
+          # Add license environment variable if required
+          unless config[:disable_license_activation]
+            if chef_ice?
+              license_key = config[:license_key] || config[:license_id]
+              s = "CHEF_LICENSE_KEY=\"#{license_key}\" " + s if license_key
+            end
+          end
+
           s
         end
 
@@ -204,7 +213,7 @@ class Chef
           return config[:bootstrap_version] if config[:bootstrap_version]
 
           if config[:license_url]
-            if config[:channel] == "stable" && config[:license_type] == "commercial"
+            if config[:channel] == "stable" && config[:license_type] == "commercial" && (config[:bootstrap_product] == "chef-ice" || config[:bootstrap_product].nil?)
               Chef::VERSION.split(".").first
             else
               "latest"
@@ -216,6 +225,31 @@ class Chef
           end
         end
 
+        def product_to_install
+          # If explicitly specified, use it
+          return config[:bootstrap_product] if config[:bootstrap_product]
+
+          # Determine product based on version
+          version = version_to_install
+          if version == "latest"
+            "chef-ice"
+          elsif version.to_s.start_with?("19")
+            "chef-ice"
+          else
+            "chef"
+          end
+        end
+
+        def chef_ice?
+          product_to_install == "chef-ice"
+        end
+
+        def detect_package_manager
+          # This method would be called from the bootstrap template to detect package manager
+          # For now, return empty string as detection happens in the install script
+          ""
+        end
+
         def first_boot
           (config[:first_boot_attributes] = Mash.new(config[:first_boot_attributes]) || Mash.new).tap do |attributes|
             if config[:policy_name] && config[:policy_group]
@@ -229,10 +263,6 @@ class Chef
           end
         end
 
-        def license_available?
-          config[:license_id] && config[:license_type]
-        end
-
         private
 
         # Returns a string for copying the trusted certificates on the workstation to the system being bootstrapped

data/lib/chef/knife/core/cookbook_scm_repo.rb

@@ -22,7 +22,7 @@ class Chef
   class Knife
     class CookbookSCMRepo
 
-      DIRTY_REPO = /^\s+M/.freeze
+      DIRTY_REPO = /^\s+M/
 
       include Chef::Mixin::ShellOut
 
@@ -86,7 +86,7 @@ class Chef
       end
 
       def finalize_updates_to(cookbook_name, version)
-        if update_count = updated?(cookbook_name)
+        if (update_count = updated?(cookbook_name))
           ui.info "#{update_count} files updated, committing changes"
           git("add #{cookbook_name}")
           git("commit -m \"Import #{cookbook_name} version #{version}\" -- #{cookbook_name}")

data/lib/chef/knife/core/cookbook_site_streaming_uploader.rb

@@ -218,11 +218,7 @@ class Chef
 
             how_much_current_part = @parts[@part_no].size - @part_offset
 
-            how_much_current_part = if how_much_current_part > how_much
-                                      how_much
-                                    else
-                                      how_much_current_part
-                                    end
+            how_much_current_part = [how_much_current_part, how_much].min
 
             how_much_next_part = how_much - how_much_current_part
 
@@ -246,4 +242,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/core/gem_glob_loader.rb

@@ -22,8 +22,8 @@ class Chef
   class Knife
     class SubcommandLoader
       class GemGlobLoader < Chef::Knife::SubcommandLoader
-        MATCHES_CHEF_GEM ||= %r{/chef-\d+\.\d+\.\d+}.freeze
-        MATCHES_THIS_CHEF_GEM ||= %r{/chef-#{Chef::VERSION}(-\w+)?(-\w+)?/}.freeze
+        MATCHES_CHEF_GEM ||= %r{/chef-\d+\.\d+\.\d+}
+        MATCHES_THIS_CHEF_GEM ||= %r{/chef-#{Chef::VERSION}(-\w+)?(-\w+)?/}
 
         def subcommand_files
           @subcommand_files ||= (gem_and_builtin_subcommands.values + site_subcommands).flatten.uniq
@@ -47,11 +47,11 @@ class Chef
 
         def find_subcommands_via_rubygems
           files = find_files_latest_gems "chef/knife/*.rb"
-          version_file_match = /#{Regexp.escape(File.join('chef', 'knife', 'version'))}$/
+          version_file_match = /#{Regexp.escape(File.join("chef", "knife", "version"))}$/
           subcommand_files = {}
           files.each do |file|
 
-            rel_path = file[/(.*)(#{Regexp.escape File.join('chef', 'knife', '')}.*)\.rb/, 2]
+            rel_path = file[/(.*)(#{Regexp.escape File.join("chef", "knife", "")}.*)\.rb/, 2]
 
             # When not installed as a gem (ChefDK/appbundler in particular), AND
             # a different version of Chef is installed via gems, `files` will

data/lib/chef/knife/core/object_loader.rb

@@ -39,7 +39,7 @@ class Chef
         end
 
         def load_from(repo_location, *components)
-          unless object_file = find_file(repo_location, *components)
+          unless (object_file = find_file(repo_location, *components))
             ui.error "Could not find or open file '#{components.last}' in current directory or in '#{repo_location}/#{components.join("/")}'"
             exit 1
           end

data/lib/chef/knife/core/status_presenter.rb

@@ -135,7 +135,7 @@ class Chef
           now = Time.now.to_i
           difference = now - unix_time.to_i
           hours = (difference / 3600).to_i
-          difference = difference % 3600
+          difference %= 3600
           minutes = (difference / 60).to_i
           seconds = (difference % 60)
           [hours, minutes, seconds]

data/lib/chef/knife/core/subcommand_loader.rb

@@ -145,7 +145,7 @@ class Chef
       def find_subcommands_via_dirglob
         # The "require paths" of the core knife subcommands bundled with chef
         files = Dir[File.join(ChefConfig::PathHelper.escape_glob_dir(File.expand_path("../../knife", __dir__)), "*.rb")]
-        version_file_match = /#{Regexp.escape(File.join('chef', 'knife', 'version.rb'))}/
+        version_file_match = /#{Regexp.escape(File.join("chef", "knife", "version.rb"))}/
         subcommand_files = {}
         files.each do |knife_file|
           rel_path = knife_file[/#{KNIFE_ROOT}#{Regexp.escape(File::SEPARATOR)}(.*)\.rb/, 1]

data/lib/chef/knife/core/text_formatter.rb

@@ -64,7 +64,6 @@ class Chef
             end
           elsif data.is_a?(Array)
             data.each_index do |index|
-              item = data[index]
               buffer << text_format(data[index])
               # Separate items with newlines if it's an array of hashes or an
               # array of arrays