knife 18.3.0 → 18.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eee4d86bce76117b7bc25593ac766eea25bb2f3a6d46c861b578f04595c23e71
-  data.tar.gz: 92f611bca1afb09fffe920d91120c00ccb7e6bc5bca12af188ceecc1378bb216
+  metadata.gz: d7dbcf835eedd6dece43282604cd9c7136ba0adf6375c856582860700d65031e
+  data.tar.gz: bc342db29c4bb913525ff031519efaa585a0067e1ae65bb2786403edef3934f9
 SHA512:
-  metadata.gz: 597d3b7e1ff3d0743318324185b920318c36c56d247d0a32a212b23f565c0bfc26812932db787129e401614d2e518e5a5e7fb19c1aa3f5138cc0f05890ccab55
-  data.tar.gz: c918ef6cdb6999f1b2eb943fb1b0003a1b5c71acf2b2ef5206b40035fdd06558678a77b84f82815415e4c3695ceae4861ad1646663b853fbc6c6c2bff72b4354
+  metadata.gz: 11a5c1d4e9449e7e566ba18ca38efda979c2341ecba1e07b607a90c7c18acc57af69115039757a3cdb48059c08468d38c75c65f5a28953863c5d8228337d3378
+  data.tar.gz: baa24762c6c61cc695ccd0f8fcba24284aab84502dbd2c74f26d436912d66ce7e2119edc401d5071c1577ce77d2b5c08da2eaa145738a4871f18a139d79da609

data/Gemfile

@@ -4,7 +4,8 @@ gem "knife", path: "."
 
 group(:development, :test) do
   gem "cheffish", ">= 14" # testing only , but why didn't this need to explicit in chef?
-  gem "webmock" # testing only
+  gem "webmock"
+  gem "crack", "< 0.4.6" # due to https://github.com/jnunemaker/crack/pull/75
   gem "rake"
   gem "rspec"
   gem "chef-bin", path: "../chef-bin"

data/lib/chef/chef_fs/knife.rb

@@ -112,7 +112,7 @@ class Chef
           end
           # Use the original path because we can't be sure.
           inferred_path = arg
-        elsif arg[0, 1] == "~"
+        elsif arg.start_with?("~")
           # Let's be nice and fix it if possible - but warn the user.
           ui.warn("A path relative to a user home directory has been provided: #{arg}")
           ui.warn("Paths provided need to be rooted at the chef-repo being considered or be relative paths.")

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

@@ -78,7 +78,7 @@ class Chef
           if check_load_path
             files = $LOAD_PATH.map do |load_path|
               Dir["#{File.expand_path glob, ChefConfig::PathHelper.escape_glob_dir(load_path)}#{Gem.suffix_pattern}"]
-            end.flatten.select { |file| File.file? file.untaint }
+            end.flatten.select { |file| File.file? file }
 
           end
 
@@ -114,7 +114,7 @@ class Chef
 
           glob = File.join(ChefConfig::PathHelper.escape_glob_dir(spec.full_gem_path, dirs), glob)
 
-          Dir[glob].map(&:untaint)
+          Dir[glob]
         end
 
         def from_different_chef_version?(path)

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

@@ -160,7 +160,7 @@ class Chef
 
       #
       # Utility function for finding an element in a hash given an array
-      # of words and a separator.  We find the the longest key in the
+      # of words and a separator.  We find the longest key in the
       # hash composed of the given words joined by the separator.
       #
       def find_longest_key(hash, words, sep = "_")

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

@@ -41,6 +41,7 @@ class Chef
       def_delegator :@presenter, :format_list_for_display
       def_delegator :@presenter, :format_for_display
       def_delegator :@presenter, :format_cookbook_list_for_display
+      def_delegator :@presenter, :attribute_field_separator
 
       def initialize(stdout, stderr, stdin, config)
         @stdout, @stderr, @stdin, @config = stdout, stderr, stdin, config

data/lib/chef/knife/search.rb

@@ -90,7 +90,7 @@ class Chef
         if config[:filter_result]
           search_args[:filter_result] = create_result_filter(config[:filter_result])
         elsif (not ui.config[:attribute].nil?) && (not ui.config[:attribute].empty?)
-          search_args[:filter_result] = create_result_filter_from_attributes(ui.config[:attribute])
+          search_args[:filter_result] = create_result_filter_from_attributes(ui.config[:attribute], ui.attribute_field_separator)
         elsif config[:id_only]
           search_args[:filter_result] = create_result_filter_from_attributes([])
         end
@@ -179,10 +179,10 @@ class Chef
         final_filter
       end
 
-      def create_result_filter_from_attributes(filter_array)
+      def create_result_filter_from_attributes(filter_array, separator = ".")
         final_filter = {}
         filter_array.each do |f|
-          final_filter[f] = f.split(".")
+          final_filter[f] = f.split(separator)
         end
         # adding magic filter so we can actually pull the name as before
         final_filter["__display_name"] = [ "name" ]

data/lib/chef/knife/version.rb

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

data/lib/chef/knife.rb

@@ -414,16 +414,20 @@ class Chef
     def apply_computed_config
       Chef::Config[:color] = config[:color]
 
-      case Chef::Config[:verbosity]
-      when 0, nil
-        Chef::Config[:log_level] = :warn
-      when 1
-        Chef::Config[:log_level] = :info
-      when 2
-        Chef::Config[:log_level] = :debug
-      else
-        Chef::Config[:log_level] = :trace
-      end
+      # If the verbosity is not set, use what is already present on the log_level config.
+      Chef::Config[:log_level] = case Chef::Config[:verbosity]
+                                 when 0
+                                   :warn
+                                 when 1
+                                   :info
+                                 when 2
+                                   :debug
+                                 when nil
+                                   # The default log_level is auto and that is not a valid log_level.
+                                   Chef::Config[:log_level] == :auto ? :warn : Chef::Config[:log_level]
+                                 else
+                                   :trace
+                                 end
 
       Chef::Config[:log_level] = :trace if ENV["KNIFE_DEBUG"]
 

data/spec/unit/knife/core/hashed_command_loader_spec.rb

@@ -105,7 +105,7 @@ describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
       expect(loader.subcommand_for_args(%w{cooler b})).to eq("cooler_b")
     end
 
-    it "returns nil if the the subcommand isn't in our manifest" do
+    it "returns nil if the subcommand isn't in our manifest" do
       expect(loader.subcommand_for_args(["cooler c"])).to eq(nil)
     end
   end

data/spec/unit/knife/search_spec.rb

@@ -0,0 +1,148 @@
+#
+# Author:: Ashique Saidalavi (<ashique.saidalavi@progress.com>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "knife_spec_helper"
+
+describe Chef::Knife::Search do
+  describe "node" do
+    let(:knife) { Chef::Knife::Search.new }
+    let(:query) { double("Chef::Search::Query") }
+    let(:stdout) { StringIO.new }
+    let(:stderr) { StringIO.new }
+
+    before(:each) do
+      node = Chef::Node.new.tap do |n|
+        n.automatic_attrs["fqdn"] = "foobar"
+        n.automatic_attrs["ohai_time"] = 1343845969
+        n.automatic_attrs["platform"] = "mac_os_x"
+        n.automatic_attrs["platform_version"] = "10.12.5"
+      end
+
+      allow(query).to receive(:search).and_yield(node)
+      allow(Chef::Search::Query).to receive(:new).and_return(query)
+
+      allow(knife).to receive(:output).and_return(true)
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
+      allow(knife.ui).to receive(:stderr).and_return(stderr)
+    end
+
+    describe "run" do
+      it "should be successful" do
+        knife.name_args = ["node", ":"]
+        expect(query).to receive(:search).with("node", ":", { fuzz: true })
+        knife.run
+      end
+
+      context "read_cli_args" do
+        it "should be invoked" do
+          expect(knife).to receive(:read_cli_args)
+          knife.run
+        end
+
+        it "should raise error if query passed with argument as well as -q option" do
+          knife.name_args = ["node", ":"]
+          knife.config[:query] = ":"
+
+          expect { knife.run }.to raise_error(SystemExit)
+          expect(stderr.string).to match /Please specify query as an argument or an option via -q, not both/im
+        end
+
+        it "should fail if no query passed" do
+          knife.name_args = []
+
+          expect { knife.run }.to raise_error(SystemExit)
+          expect(stderr.string).to match /No query specified/im
+        end
+      end
+
+      context "filters" do
+        before do
+          knife.name_args = ["node", "packages:git"]
+          knife.config[:filter_result] = "env=chef_environment"
+        end
+
+        it "should invoke create_result_filter" do
+          expect(knife).to receive(:create_result_filter).with("env=chef_environment")
+          knife.run
+        end
+
+        it "should invoke search object with correct filter" do
+          expect(query).to receive(:search).with("node", "packages:git", { filter_result: { env: ["chef_environment"] }, fuzz: true })
+          knife.run
+        end
+      end
+
+      context "attributes" do
+        before do
+          knife.name_args = ["node", "packages:git"]
+          knife.ui.config[:attribute] = ["packages.git.version"]
+        end
+
+        it "should invoke create_result_filter_from_attributes method" do
+          expect(knife).to receive(:create_result_filter_from_attributes).with(["packages.git.version"], knife.ui.attribute_field_separator)
+          knife.run
+        end
+
+        it "should invoke search query with correct filter" do
+          filter_obj = {
+            filter_result: {
+              "__display_name" => ["name"],
+              "packages.git.version" => %w{packages git version} },
+            fuzz: true,
+          }
+          expect(query).to receive(:search).with("node", "packages:git", filter_obj)
+          knife.run
+        end
+
+        context "field_separator" do
+          it "should have dot as the default field_separator" do
+            expect(knife.ui.attribute_field_separator).to eq(".")
+          end
+
+          it "has the correct field_separator" do
+            knife.config[:field_separator] = ":"
+
+            expect(knife.ui.attribute_field_separator).to eq(":")
+          end
+
+          context "parsing" do
+            before do
+              knife.name_args = %w{node packages:git}
+            end
+
+            it "parses the attributes correctly for dot field_separator" do
+              knife.config[:field_separator] = "."
+              knife.ui.config[:attribute] = ["packages.git.version"]
+
+              filter_output = { "__display_name" => ["name"], "packages.git.version" => %w{packages git version} }
+              expect(knife.create_result_filter_from_attributes(["packages.git.version"], ".")).to eq(filter_output)
+            end
+
+            it "parses it for different field_separator" do
+              knife.config[:field_separator] = ":"
+              knife.ui.config[:attribute] = ["packages:git:version"]
+
+              filter_output = { "__display_name" => ["name"], "packages:git:version" => %w{packages git version} }
+              expect(knife.create_result_filter_from_attributes(["packages:git:version"], ":")).to eq(filter_output)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/knife_spec.rb

@@ -320,6 +320,9 @@ describe Chef::Knife do
       end
 
       it "sets the default log_level to warn so we can issue Chef::Log.warn" do
+        # Reset the log level to the default value
+        Chef::Config[:log_level] = :auto
+
         knife_command = KnifeSpecs::TestYourself.new([])
         knife_command.configure_chef
         expect(Chef::Config[:log_level]).to eql(:warn)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife
 version: !ruby/object:Gem::Version
-  version: 18.3.0
+  version: 18.5.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -1098,6 +1098,7 @@ files:
 - spec/unit/knife/role_run_list_replace_spec.rb
 - spec/unit/knife/role_run_list_set_spec.rb
 - spec/unit/knife/role_show_spec.rb
+- spec/unit/knife/search_spec.rb
 - spec/unit/knife/ssh_spec.rb
 - spec/unit/knife/ssl_check_spec.rb
 - spec/unit/knife/ssl_fetch_spec.rb
@@ -1144,7 +1145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: The knife CLI for Chef Infra.