knife 17.10.163 → 18.0.185

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 122939bb10583993025292a2a2dacac8e8645a996d81cd67bcc8d8b023829a2f
-  data.tar.gz: 06c1b3f263180e5d6d52e0b67aef2566427cfea7332a060bdbc352478a9b129a
+  metadata.gz: e742e28f2ceaa387aad09ef23468206ebaadc2b50579477bda84bd1c9f57d6b1
+  data.tar.gz: c604ef8fb1c951e1d21862803459b35b3ca86015531f8797985887f7bd879549
 SHA512:
-  metadata.gz: 4aa0df4504ef89c5fe2ff317b37f3c4c6cc3392177ee65d45f8a762df68ad2c6635497e7cb6e9787a47460eaa320156700ba9924118399b85991be03752d9e0b
-  data.tar.gz: 4d0fd03306288eff7591cf3485e223b9eb54a8ab0228a765c688ad0b90378d68d77eb358148120f04facc78a34b89ced2794405059d0f0fa6dc740b1dfc94f5b
+  metadata.gz: eabe1e671b1505b7f8efa5eb0fe9e3773dacdc43fe21b23ad38a6d3a080bb9daa71c7a48902f1047c7102a1a82afb5aedc16a90f3c5f97eb0d8d9472cbb94e09
+  data.tar.gz: d412cabefacc6c5e43d5bf3970d1ccc16bb002a68390117460f25cb98c0e0a61e147c1277139a8ad4777f5a0a4314476e39fb65207b4e8343d9c3d8aee099328

data/Gemfile

@@ -2,10 +2,12 @@ source "https://rubygems.org"
 
 gem "knife", path: "."
 
+# proxifier gem is busted on ruby 3.1 and seems abandoned so use git fork of gem
+gem "proxifier", git: "https://github.com/chef/ruby-proxifier", branch: "lcg/ruby-3"
+
 group(:development, :test) do
   gem "cheffish", ">= 14" # testing only , but why didn't this need to explicit in chef?
-  gem "webmock"
-  gem "crack", "< 0.4.6" # due to https://github.com/jnunemaker/crack/pull/75
+  gem "webmock" # testing only
   gem "rake"
   gem "rspec"
   gem "chef-bin", path: "../chef-bin"
@@ -21,7 +23,7 @@ group(:chefstyle) do
   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main"
 end
 
-gem "ohai", git: "https://github.com/chef/ohai.git", branch: "17-stable"
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main"
 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

@@ -13,18 +13,18 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io" # These seem a bit out of date, and this address probably doesn't go anywhere anymore?
   s.homepage = "https://www.chef.io"
 
-  s.required_ruby_version = ">= 3.0.0", "< 3.1"
+  s.required_ruby_version = ">= 3.1.0"
 
-  s.add_dependency "chef-config", ">= #{Chef::Knife::VERSION.split(".").first}", "< 18.0"
-  s.add_dependency "chef-utils", ">= #{Chef::Knife::VERSION.split(".").first}", "< 18.0"
-  s.add_dependency "chef", ">= #{Chef::Knife::VERSION.split(".").first}", "< 18.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 "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"
   s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
-  s.add_dependency "ohai", "~> 17.9"
-  s.add_dependency "ffi", "~> 1.15.5" # 1.14 versions are broken on i386 windows
+  s.add_dependency "ohai", "~> 18.0"
+  s.add_dependency "ffi", ">= 1.15" # 1.14 versions are broken on i386 windows
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-ssh", ">= 5.1", "< 8"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
@@ -39,11 +39,6 @@ Gem::Specification.new do |s|
   s.add_dependency "pastel" # knife ui.color
   s.add_dependency "erubis", "~> 2.7"
   s.add_dependency "chef-vault" # knife vault
-  if RUBY_VERSION.match?("3.0.0")
-    # Ruby 3.0.0 on Fedora specifically makes trouble
-    s.add_dependency "uri", "= 0.10.1"
-  end
-  s.add_dependency "proxifier2", "~> 1.1"
 
   s.add_development_dependency "chefstyle"
 

data/lib/chef/knife/bootstrap.rb

@@ -32,7 +32,7 @@ class Chef
       include DataBagSecretOptions
       include LicenseAcceptance::CLIFlags::MixlibCLI
 
-      TRANSPORTS_BLACKLIST ||= %w{train-core train-aws train-azure train-habitat train-rest}.freeze
+      SUPPORTED_CONNECTION_PROTOCOLS ||= %w{ssh winrm}.freeze
       WINRM_AUTH_PROTOCOL_LIST ||= %w{plaintext kerberos ssl negotiate}.freeze
 
       # Common connectivity options
@@ -54,7 +54,8 @@ class Chef
       option :connection_protocol,
         short: "-o PROTOCOL",
         long: "--connection-protocol PROTOCOL",
-        description: "The protocol to use to connect to the target node. Examples: ssh, winrm"
+        description: "The protocol to use to connect to the target node.",
+        in: SUPPORTED_CONNECTION_PROTOCOLS
 
       option :max_wait,
         short: "-W SECONDS",
@@ -809,11 +810,11 @@ class Chef
           exit 1
         end
 
-        unless supported_connection_protocols.include?(connection_protocol)
+        unless SUPPORTED_CONNECTION_PROTOCOLS.include?(connection_protocol)
           ui.error <<~EOM
             Unsupported protocol '#{connection_protocol}'.
 
-            Supported protocols are: #{supported_connection_protocols.join(" ")}
+            Supported protocols are: #{SUPPORTED_CONNECTION_PROTOCOLS.join(" ")}
           EOM
           exit 1
         end
@@ -972,7 +973,7 @@ class Chef
           # for this. We will also set keys_only to false only if there are keys
           # and no password.
           # If both are present, train(via net/ssh)  will prefer keys, falling back to password.
-          # Reference: https://github.com/chef/chef/blob/master/lib/chef/knife/ssh.rb#L272
+          # Reference: https://github.com/chef/chef/blob/main/lib/chef/knife/ssh.rb#L272
           opts[:keys_only] = config.key?(:connection_password) == false
         else
           opts[:key_files] = []
@@ -1187,24 +1188,6 @@ class Chef
 
         connection&.connection&.transport_options&.merge! opts
       end
-
-      # List Train transports available (but not loaded) on system.
-      #
-      # Will filter out train-core, API transports, and other incompatible ones.
-      #
-      # @return [Array] transport_names which can be used for command execution
-      def transports_available
-        train_gems = Gem::Specification.select { |spec| spec.name.start_with? "train-" }
-        train_gems.delete_if { |spec| TRANSPORTS_BLACKLIST.include? spec.name }
-        train_gems.map { |spec| spec.name.delete_prefix "train-" }
-      end
-
-      # Return all supported connection types, classical and Train-based
-      #
-      # @return [Array] connection types supported
-      def supported_connection_protocols
-        %w{ssh winrm} | transports_available
-      end
     end
   end
 end

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

@@ -233,7 +233,7 @@ class Chef
             tf.sync = true
             tf.puts output
             tf.close
-            raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_setup/ for details." unless system("#{config[:editor]} #{tf.path}")
+            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)
           end

data/lib/chef/knife/edit.rb

@@ -74,7 +74,7 @@ class Chef
 
             # Let the user edit the temporary file
             unless system("#{config[:editor]} #{file.path}")
-              raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_setup/ for details."
+              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)

data/lib/chef/knife/supermarket_install.rb

@@ -156,7 +156,7 @@ class Chef
 
       def convert_path(upstream_file)
         # converts a Windows path (C:\foo) to a mingw path (/c/foo)
-        if ENV["MSYSTEM"] == "MINGW32"
+        if ENV["MSYSTEM"] == ( "MINGW32" || "UCRT64" )
           upstream_file.sub(/^([[:alpha:]]):/, '/\1')
         else
           Shellwords.escape upstream_file

data/lib/chef/knife/user_edit.rb

@@ -81,7 +81,7 @@ class Chef
             f.sync = true
             f.puts output
             f.close
-            raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_setup/ for details." unless system("#{config[:editor]} #{f.path}")
+            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))
           end

data/lib/chef/knife/version.rb

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

data/spec/support/platform_helpers.rb

@@ -127,6 +127,10 @@ def freebsd?
   RUBY_PLATFORM.include?("freebsd")
 end
 
+def freebsd_gte_12_3?
+  RUBY_PLATFORM.include?("freebsd") && !!(ohai[:platform_version].to_f >= 12.3)
+end
+
 def intel_64bit?
   !!(ohai[:kernel][:machine] == "x86_64")
 end

data/spec/unit/knife/bootstrap_spec.rb

@@ -682,7 +682,7 @@ describe Chef::Knife::Bootstrap do
 
     context "and the protocol is supported" do
 
-      %w{winrm ssh}.each do |proto|
+      Chef::Knife::Bootstrap::SUPPORTED_CONNECTION_PROTOCOLS.each do |proto|
         let(:connection_protocol) { proto }
         it "returns true for #{proto}" do
           expect(knife.validate_protocol!).to eq true
@@ -697,45 +697,6 @@ describe Chef::Knife::Bootstrap do
         expect { knife.validate_protocol! }.to raise_error SystemExit
       end
     end
-
-    context "when additional Train transports are present" do
-      before do
-        Gem::Specification.new do |spec|
-          spec.name = "train-rfc2549"
-          spec.version = "0.0.1"
-          spec.summary = "Train transport to use IPoAC"
-        end.activate
-
-        Gem.refresh
-      end
-
-      context "and their usage is supported" do
-        let(:connection_protocol) { "rfc2549" }
-        it "accepts the transport as protocol" do
-          # While the Gem mocking above will work in native RSpec, it will
-          # fail when executed as part of the test suite via Bundler.
-          #
-          # Reason for this is, that Bundler effectively replaces the whole
-          # gem loading architecture. Mocking the Gem inside of Bundler will
-          # have to reach deep into its internal implementation and make
-          # the test tighly-coupled and brittle.
-          #
-          # During the discussion on PR 13534, it was decided to skip the
-          # test as a result and add this explanation for future reference.
-
-          # expect(knife.validate_protocol!).to eq true
-          skip
-        end
-      end
-
-      context "and invalid proctocols are still refused" do
-        let(:connection_protocol) { "rfc6216" }
-        it "accepts the transport as protocol" do
-          expect(knife.ui).to receive(:error).with(/Unsupported protocol '#{connection_protocol}'/)
-          expect { knife.validate_protocol! }.to raise_error SystemExit
-        end
-      end
-    end
   end
 
   describe "#validate_policy_options!" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife
 version: !ruby/object:Gem::Version
-  version: 17.10.163
+  version: 18.0.185
 platform: ruby
 authors:
 - Adam Jacob
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,60 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '18.0'
+        version: '18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '18.0'
+        version: '18'
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '18.0'
+        version: '18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '18.0'
+        version: '18'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '18.0'
+        version: '18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '18.0'
+        version: '18'
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -164,28 +146,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '17.9'
+        version: '18.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '17.9'
+        version: '18.0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.5
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.5
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -358,20 +340,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: proxifier2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: chefstyle
   requirement: !ruby/object:Gem::Requirement
@@ -1147,7 +1115,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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1155,18 +1123,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.3.21
+signing_key:
 specification_version: 4
 summary: The knife CLI for Chef Infra.
 test_files: []