knife 18.6.2 → 18.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9b1053a729f2359d5714a6cbdbdbb1ff4aea8f8927e838b510e249d741489e3
-  data.tar.gz: 9776202dc87c3c7dc76a7a0e1335fcab453301a738133ea292965cb380bf1a05
+  metadata.gz: e494361153bfaa991e49f354d0c38aa08b7c34fe4168cd26684b04172f4fb8cf
+  data.tar.gz: 6dedb2d0c6c50b3d0527eb240006b0daeafedcda9e1de2f036961555ae75ea22
 SHA512:
-  metadata.gz: 96f3ff8dff0498644dfb8c534be6fabcd2992e620299ab66d240ea6f20c0188e9bac7d20f9be80ba3aba468f669f8f5af1fa7beca8b84647e90e0cfbb97022e1
-  data.tar.gz: 823775c2c0c2bd7f7153c06f49efffe4a0fc98ee698456d1530c6969e3ad2a7c7cec71e578314dd893ff94a909bada414477ae565dfac2336a9a72161bf3ed9a
+  metadata.gz: 7ebbe1f402396739175969bf45e3c7008cb331f3baaa6baadf8086586a4890f73faf9a6a09a8edb4461f9e9ed381376fbef560789deaeadb7f67e2dcb187ef57
+  data.tar.gz: ba70d328f4f95a93dc291946cab804e09c5507e04099c745a3f6e998a70ee5cd6b94cc141d57fa5d9821008af041a6023e7104bf0131fca15bf16dee96112790

data/Gemfile

@@ -8,7 +8,6 @@ group(:development, :test) do
   gem "crack", "< 0.4.6" # due to https://github.com/jnunemaker/crack/pull/75
   gem "rake", ">= 12.3.3"
   gem "rspec"
-  gem "chef-bin", path: "../chef-bin"
 end
 
 group(:omnibus_package, :pry) do
@@ -22,6 +21,3 @@ group(:chefstyle) do
 end
 
 gem "ohai", git: "https://github.com/chef/ohai.git", branch: "18-stable"
-gem "chef", path: ".."
-gem "chef-utils", path: File.expand_path("../chef-utils", __dir__) if File.exist?(File.expand_path("../chef-utils", __dir__))
-gem "chef-config", path: File.expand_path("../chef-config", __dir__) if File.exist?(File.expand_path("../chef-config", __dir__))

data/knife.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 3.1.0"
 
-  s.add_dependency "chef-config", ">= #{Chef::Knife::VERSION.split(".").first}"
-  s.add_dependency "chef-utils", ">= #{Chef::Knife::VERSION.split(".").first}"
-  s.add_dependency "chef", ">= #{Chef::Knife::VERSION.split(".").first}"
+  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 "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 "license-acceptance", ">= 1.0.5", "< 3"

data/lib/chef/knife/bootstrap.rb

@@ -1205,12 +1205,17 @@ class Chef
         return if config[:license_type].present?
 
         ui.warn(<<~MSG
-          +-------------------------------------------------------------------------------------------------------+
-          Knife bootstrap now needs a license key to allow uninterrupted download of Infra Client.
-          It is easy to add a license by following the command <knife license>.
-          If you are a commercial customer, you may get a license from the customer portal else you can generate
-          from https://www.chef.io/license-generation-free-trial
-          +-------------------------------------------------------------------------------------------------------+
+
+        +---------------------------------------------------------------------------------------------------------------------+
+          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

data/lib/chef/knife/version.rb

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

data/lib/chef/utils/licensing_handler.rb

@@ -30,9 +30,16 @@ class Chef
 
       class << self
         def validate!
-          license_keys = ChefLicensing::LicenseKeyFetcher.fetch
-
-          return new(nil, nil) if license_keys.blank?
+          license_keys = begin
+                           ChefLicensing::LicenseKeyFetcher.fetch
+                         # If the env is airgapped or the local licensing service is unreachable,
+                         # the licensing gem will raise ChefLicensing::RestfulClientConnectionError.
+                         # In such cases, we are assuming the license is not available.
+                         rescue ChefLicensing::RestfulClientConnectionError
+                           []
+                         end
+
+          return new(nil, nil) if license_keys&.empty?
 
           licenses_metadata = ChefLicensing::Api::Describe.list({
             license_keys: license_keys,

metadata

@@ -1,57 +1,70 @@
 --- !ruby/object:Gem::Specification
 name: knife
 version: !ruby/object:Gem::Version
-  version: 18.6.2
+  version: 18.6.13
 platform: ruby
 authors:
 - Adam Jacob
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '18.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '18.6'
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '18.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '18.6'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '18.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '18.6'
+- !ruby/object:Gem::Dependency
+  name: chef-bin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '18.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '18.6'
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -1148,7 +1161,6 @@ 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
@@ -1163,8 +1175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: The knife CLI for Chef Infra.
 test_files: []