knife 17.7.29 → 17.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4b06276e35e8607fd42ccf9adab45beb709e3de9812b9f7d9bd026b83d2395
-  data.tar.gz: ddc9acce8bde6e250514a4850507c80c1e1b1c2934206c421a9e43d9d1a04e15
+  metadata.gz: 555723f352d005f6f3433b771c6804d8cf70b83b983baa9d626d9c2438609443
+  data.tar.gz: d310fe22078eecdf79bf322a0256dc3197cfe638471983429383a08f05946986
 SHA512:
-  metadata.gz: 529677a2f81ba1fe3b9288c56175459108673497ee744e1a2697f6734949d927ff030ad37272ebb7d3a113e62c50e796ba8ed36ed8781a1b90c199e551654334
-  data.tar.gz: 06fc0ab9696defb918483b5d6e4d0aa2ca57229a0847d3c457d5b140e715c22ce823e80dd7da08db0b7e65722699d7181df89958c89b02459fff4ef504656a8a
+  metadata.gz: 68ab4a40999b28c80de1376cc0a1211d0150a7cac5d55257821d38da7faad43329b46cb7ce725ac19087bff494e007b311e9ebe3ac17f524533c5774118f85eb
+  data.tar.gz: bee5256b0e182287ad22ac9bc7fdd664d917e7236d187e384e6673d388a42b28bc4a46f9887e7d80673c6783c87b52a99aa9c823a097e43a1c0993b8b7f20f25

data/Gemfile

@@ -20,7 +20,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: "main"
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "17-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/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/version.rb

@@ -17,7 +17,7 @@
 class Chef
   class Knife
     KNIFE_ROOT = File.expand_path("../..", __dir__)
-    VERSION = "17.7.29".freeze
+    VERSION = "17.10.0".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/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.7.29
+  version: 17.10.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config