knife 17.10.0 → 18.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 555723f352d005f6f3433b771c6804d8cf70b83b983baa9d626d9c2438609443
-  data.tar.gz: d310fe22078eecdf79bf322a0256dc3197cfe638471983429383a08f05946986
+  metadata.gz: f50483e20a5a03bee979772342e9e6edf457b3ae55305aa07fdb5686d79739bc
+  data.tar.gz: 8b3d3cddf2a89a74a1c39c634a87c6415480d2dc38ad3a6b443d1f2817ff11e0
 SHA512:
-  metadata.gz: 68ab4a40999b28c80de1376cc0a1211d0150a7cac5d55257821d38da7faad43329b46cb7ce725ac19087bff494e007b311e9ebe3ac17f524533c5774118f85eb
-  data.tar.gz: bee5256b0e182287ad22ac9bc7fdd664d917e7236d187e384e6673d388a42b28bc4a46f9887e7d80673c6783c87b52a99aa9c823a097e43a1c0993b8b7f20f25
+  metadata.gz: 7ec7cb8dbd3ae26dc5ff735849c30f8e39c4e7bc410e11215a9d0afb5e3a8f2224c75ce3b6437cdb38885f037f7ce4197a6f884523366fe4d96d309b33da5553
+  data.tar.gz: c1d2768abf634d5e089882128424f33500509028396f59615f4c2ae00685c263f0458e4e79f3e0a2257ba9d721a244d00d609be09121697d74e54ec77f9303fc

data/Gemfile

@@ -2,6 +2,9 @@ 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" # testing only
@@ -20,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,20 +13,20 @@ 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 = ">= 2.7.0"
+  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 "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
+  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.0"
+  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", "< 7"
+  s.add_dependency "net-ssh", ">= 5.1", "< 8"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
   s.add_dependency "bcrypt_pbkdf", "~> 1.1" # ed25519 ssh key support
   # disabling this until we get get it to compile on RHEL 7

data/lib/chef/knife/bootstrap.rb

@@ -973,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] = []

data/lib/chef/knife/configure.rb

@@ -138,7 +138,7 @@ class Chef
 
       # @return [String] the path to the user's .chef directory
       def chef_config_path
-        @chef_config_path ||= ChefConfig::PathHelper.home(".chef")
+        @chef_config_path ||= ChefConfig::PathHelper.home(ChefUtils::Dist::Infra::USER_CONF_DIR)
       end
 
       # @return [String] the full path to the config file (credential file)

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/download.rb

@@ -71,7 +71,8 @@ class Chef
 
         error = false
         pattern_args.each do |pattern|
-          if Chef::ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
+          fs_error, result = Chef::ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
+          if fs_error
             error = true
           end
         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/upload.rb

@@ -73,7 +73,8 @@ class Chef
 
         error = false
         pattern_args.each do |pattern|
-          if Chef::ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
+          fs_error, result = Chef::ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
+          if fs_error
             error = true
           end
         end

data/lib/chef/knife/user_create.rb

@@ -128,6 +128,7 @@ class Chef
             display_name: "#{user.first_name} #{user.last_name}",
             email: user.email,
             password: password,
+            create_key: user.create_key,
           }
         else
           user_hash = {
@@ -137,6 +138,7 @@ class Chef
             display_name: user.display_name,
             email: user.email,
             password: password,
+            create_key: user.create_key,
           }
         end
 
@@ -159,13 +161,13 @@ class Chef
         end
 
         ui.info("Created #{user.username}")
-        if final_user["private_key"]
+        if final_user["chef_key"] && final_user["chef_key"]["private_key"]
           if config[:file]
             File.open(config[:file], "w") do |f|
-              f.print(final_user["private_key"])
+              f.print(final_user["chef_key"]["private_key"])
             end
           else
-            ui.msg final_user["private_key"]
+            ui.msg final_user["chef_key"]["private_key"]
           end
         end
       end

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.0".freeze
+    VERSION = "18.1.0".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/user_create_spec.rb

@@ -16,7 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 require "knife_spec_helper"
 
 Chef::Knife::UserCreate.load_deps
@@ -80,7 +79,7 @@ describe Chef::Knife::UserCreate do
     before :each do
       @user = double("Chef::User")
       @key = "You don't come into cooking to get rich - Ramsay"
-      allow(@user).to receive(:[]).with("private_key").and_return(@key)
+      allow(@user).to receive(:[]).with("chef_key").and_return(@key)
       knife.config[:passwordprompt] = true
       knife.name_args = name_args
     end
@@ -97,7 +96,7 @@ describe Chef::Knife::UserCreate do
     before do
       @user = double("Chef::User")
       @key = "You don't come into cooking to get rich - Ramsay"
-      allow(@user).to receive(:[]).with("private_key").and_return(@key)
+      allow(@user).to receive(:[]).with("chef_key").and_return(@key)
       knife.name_args = %w{some_user some_display_name some_first_name some_last_name some_email some_password}
     end
 
@@ -177,17 +176,39 @@ describe Chef::Knife::UserCreate do
 
     describe "with user_name, first_name, last_name, email and password" do
       let(:name_args) { %w{some_user some_display_name some_first_name some_last_name test@email.com some_password} }
+      before :each do
+        @user = double("Chef::User")
+        expect(Chef::ServerAPI).to receive(:new).with(Chef::Config[:chef_server_root]).and_return(root_rest)
+        expect(root_rest).to receive(:post).and_return(@user)
+        @key = IO.read(File.join(CHEF_SPEC_DATA, "ssl", "private_key.pem"))
+        allow(@user).to receive(:[]).with("chef_key").and_return(nil)
+        knife.name_args = name_args
+      end
+
+      it "creates an user without private key" do
+        expect(knife.ui).to_not receive(:msg).with(@key)
+        knife.run
+      end
+    end
 
+    describe "with user_name, first_name, last_name, email and password" do
+      let(:name_args) { %w{some_user some_display_name some_first_name some_last_name test@email.com some_password} }
       before :each do
         @user = double("Chef::User")
         expect(Chef::ServerAPI).to receive(:new).with(Chef::Config[:chef_server_root]).and_return(root_rest)
         expect(root_rest).to receive(:post).and_return(@user)
-        @key = "You don't come into cooking to get rich - Ramsay"
-        allow(@user).to receive(:[]).with("private_key").and_return(@key)
+        @username = "Created #{name_args.first}"
+        @key = IO.read(File.join(CHEF_SPEC_DATA, "ssl", "private_key.pem"))
+        allow(@user).to receive(:[]).with("chef_key").and_return("private_key" => @key)
         knife.name_args = name_args
       end
 
       it "creates an user" do
+        expect(knife.ui).to receive(:info).with(@username)
+        knife.run
+      end
+
+      it "creates an user private key" do
         expect(knife.ui).to receive(:msg).with(@key)
         knife.run
       end
@@ -204,7 +225,6 @@ describe Chef::Knife::UserCreate do
         }
 
         it "creates an user, associates a user, and adds it to the admins group" do
-
           expect(root_rest).to receive(:post).with("organizations/ramsay/association_requests", request_body).and_return(@user)
           expect(root_rest).to receive(:put).with("users/some_user/association_requests/1", { response: "accept" })
           knife.run
@@ -219,14 +239,20 @@ describe Chef::Knife::UserCreate do
         @user = double("Chef::User")
         expect(Chef::ServerAPI).to receive(:new).with(Chef::Config[:chef_server_root]).and_return(root_rest)
         expect(root_rest).to receive(:post).and_return(@user)
-        @key = "You don't come into cooking to get rich - Ramsay"
-        allow(@user).to receive(:[]).with("private_key").and_return(@key)
+        @username = "Created #{name_args.first}"
+        @key = IO.read(File.join(CHEF_SPEC_DATA, "ssl", "private_key.pem"))
+        allow(@user).to receive(:[]).with("chef_key").and_return("private_key" => @key)
         knife.name_args = name_args
         knife.config[:email] = "test@email.com"
         knife.config[:password] = "some_password"
       end
 
       it "creates an user" do
+        expect(knife.ui).to receive(:info).with(@username)
+        knife.run
+      end
+
+      it "creates an user private key" do
         expect(knife.ui).to receive(:msg).with(@key)
         knife.run
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife
 version: !ruby/object:Gem::Version
-  version: 17.10.0
+  version: 18.1.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,62 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.28
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.28
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: train-winrm
   requirement: !ruby/object:Gem::Requirement
@@ -152,14 +146,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '17.0'
+        version: '18.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '17.0'
+        version: '18.0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +191,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -207,7 +201,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: net-ssh-multi
   requirement: !ruby/object:Gem::Requirement
@@ -1129,14 +1123,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: The knife CLI for Chef Infra.