knife 18.6.13 → 18.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e494361153bfaa991e49f354d0c38aa08b7c34fe4168cd26684b04172f4fb8cf
-  data.tar.gz: 6dedb2d0c6c50b3d0527eb240006b0daeafedcda9e1de2f036961555ae75ea22
+  metadata.gz: 947a92dbe3f969e49b8a064a00d3f48e9e2ea21668ac06a7ec30516ed152084c
+  data.tar.gz: 94ce940ff4591d74d0f4ac11a6d94d05f0865ae3173e1a1e88359395cddd534a
 SHA512:
-  metadata.gz: 7ebbe1f402396739175969bf45e3c7008cb331f3baaa6baadf8086586a4890f73faf9a6a09a8edb4461f9e9ed381376fbef560789deaeadb7f67e2dcb187ef57
-  data.tar.gz: ba70d328f4f95a93dc291946cab804e09c5507e04099c745a3f6e998a70ee5cd6b94cc141d57fa5d9821008af041a6023e7104bf0131fca15bf16dee96112790
+  metadata.gz: fedb26a1a3e59e4bd36a3aa48960f2aa3b1552e9b080bf8d55a4410afb1b6fb67f9232b98f2215099e338e3e63a11bc79e3b9d5ad03475b88b0b45590a436f93
+  data.tar.gz: 2fd51a2cec9d9b39bd86008a49b2bd52db896f177400661a4213f2c11778b33c481c8c52f4f8f70161cdcfa19619736e04e4e6e9673450de3f25bbcf229c814a

data/knife.gemspec

@@ -15,12 +15,12 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 3.1.0"
 
-  s.add_dependency "chef-config", "~> 18.6"
-  s.add_dependency "chef-utils", "~> 18.6"
-  s.add_dependency "chef", "~> 18.6"
-  s.add_dependency "chef-bin", "~> 18.6"
+  s.add_dependency "chef-config", "~> 18.0"
+  s.add_dependency "chef-utils", "~> 18.0"
+  s.add_dependency "chef", "~> 18.0"
+  s.add_dependency "chef-bin", "~> 18.0"
   s.add_dependency "train-core", "~> 3.10" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
-  s.add_dependency "train-winrm", ">= 0.2.5"
+  s.add_dependency "train-winrm", "~> 0.2.17"
   s.add_dependency "license-acceptance", ">= 1.0.5", "< 3"
   s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
@@ -47,6 +47,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-licensing", "~> 1.0"
 
+  s.add_dependency "chef-zero", "~> 15.0.21" # for knife zero
+
   s.bindir       = "bin"
   s.executables  = %w{ knife }
 

data/lib/chef/knife/bootstrap/client_builder.rb

@@ -126,7 +126,7 @@ class Chef
           when nil
             []
           when String
-            run_list.split(/\s*,\s*/)
+            run_list.split(",").map(&:strip)
           when Array
             run_list
           end

data/lib/chef/knife/bootstrap.rb

@@ -456,6 +456,10 @@ class Chef
         end
       end
 
+      # This method was renamed to check_eula_license to better reflect its purpose.
+      # Some of the knife plugins may still be using the old name, so we keep it for backward compatibility.
+      alias_method :check_license, :check_eula_license
+
       # The default bootstrap template to use to bootstrap a server.
       # This is a public API hook which knife plugins use or inherit and override.
       #
@@ -547,7 +551,7 @@ class Chef
         require "erubis" unless defined?(Erubis)
         @config[:first_boot_attributes] = first_boot_attributes
         template_file = find_template
-        template = IO.read(template_file).chomp
+        template = File.read(template_file).chomp
         Erubis::Eruby.new(template).evaluate(bootstrap_context)
       end
 
@@ -1199,10 +1203,13 @@ class Chef
         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
       end
 
       def warn_license_usage
-        return if config[:license_type].present?
+        # 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
 

data/lib/chef/knife/config_use.rb

@@ -51,7 +51,7 @@ class Chef
           else
             # Ensure the .chef/ folder exists.
             FileUtils.mkdir_p(File.dirname(context_file))
-            IO.write(context_file, "#{profile}\n")
+            File.write(context_file, "#{profile}\n")
             ui.msg("Set default profile to #{profile}")
           end
         end

data/lib/chef/knife/configure_client.rb

@@ -39,7 +39,7 @@ class Chef
         end
         ui.info("Writing validation.pem")
         File.open(File.join(@config_dir, "validation.pem"), "w") do |validation|
-          validation.puts(IO.read(Chef::Config[:validation_key]))
+          validation.puts(File.read(Chef::Config[:validation_key]))
         end
       end
 

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

@@ -50,7 +50,7 @@ class Chef
         def validation_key
           if chef_config[:validation_key] &&
               File.exist?(File.expand_path(chef_config[:validation_key]))
-            IO.read(File.expand_path(chef_config[:validation_key]))
+            File.read(File.expand_path(chef_config[:validation_key]))
           else
             false
           end
@@ -242,7 +242,7 @@ class Chef
           if chef_config[:trusted_certs_dir]
             Dir.glob(File.join(ChefConfig::PathHelper.escape_glob_dir(chef_config[:trusted_certs_dir]), "*.{crt,pem}")).each do |cert|
               content << "cat > /etc/chef/trusted_certs/#{File.basename(cert)} <<'EOP'\n" +
-                IO.read(File.expand_path(cert)) + "\nEOP\n"
+                File.read(File.expand_path(cert)) + "\nEOP\n"
             end
           end
           content

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

@@ -102,7 +102,7 @@ class Chef
       def merge_updates_from(cookbook_name, version)
         branch = "chef-vendor-#{cookbook_name}"
         Dir.chdir(repo_path) do
-          if system("git merge #{branch}")
+          if system("git", "merge", branch)
             ui.info("Cookbook #{cookbook_name} version #{version} successfully installed")
           else
             ui.error("You have merge conflicts - please resolve manually")

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

@@ -87,7 +87,7 @@ class Chef
         def object_from_file(filename)
           case filename
           when /\.(js|json)$/
-            r = FFI_Yajl::Parser.parse(IO.read(filename))
+            r = FFI_Yajl::Parser.parse(File.read(filename))
 
             # Chef::DataBagItem doesn't work well with the json_create method
             if @klass == Chef::DataBagItem

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

@@ -236,7 +236,7 @@ class Chef
             tf.close
             raise "Please set EDITOR environment variable. See https://docs.chef.io/workstation/knife_setup/#setting-your-text-editor for details." unless system("#{config[:editor]} #{tf.path}")
 
-            output = IO.read(tf.path)
+            output = File.read(tf.path)
           end
         end
 

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

@@ -44,7 +44,7 @@ class Chef
 
         def validation_key
           if File.exist?(File.expand_path(chef_config[:validation_key]))
-            IO.read(File.expand_path(chef_config[:validation_key]))
+            File.read(File.expand_path(chef_config[:validation_key]))
           else
             false
           end
@@ -330,16 +330,14 @@ class Chef
         # Build a URL that will redirect to the correct Chef Infra msi download.
         def msi_url(machine_os = nil, machine_arch = nil, download_context = nil)
           if config[:msi_url].nil? || config[:msi_url].empty?
-            url = if config[:license_url]
-                    format(config[:license_url], config[:channel]) + "/chef/download?p=windows"
+            url = if config[:license_id] && !config[:omnitruck_url].empty?
+                    format(config[:omnitruck_url], config[:channel] + "/chef/download") + "&p=windows"
                   else
-                    "https://omnitruck.chef.io/chef/download?p=windows"
+                    "https://omnitruck.chef.io/chef/download?p=windows&channel=#{config[:channel]}"
                   end
             url += "&pv=#{machine_os}" unless machine_os.nil?
             url += "&m=#{machine_arch}" unless machine_arch.nil?
             url += "&DownloadContext=#{download_context}" unless download_context.nil?
-            url += "&channel=#{config[:channel]}" if config[:license_url].blank?
-            url += "&license_id=#{config[:license_id]}" unless config[:license_id].blank?
             url += "&v=#{version_to_install}"
           else
             config[:msi_url]
@@ -370,7 +368,7 @@ class Chef
           if chef_config[:trusted_certs_dir]
             Dir.glob(File.join(ChefConfig::PathHelper.escape_glob_dir(chef_config[:trusted_certs_dir]), "*.{crt,pem}")).each do |cert|
               content << "> #{bootstrap_directory}/trusted_certs/#{File.basename(cert)} (\n" +
-                escape_and_echo(IO.read(File.expand_path(cert))) + "\n)\n"
+                escape_and_echo(File.read(File.expand_path(cert))) + "\n)\n"
             end
           end
           content
@@ -388,7 +386,7 @@ class Chef
                   content << "mkdir #{file_on_node}\n"
                 else
                   content << "> #{file_on_node} (\n" +
-                    escape_and_echo(IO.read(File.expand_path(f))) + "\n)\n"
+                    escape_and_echo(File.read(File.expand_path(f))) + "\n)\n"
                 end
               end
             end

data/lib/chef/knife/edit.rb

@@ -77,7 +77,7 @@ class Chef
               raise "Please set EDITOR environment variable. See https://docs.chef.io/workstation/knife_setup/#setting-your-text-editor for details."
             end
 
-            result_text = IO.read(file.path)
+            result_text = File.read(file.path)
 
             return result_text if result_text != text
           end

data/lib/chef/knife/exec.rb

@@ -57,7 +57,7 @@ class Chef::Knife::Exec < Chef::Knife
     elsif !scripts.empty?
       scripts.each do |script|
         file = find_script(script)
-        context.instance_eval(IO.read(file), file, 0)
+        context.instance_eval(File.read(file), file, 0)
       end
     else
       puts "An interactive shell is opened"

data/lib/chef/knife/raw.rb

@@ -86,7 +86,7 @@ class Chef
         path = name_args[0]
         data = false
         if config[:input]
-          data = IO.read(config[:input])
+          data = File.read(config[:input])
         end
         begin
           method = config[:method].to_sym

data/lib/chef/knife/ssl_check.rb

@@ -267,7 +267,7 @@ class Chef
 
       def check_X509_certificate(cert_file)
         store = OpenSSL::X509::Store.new
-        cert = OpenSSL::X509::Certificate.new(IO.read(File.expand_path(cert_file)))
+        cert = OpenSSL::X509::Certificate.new(File.read(File.expand_path(cert_file)))
         begin
           store.add_cert(cert)
           # test if the store can verify the cert we just added

data/lib/chef/knife/user_edit.rb

@@ -69,7 +69,7 @@ class Chef
     # return updated user
     def get_updated_user(original_user)
       if config[:input]
-        edited_user = JSON.parse(IO.read(config[:input]))
+        edited_user = JSON.parse(File.read(config[:input]))
       elsif config[:filename]
         file = config[:filename]
         unless File.exist?(file) ? File.writable?(file) : File.writable?(File.dirname(file))
@@ -83,7 +83,7 @@ class Chef
             f.close
             raise "Please set EDITOR environment variable. See https://docs.chef.io/workstation/knife_setup/#setting-your-text-editor for details." unless system("#{config[:editor]} #{f.path}")
 
-            edited_user = JSON.parse(IO.read(f.path))
+            edited_user = JSON.parse(File.read(f.path))
           end
         end
       else

data/lib/chef/knife/version.rb

@@ -17,7 +17,7 @@
 class Chef
   class Knife
     KNIFE_ROOT = File.expand_path("../..", __dir__)
-    VERSION = "18.6.13".freeze
+    VERSION = "18.8.13".freeze
   end
 end
 

data/lib/chef/knife/xargs.rb

@@ -238,7 +238,7 @@ class Chef
         # Check if the output is different
         tempfiles.each_pair do |tempfile, file|
           # Read the new output
-          new_value = IO.binread(tempfile.path)
+          new_value = File.binread(tempfile.path)
 
           # Upload the output if different
           if config[:force] || new_value != file[:value]

data/lib/chef/knife/yaml_convert.rb

@@ -48,7 +48,7 @@ class Chef::Knife::YamlConvert < Chef::Knife
       ui.fatal!("Output Ruby file '#{ruby_file}' already exists")
     end
 
-    yaml_contents = IO.read(yaml_file)
+    yaml_contents = File.read(yaml_file)
 
     # YAML can contain multiple documents (--- is the separator), let's not support that.
     if ::YAML.load_stream(yaml_contents).length > 1

data/lib/chef/utils/licensing_handler.rb

@@ -1,3 +1,20 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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_relative "licensing_config"
 
 class Chef
@@ -19,9 +36,11 @@ class Chef
       end
 
       def omnitruck_url
-        url = OMNITRUCK_URLS[license_type] || LEGACY_OMNITRUCK_URL
+        url = OMNITRUCK_URLS[license_type]
+        is_legacy = url.nil?
+        url ||= LEGACY_OMNITRUCK_URL
 
-        "#{url}/%s#{license_key ? "?license_id=#{license_key}" : ""}"
+        "#{url}/%s#{is_legacy ? "" : "?license_id=#{license_key}"}"
       end
 
       def install_sh_url

data/spec/functional/cookbook_delete_spec.rb

@@ -52,6 +52,7 @@ describe Chef::Knife::CookbookDelete do
 
     it "logs an error and exits" do
       expect { knife.run }.to raise_error(SystemExit)
+
       expect(knife_stderr.string).to match(/Cannot find a cookbook named no-such-cookbook to delete/)
     end
 

data/spec/tiny_server.rb

@@ -19,6 +19,7 @@
 require "webrick"
 require "webrick/https"
 require "rack"
+require "rackup"
 require "singleton"
 require "open-uri"
 require "chef/config"
@@ -91,7 +92,7 @@ module TinyServer
 
     def create_server(**extra_options)
       server = WEBrick::HTTPServer.new(**options, **extra_options)
-      server.mount("/", Rack::Handler::WEBrick, API.instance)
+      server.mount("/", Rackup::Handler::WEBrick, API.instance)
       server
     end
   end
@@ -172,7 +173,9 @@ module TinyServer
 
     def initialize(response_code = 200, data = nil, headers = nil, &block)
       @response_code, @data = response_code, data
-      @response_headers = headers ? HEADERS.merge(headers) : HEADERS
+      # .merge creates a new hash, headers is sometimes passed as nil, @response_headers gets mutated somewhere
+      # in processing
+      @response_headers = HEADERS.merge(headers || {})
       @block = block_given? ? block : nil
     end
 

data/spec/unit/knife/bootstrap_spec.rb

@@ -75,6 +75,29 @@ describe Chef::Knife::Bootstrap do
         expect(Chef::Config[:chef_license]).to eq("accept-no-persist")
       end
     end
+
+    describe "alias" do
+      before do
+        expect(acceptor).to receive(:license_required?).and_return(false)
+      end
+
+      it "should be aliased to check_license" do
+        expect(knife).to respond_to(:check_license)
+        expect(knife).to respond_to(:check_eula_license)
+
+        knife.check_license
+      end
+
+      it "should logs check_eula_license using check_license" do
+        expect(Chef::Log).to receive(:debug).with("Checking if we need to accept Chef license to bootstrap node")
+        knife.check_license
+      end
+
+      it "should logs the same with check_eula_license" do
+        expect(Chef::Log).to receive(:debug).with("Checking if we need to accept Chef license to bootstrap node")
+        knife.check_eula_license
+      end
+    end
   end
 
   context "#bootstrap_template" do
@@ -368,7 +391,7 @@ describe Chef::Knife::Bootstrap do
       allow(::File).to receive(:read).and_return('{ "foo" : "bar" }')
       knife.parse_options(["--hint", "openstack=hints/openstack.json"])
       knife.merge_configs
-      expect(knife.render_template).to match(/\{\"foo\":\"bar\"\}/)
+      expect(knife.render_template).to match(/\{ \"foo\" : \"bar\"\ }/)
     end
   end
 

data/spec/unit/knife/core/windows_bootstrap_context_spec.rb

@@ -209,7 +209,7 @@ describe Chef::Knife::Core::WindowsBootstrapContext do
       end
 
       it "returns a chef.io msi url with provided url parameters substituted" do
-        reference_url = "https://omnitruck.chef.io/chef/download?p=windows&pv=machine&m=arch&DownloadContext=ctx&channel=stable&v=something"
+        reference_url = "https://omnitruck.chef.io/chef/download?p=windows&channel=stable&pv=machine&m=arch&DownloadContext=ctx&v=something"
         expect(bootstrap_context.msi_url("machine", "arch", "ctx")).to eq(reference_url)
       end
 
@@ -234,5 +234,49 @@ describe Chef::Knife::Core::WindowsBootstrapContext do
         expect(bootstrap_context.msi_url("machine", "arch", "ctx")).to eq(custom_url)
       end
     end
+
+    context "with licensing changes" do
+      let(:config) { { channel: "stable", bootstrap_version: "latest" } }
+
+      it "should return the old omnitruck api in case license not present" do
+        nil_license_obj = Chef::Utils::LicensingHandler.new(nil, nil)
+        expect(Chef::Utils::LicensingHandler).to receive(:validate!).and_return(nil_license_obj)
+        b = Chef::Knife::Bootstrap.new([])
+        b.send(:fetch_license)
+        config.merge!(b.config)
+
+        expect(bootstrap_context.msi_url).to eq("https://omnitruck.chef.io/chef/download?p=windows&channel=stable&v=latest")
+      end
+
+      it "should return the correct msi_url for trial license" do
+        license_obj_trial = Chef::Utils::LicensingHandler.new("key-trial-123", "trial")
+        expect(Chef::Utils::LicensingHandler).to receive(:validate!).and_return(license_obj_trial)
+
+        b = Chef::Knife::Bootstrap.new([])
+        b.send(:fetch_license)
+        config.merge!(b.config)
+        expect(bootstrap_context.msi_url).to eq("https://chefdownload-trial.chef.io/stable/chef/download?license_id=key-trial-123&p=windows&v=latest")
+      end
+
+      it "should return the correct msi_url for commercial license" do
+        license_obj_commercial = Chef::Utils::LicensingHandler.new("key-commercial-123", "commercial")
+        expect(Chef::Utils::LicensingHandler).to receive(:validate!).and_return(license_obj_commercial)
+
+        b = Chef::Knife::Bootstrap.new([])
+        b.send(:fetch_license)
+        config.merge!(b.config)
+        expect(bootstrap_context.msi_url).to eq("https://chefdownload-commerical.chef.io/stable/chef/download?license_id=key-commercial-123&p=windows&v=latest")
+      end
+
+      it "should return the omnitruck url in case of airgapped env" do
+        # In case of connection issues with the licensing service, the library will raise this exception
+        expect(ChefLicensing::LicenseKeyFetcher).to receive(:fetch).and_raise(ChefLicensing::RestfulClientConnectionError)
+
+        b = Chef::Knife::Bootstrap.new([])
+        b.send(:fetch_license)
+        config.merge!(b.config)
+        expect(bootstrap_context.msi_url).to eq("https://omnitruck.chef.io/chef/download?p=windows&channel=stable&v=latest")
+      end
+    end
   end
 end

data/spec/unit/knife/license_spec.rb

@@ -50,6 +50,11 @@ describe Chef::Knife::License do
         c.output = STDOUT
       end
 
+      # Stubbing the fetch_and_persist method to simulate a failure
+      expect(ChefLicensing).to receive(:fetch_and_persist).and_raise(
+        ChefLicensing::LicenseKeyFetcher::LicenseKeyNotFetchedError.new("Unable to obtain a License Key.")
+      )
+
       expect { knife.run }.to raise_error(ChefLicensing::LicenseKeyFetcher::LicenseKeyNotFetchedError, "Unable to obtain a License Key.")
     end
   end

data/spec/unit/utils/licensing_handler_spec.rb

@@ -0,0 +1,140 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 "knife_spec_helper"
+require "chef/utils/licensing_handler"
+
+describe Chef::Utils::LicensingHandler do
+  let(:license_key) { "abc123" }
+  let(:license_type) { "commercial" }
+  let(:handler) { described_class.new(license_key, license_type) }
+
+  describe "#initialize" do
+    it "sets the license key and type" do
+      expect(handler.license_key).to eq(license_key)
+      expect(handler.license_type).to eq(license_type)
+    end
+  end
+
+  describe "#omnitruck_url" do
+    context "with a commercial license" do
+      it "returns the commercial URL with the license key" do
+        expected_url = "https://chefdownload-commerical.chef.io/%s?license_id=abc123"
+        expect(handler.omnitruck_url).to eq(expected_url)
+      end
+    end
+
+    context "with a trial license" do
+      let(:license_type) { "trial" }
+
+      it "returns the trial URL with the license key" do
+        expected_url = "https://chefdownload-trial.chef.io/%s?license_id=abc123"
+        expect(handler.omnitruck_url).to eq(expected_url)
+      end
+    end
+
+    context "with a free license" do
+      let(:license_type) { "free" }
+
+      it "returns the free (trial) URL with the license key" do
+        expected_url = "https://chefdownload-trial.chef.io/%s?license_id=abc123"
+        expect(handler.omnitruck_url).to eq(expected_url)
+      end
+    end
+
+    context "with an unknown license type" do
+      let(:license_type) { "unknown" }
+
+      it "returns the legacy URL without the license key" do
+        expected_url = "https://omnitruck.chef.io/%s"
+        expect(handler.omnitruck_url).to eq(expected_url)
+      end
+    end
+
+    context "with no license key" do
+      let(:license_key) { nil }
+      let(:license_type) { nil }
+
+      it "returns the legacy URL without a license ID parameter" do
+        expected_url = "https://omnitruck.chef.io/%s"
+        expect(handler.omnitruck_url).to eq(expected_url)
+      end
+    end
+  end
+
+  describe "#install_sh_url" do
+    it "formats the omnitruck URL with install.sh" do
+      expect(handler).to receive(:omnitruck_url).and_return("https://example.com/%s?license_id=abc123")
+      expect(handler.install_sh_url).to eq("https://example.com/install.sh?license_id=abc123")
+    end
+  end
+
+  describe ".validate!" do
+    let(:license_keys) { ["abc123"] }
+    let(:license_metadata) do
+      double("license_metadata", id: license_key, license_type: license_type)
+    end
+    let(:licenses_metadata) { [license_metadata] }
+
+    before do
+      allow(ChefLicensing::LicenseKeyFetcher).to receive(:fetch).and_return(license_keys)
+      allow(ChefLicensing::Api::Describe).to receive(:list).and_return(licenses_metadata)
+    end
+
+    context "when license keys are available" do
+      it "returns a new handler with the license key and type" do
+        handler = described_class.validate!
+        expect(handler.license_key).to eq(license_key)
+        expect(handler.license_type).to eq(license_type)
+      end
+
+      it "fetches license keys using ChefLicensing::LicenseKeyFetcher" do
+        expect(ChefLicensing::LicenseKeyFetcher).to receive(:fetch).and_return(license_keys)
+        described_class.validate!
+      end
+
+      it "gets license metadata using ChefLicensing::Api::Describe" do
+        expect(ChefLicensing::Api::Describe).to receive(:list).with({
+          license_keys: license_keys,
+        }).and_return(licenses_metadata)
+        described_class.validate!
+      end
+    end
+
+    context "when no license keys are available" do
+      let(:license_keys) { [] }
+
+      it "returns a new handler with nil license key and type" do
+        handler = described_class.validate!
+        expect(handler.license_key).to be_nil
+        expect(handler.license_type).to be_nil
+      end
+    end
+
+    context "when ChefLicensing::RestfulClientConnectionError is raised" do
+      before do
+        allow(ChefLicensing::LicenseKeyFetcher).to receive(:fetch).and_raise(ChefLicensing::RestfulClientConnectionError)
+      end
+
+      it "returns a new handler with nil license key and type" do
+        handler = described_class.validate!
+        expect(handler.license_key).to be_nil
+        expect(handler.license_type).to be_nil
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife
 version: !ruby/object:Gem::Version
-  version: 18.6.13
+  version: 18.8.13
 platform: ruby
 authors:
 - Adam Jacob
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -15,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.6'
+        version: '18.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.6'
+        version: '18.0'
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.6'
+        version: '18.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.6'
+        version: '18.0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.6'
+        version: '18.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.6'
+        version: '18.0'
 - !ruby/object:Gem::Dependency
   name: chef-bin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.6'
+        version: '18.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.6'
+        version: '18.0'
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -83,16 +84,16 @@ dependencies:
   name: train-winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.17
 - !ruby/object:Gem::Dependency
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
@@ -395,6 +396,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: chef-zero
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 15.0.21
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 15.0.21
 description: The knife CLI for Chef Infra.
 email: adam@chef.io
 executables:
@@ -1151,6 +1166,7 @@ files:
 - spec/unit/knife/user_reregister_spec.rb
 - spec/unit/knife/user_show_spec.rb
 - spec/unit/knife_spec.rb
+- spec/unit/utils/licensing_handler_spec.rb
 homepage: https://www.chef.io
 licenses:
 - Apache-2.0
@@ -1161,6 +1177,7 @@ metadata:
   homepage_uri: https://www.chef.io
   mailing_list_uri: https://discourse.chef.io/
   source_code_uri: https://github.com/chef/chef/
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1175,7 +1192,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: The knife CLI for Chef Infra.
 test_files: []