knife 17.9.9 → 17.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3642bb965e5c59528178bdf9ee38bb1a2163587830159d58f72a85fb0d747e75
-  data.tar.gz: 890a3eb24418163b5b4380514cb89b3896deb002d034999206aa42c252697b96
+  metadata.gz: 38b44d2b8c6f86ac93d2803ec55b87fc55d63e5de3c3cd167f4495fe54dd1fb0
+  data.tar.gz: aaf3fc0aba59a4d1e38d6df2098053c4b3c12d4f4aca84e62ca1d338717c5fc7
 SHA512:
-  metadata.gz: d03a7372abe2fa0d306dbedb0c6cb9d903c8515eeb51c377f5d37a933a4828fed0e9e7e554ef006b3bc767420e9d6e4ff58f9aaa961f9ca62a64fc1075092651
-  data.tar.gz: f582e2289db8c047aff0bdc63e9017f5d535961622e71cbf00d9d89e51d1ae170ab786b0938194439dc98dd35ccd8e956c0d2120fd867d97d5cb3b997d706609
+  metadata.gz: dc6634edc2cd46990071712a5660883babe15c70d96426b4c32e2a66a885026c5a0fc9a087cd0336944d63f1b3919e5755e903ed83cbd5f0d97c456d6eb35a78
+  data.tar.gz: 935ff218ca8290c8cf384faea1dfc42c19704b993922ad40755067fca5798a7199e8c57fab84ceebd8f7f0645a2c040cb211dc0d36334f5027162233add2877d

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

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

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

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/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.9.9
+  version: 17.9.26
 platform: ruby
 authors:
 - Adam Jacob
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config