knife 17.5.22 → 17.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3876674845d37200a33f647539c9dc36e5b0026dab8454f19862dd41f7bf7a7
-  data.tar.gz: 63774f4ec6bfa541eb7fd2f4d66a5a810a6793c23cb9cd631b6281680f2ec31e
+  metadata.gz: 38b44d2b8c6f86ac93d2803ec55b87fc55d63e5de3c3cd167f4495fe54dd1fb0
+  data.tar.gz: aaf3fc0aba59a4d1e38d6df2098053c4b3c12d4f4aca84e62ca1d338717c5fc7
 SHA512:
-  metadata.gz: 61aa15c7383aa1a5b128c5d0a963ba503280809437792cb1511fbe64de1fd954a683f02afe5ff0241618c9a74dfe46eccb74dc8b16bfb87b84ad3e376351178d
-  data.tar.gz: ae28adfb4b759bd6edbecb131f415b2aa35dd7019eb59652bd6a4dba1796801009bd99195837c1d5f5993d408d69c930c0ef0384a2f8f0c8ee982e9e631089c9
+  metadata.gz: dc6634edc2cd46990071712a5660883babe15c70d96426b4c32e2a66a885026c5a0fc9a087cd0336944d63f1b3919e5755e903ed83cbd5f0d97c456d6eb35a78
+  data.tar.gz: 935ff218ca8290c8cf384faea1dfc42c19704b993922ad40755067fca5798a7199e8c57fab84ceebd8f7f0645a2c040cb211dc0d36334f5027162233add2877d

data/knife.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-ssh", ">= 5.1", "< 7"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
-  s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support
   s.add_dependency "bcrypt_pbkdf", "~> 1.1" # ed25519 ssh key support
   # disabling this until we get get it to compile on RHEL 7
   # s.add_dependency "x25519", ">= 1.0.9" # ed25519 KEX module. 1.0.9+ required to resolve sigill failures

data/lib/chef/knife/acl_base.rb

@@ -25,7 +25,7 @@ class Chef
 
       PERM_TYPES = %w{create read update delete grant}.freeze unless defined? PERM_TYPES
       MEMBER_TYPES = %w{client group user}.freeze unless defined? MEMBER_TYPES
-      OBJECT_TYPES = %w{clients containers cookbooks data environments groups nodes roles policies policy_groups}.freeze unless defined? OBJECT_TYPES
+      OBJECT_TYPES = %w{clients containers cookbook_artifacts cookbooks data environments groups nodes roles policies policy_groups}.freeze unless defined? OBJECT_TYPES
       OBJECT_NAME_SPEC = /^[\-[:alnum:]_\.]+$/.freeze unless defined? OBJECT_NAME_SPEC
 
       def validate_object_type!(type)

data/lib/chef/knife/acl_bulk_add.rb

@@ -56,7 +56,7 @@ class Chef
 
         objects_to_modify = []
         all_objects = rest.get_rest(object_type)
-        objects_to_modify = all_objects.keys.select { |object_name| object_name =~ object_name_matcher }
+        objects_to_modify = all_objects.keys.grep(object_name_matcher)
 
         if objects_to_modify.empty?
           ui.info "No #{object_type} match the expression /#{regex}/"

data/lib/chef/knife/acl_bulk_remove.rb

@@ -61,7 +61,7 @@ class Chef
 
         objects_to_modify = []
         all_objects = rest.get_rest(object_type)
-        objects_to_modify = all_objects.keys.select { |object_name| object_name =~ object_name_matcher }
+        objects_to_modify = all_objects.keys.grep(object_name_matcher)
 
         if objects_to_modify.empty?
           ui.info "No #{object_type} match the expression /#{regex}/"

data/lib/chef/knife/bootstrap.rb

@@ -20,6 +20,7 @@ require_relative "../knife"
 require_relative "data_bag_secret_options"
 require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 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
 
 module LicenseAcceptance
   autoload :Acceptor, "license_acceptance/acceptor"
@@ -416,9 +417,6 @@ class Chef
       attr_reader :connection
 
       deps do
-        require "erubis" unless defined?(Erubis)
-        require "net/ssh" unless defined?(Net::SSH)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
         require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper)
         require_relative "bootstrap/chef_vault_handler"
         require_relative "bootstrap/client_builder"
@@ -544,6 +542,7 @@ class Chef
       end
 
       def render_template
+        require "erubis" unless defined?(Erubis)
         @config[:first_boot_attributes] = first_boot_attributes
         template_file = find_template
         template = IO.read(template_file).chomp
@@ -930,7 +929,7 @@ class Chef
           opts[:logger] = Chef::Log
           opts[:password] = config[:connection_password] if config.key?(:connection_password)
           opts[:user] = user if user
-          opts[:max_wait_until_ready] = config[:max_wait].to_f unless config[:max_wait].nil?
+          opts[:max_wait_until_ready] = config[:max_wait].to_i unless config[:max_wait].nil?
           # TODO - when would we need to provide rdp_port vs port?  Or are they not mutually exclusive?
           opts[:port] = port if port
         end

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

@@ -62,7 +62,7 @@ class Chef
 
             # Exclude knife/chef/version. It's not a knife command, and  force-loading
             # when we load all of these files will emit constant-already-defined warnings
-            next if rel_path =~ version_file_match
+            next if rel_path&.match?(version_file_match)
 
             subcommand_files[rel_path] = file
           end

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

@@ -140,7 +140,7 @@ class Chef
         end
 
         def format_list_for_display(list)
-          config[:with_uri] ? list : list.keys.sort { |a, b| a <=> b }
+          config[:with_uri] ? list : list.keys.sort
         end
 
         def format_for_display(data)

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

@@ -151,7 +151,7 @@ class Chef
           rel_path = knife_file[/#{KNIFE_ROOT}#{Regexp.escape(File::SEPARATOR)}(.*)\.rb/, 1]
           # Exclude version.rb file for the gem. It's not a knife command, and  force-loading it later
           # because loaded via in subcommand files generates CLI warnings about its consts already having been defined
-          next if knife_file =~ version_file_match
+          next if knife_file&.match?(version_file_match)
 
           subcommand_files[rel_path] = knife_file
         end
@@ -184,7 +184,7 @@ class Chef
       # @return [Array<String>]
       #
       def positional_arguments(args)
-        args.select { |arg| arg =~ /^(([[:alnum:]])[[:alnum:]\_\-]+)$/ }
+        args.grep(/^(([[:alnum:]])[[:alnum:]\_\-]+)$/)
       end
 
       # Returns an Array of paths to knife commands located in

data/lib/chef/knife/org_user_add.rb

@@ -44,7 +44,7 @@ class Chef
         org = Chef::Org.new(@org_name)
         begin
           org.associate_user(@username)
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "409"
             ui.msg "User #{username} already associated with organization #{org_name}"
           else

data/lib/chef/knife/org_user_remove.rb

@@ -60,7 +60,7 @@ class Chef
 
         begin
           org.dissociate_user(@username)
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "404"
             ui.msg "User #{username} is not associated with organization #{org_name}"
             exit 1
@@ -88,7 +88,7 @@ class Chef
 
       def remove_user_from_admin_group(org, org_name, username, admin_group_string)
         org.remove_user_from_group(admin_group_string, username)
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         if e.response.code == "404"
           ui.warn <<~EOF
             User #{username} is not in the #{admin_group_string} group for organization #{org_name}.

data/lib/chef/knife/version.rb

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

data/spec/integration/delete_spec.rb

@@ -992,7 +992,7 @@ describe "knife delete", :workstation do
     end
 
     it "knife delete /policies/x-1.2.3.json succeeds" do
-      knife("raw /policies/x/revisions/1.2.3").should_succeed "{\n  \"name\": \"x\",\n  \"revision_id\": \"1.2.3\",\n  \"run_list\": [\n\n  ],\n  \"cookbook_locks\": {\n\n  }\n}\n"
+      knife("raw /policies/x/revisions/1.2.3").should_succeed "{\n  \"policy_group_list\": [\n    \"x\"\n  ],\n  \"name\": \"x\",\n  \"revision_id\": \"1.2.3\",\n  \"run_list\": [\n\n  ],\n  \"cookbook_locks\": {\n\n  }\n}\n"
       knife("delete /policies/x-1.2.3.json").should_succeed "Deleted /policies/x-1.2.3.json\n"
       knife("raw /policies/x/revisions/1.2.3").should_fail(/404/)
     end

data/spec/integration/download_spec.rb

@@ -1276,8 +1276,8 @@ describe "knife download", :workstation do
             file "members.json", [ "bar" ]
             file "nodes/x.json", { "normal" => { "tags" => [] } }
             file "org.json", { "full_name" => "Something" }
-            file "policies/x-1.0.0.json", {}
-            file "policies/blah-1.0.0.json", {}
+            file "policies/x-1.0.0.json", { "policy_group_list" => [ "x" ] }
+            file "policies/blah-1.0.0.json", { "policy_group_list" => [ "x" ] }
             file "policy_groups/x.json", { "policies" => { "x" => { "revision_id" => "1.0.0" }, "blah" => { "revision_id" => "1.0.0" } } }
             file "roles/x.json", {}
           end

data/spec/integration/upload_spec.rb

@@ -1383,8 +1383,8 @@ describe "knife upload", :workstation do
           file "members.json", [ "bar" ]
           file "org.json", { "full_name" => "wootles" }
           file "nodes/x.json", { "normal" => { "tags" => [] } }
-          file "policies/x-1.0.0.json", {}
-          file "policies/blah-1.0.0.json", {}
+          file "policies/x-1.0.0.json", { "policy_group_list" => [ "x" ] }
+          file "policies/blah-1.0.0.json", { "policy_group_list" => [ "x" ] }
           file "policy_groups/x.json", { "policies" => { "x" => { "revision_id" => "1.0.0" }, "blah" => { "revision_id" => "1.0.0" } } }
           file "roles/x.json", {}
         end
@@ -1484,12 +1484,11 @@ describe "knife upload", :workstation do
             environment "x", { "description" => "foo" }
             group "x", { "groups" => [ "admin" ] }
             node "x", { "run_list" => [ "blah" ] }
-            policy "x", "1.0.0", {}
-            policy "x", "1.0.1", {}
-            policy "y", "1.0.0", {}
+            policy "x", "1.0.0", { "policy_group_list" => [ "x" ] }
+            policy "y", "1.0.0", { "policy_group_list" => [ "x" ] }
             policy_group "x", {
               "policies" => {
-                "x" => { "revision_id" => "1.0.1" },
+                "x" => { "revision_id" => "1.0.0" },
                 "y" => { "revision_id" => "1.0.0" },
               },
             }

data/spec/knife_spec_helper.rb

@@ -78,8 +78,8 @@ require "spec/support/shared/matchers/match_environment_variable"
 # Excludes support/platforms by default
 # Do not change the gsub.
 Dir["spec/support/**/*.rb"]
-  .reject { |f| f =~ %r{^spec/support/platforms} }
-  .reject { |f| f =~ %r{^spec/support/pedant} }
+  .grep_v(%r{^spec/support/platforms})
+  .grep_v(%r{^spec/support/pedant})
   .map { |f| f.gsub(/.rb$/, "") }
   .map { |f| f.gsub(%r{spec/}, "") }
   .each { |f| require f }

data/spec/support/platform_helpers.rb

@@ -168,7 +168,7 @@ def wpar?
 end
 
 def supports_cloexec?
-  Fcntl.const_defined?("F_SETFD") && Fcntl.const_defined?("FD_CLOEXEC")
+  Fcntl.const_defined?(:F_SETFD) && Fcntl.const_defined?(:FD_CLOEXEC)
 end
 
 def selinux_enabled?

data/spec/unit/knife/bootstrap_spec.rb

@@ -817,7 +817,7 @@ describe Chef::Knife::Bootstrap do
             # Set everything to easily identifiable and obviously fake values
             # to verify that Chef::Config is being sourced instead of knife.config
             knife.config = {}
-            Chef::Config[:knife][:max_wait] = 9999
+            Chef::Config[:knife][:max_wait] = 9999.0
             Chef::Config[:knife][:winrm_user] = "winbob"
             Chef::Config[:knife][:winrm_port] = 9999
             Chef::Config[:knife][:ca_trust_file] = "trust.me"
@@ -836,7 +836,7 @@ describe Chef::Knife::Bootstrap do
               {
                 logger: Chef::Log, # not configurable
                 ca_trust_path: "trust.me",
-                max_wait_until_ready: 9999,
+                max_wait_until_ready: 9999, # converted to int
                 operation_timeout: 9999,
                 ssl_peer_fingerprint: "ABCDEF",
                 winrm_transport: "kerberos",
@@ -899,7 +899,7 @@ describe Chef::Knife::Bootstrap do
               # pull in the Chef::Config value
               Chef::Config[:knife][:winrm_auth_method] = "negotiate"
               knife.config[:connection_password] = "blue"
-              knife.config[:max_wait] = 1000
+              knife.config[:max_wait] = 1000.0
               knife.config[:connection_user] = "clippy"
               knife.config[:connection_port] = 1000
               knife.config[:winrm_port] = 1001 # We should not see this value get used
@@ -918,7 +918,7 @@ describe Chef::Knife::Bootstrap do
               {
                 logger: Chef::Log, # not configurable
                 ca_trust_path: "trust.the.internet",
-                max_wait_until_ready: 1000,
+                max_wait_until_ready: 1000, # converted to int
                 operation_timeout: 1000,
                 ssl_peer_fingerprint: "FEDCBA",
                 winrm_transport: "kerberos",
@@ -971,7 +971,7 @@ describe Chef::Knife::Bootstrap do
             # Set everything to easily identifiable and obviously fake values
             # to verify that Chef::Config is being sourced instead of knife.config
             knife.config = {}
-            Chef::Config[:knife][:max_wait] = 9999
+            Chef::Config[:knife][:max_wait] = 9999.0
             Chef::Config[:knife][:session_timeout] = 9999
             Chef::Config[:knife][:ssh_user] = "sshbob"
             Chef::Config[:knife][:ssh_port] = 9999
@@ -986,7 +986,7 @@ describe Chef::Knife::Bootstrap do
             let(:expected_result) do
               {
                 logger: Chef::Log, # not configurable
-                max_wait_until_ready: 9999.0,
+                max_wait_until_ready: 9999, # converted to int
                 connection_timeout: 9999,
                 user: "sshbob",
                 bastion_host: "mygateway.local",
@@ -1032,7 +1032,7 @@ describe Chef::Knife::Bootstrap do
               knife.config[:connection_port] = 12
               knife.config[:ssh_port] = "13" # canary to indirectly verify we're not looking for the wrong CLI flag
               knife.config[:connection_password] = "feta cheese"
-              knife.config[:max_wait] = 150
+              knife.config[:max_wait] = 150.0
               knife.config[:session_timeout] = 120
               knife.config[:use_sudo] = true
               knife.config[:use_sudo_pasword] = true
@@ -1042,7 +1042,7 @@ describe Chef::Knife::Bootstrap do
             let(:expected_result) do
               {
                 logger: Chef::Log, # not configurable
-                max_wait_until_ready: 150.0, # cli
+                max_wait_until_ready: 150, # cli (converted to int)
                 connection_timeout: 120, # cli
                 user: "sshalice", # cli
                 password: "feta cheese", # cli
@@ -1068,7 +1068,7 @@ describe Chef::Knife::Bootstrap do
           context "and all CLI options have been given" do
             before do
               knife.config = {}
-              knife.config[:max_wait] = 150
+              knife.config[:max_wait] = 150.0
               knife.config[:session_timeout] = 120
               knife.config[:connection_user] = "sshroot"
               knife.config[:connection_port] = 1000
@@ -1093,7 +1093,7 @@ describe Chef::Knife::Bootstrap do
             let(:expected_result) do
               {
                 logger: Chef::Log, # not configurable
-                max_wait_until_ready: 150,
+                max_wait_until_ready: 150, # converted to int
                 connection_timeout: 120,
                 user: "sshroot",
                 password: "blah",

data/spec/unit/knife/environment_list_spec.rb

@@ -39,7 +39,7 @@ describe Chef::Knife::EnvironmentList do
   end
 
   it "should print the environment names in a sorted list" do
-    names = @environments.keys.sort { |a, b| a <=> b }
+    names = @environments.keys.sort
     expect(@knife).to receive(:output).with(names)
     @knife.run
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife
 version: !ruby/object:Gem::Version
-  version: 17.5.22
+  version: 17.9.26
 platform: ruby
 authors:
 - Adam Jacob
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -228,20 +228,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: ed25519
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
@@ -1150,7 +1136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: The knife CLI for Chef Infra.