knife 17.1.35 → 17.2.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32e35dac50fe1ba01eaa7e3b4d8b6cdf5401cb57818307949929abacac09539
-  data.tar.gz: a1c5cf84a42a1b1ba76e6b185392374c8f26576f61126e836f8933876c7b1040
+  metadata.gz: c59d8d9f4d2b9c07749f19f302a444f81c8e4f18c1a9d975664339f491ab6a10
+  data.tar.gz: b66856e635b5af7e45ba80af0d2f9f6e13736ba8000dd82d1953864f20be9640
 SHA512:
-  metadata.gz: ce2428a21c21d4d1f724265c68641755fb17c2ca4e0b7a74ff3501a335628a7dce86e842f32652bc44ce724ae525d67ccb0cb5c6dcd3afded03ff913465d67fe
-  data.tar.gz: eccd157c183bd9a27df922b8aede395acef5e835ce6caeb752192ae8988e93b3c5e2ffcbf6c5f48956f591016c79e56a418cf71dbb0c09d5059d1e1e9e6c4671
+  metadata.gz: 5825020630a1925537d2bf81c504f46e2370f4c6895668ff4b482fe8d16f6b0970bf8b4e93cd560f11d2a14ff68ddd5c125fcd232a8d7e312f5de05327722105
+  data.tar.gz: 4655fd4e97b9bfcf06609063a6f58cbe2fac3c8f1f73d61c7890e74dfe15480f4fd9f01a9543776f8019087f55afa52433347283239001bc20ef18a4da7d331a

data/Gemfile

@@ -1,10 +1,5 @@
 source "https://rubygems.org"
 
-# Note we do not use the gemspec DSL which restricts to the
-# gemspec for the current platform and filters out other platforms
-# during a bundle lock operation. We actually want dependencies from
-# both of our gemspecs. Also note this this mimics gemspec behavior
-# of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
 gem "knife", path: "."
 
 group(:development, :test) do

data/knife.gemspec

@@ -24,12 +24,13 @@ Gem::Specification.new do |s|
   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 "ffi", ">= 1.9.25", "< 1.14.0" # 1.14 breaks i386 windows. It should be fixed in 1.14.3
+  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-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
+  s.add_dependency "x25519" # ed25519 KEX module
   s.add_dependency "highline", ">= 1.6.9", "< 3" # Used in UI to present a list, no other usage.
 
   s.add_dependency "tty-prompt", "~> 0.21" # knife ui.ask prompt

data/lib/chef/knife/configure.rb

@@ -29,7 +29,6 @@ class Chef
         require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper)
         require_relative "client_create"
         require_relative "user_create"
-        require "ohai" unless defined?(Ohai)
         Chef::Knife::ClientCreate.load_deps
         Chef::Knife::UserCreate.load_deps
       end
@@ -131,6 +130,7 @@ class Chef
 
       # @return [String] our best guess at what the servername should be using Ohai data and falling back to localhost
       def guess_servername
+        require "ohai" unless defined?(Ohai::System)
         o = Ohai::System.new
         o.all_plugins(%w{ os hostname fqdn })
         o[:fqdn] || o[:machinename] || o[:hostname] || "localhost"

data/lib/chef/knife/org_user_add.rb

@@ -29,7 +29,7 @@ class Chef
         description: "Add user to admin group"
 
       deps do
-        require_relative "../org"
+        require "chef/org"
       end
 
       def run

data/lib/chef/knife/ssl_fetch.rb

@@ -28,7 +28,7 @@ class Chef
         require "socket" unless defined?(Socket)
         require "uri" unless defined?(URI)
         require "openssl" unless defined?(OpenSSL)
-        require "chef/mixin/mixin/proxified_socket" unless defined?(Chef::Mixin::ProxifiedSocket)
+        require "chef/mixin/proxified_socket" unless defined?(Chef::Mixin::ProxifiedSocket)
 
         include Chef::Mixin::ProxifiedSocket
       end

data/lib/chef/knife/version.rb

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

data/spec/integration/commands_spec.rb

@@ -0,0 +1,55 @@
+#
+# Author:: Marc Pardise (<marc@chef.io>)
+# 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 "chef/knife"
+
+Chef::Knife.subcommand_loader.load_commands
+commands = Chef::Knife::SubcommandLoader.generate_hash["_autogenerated_command_paths"]["plugins_paths"].keys
+
+# Directly execute each support knife command
+context "Command Sanity Check: executing ", :workstation do
+  describe "bundle exec knife" do
+    commands.each do |command|
+      command_name = command.gsub("_", " ")
+      modified_command, expected_result = case command_name
+                                          when /knife/
+                                            # because rspec is the actual executable running, the option parser error message
+                                            # is invalid from within the test.
+                                            next
+                                          when /config (use|get|list) profile.*/
+                                            # hyphenated special cases
+                                            [command_name, /^USAGE: knife config #{$1}-profile.*/]
+                                          when /(role|node|env) (env )?run list(.*)/
+                                            # underscored special cases...
+                                            env_part = $2.nil? ? "" : "env_"
+                                            ["#{$1} #{$2}run_list#{$3}", /^USAGE: knife #{$1} #{env_part}run_list#{$3}.*/]
+                                          else
+                                            [ command_name, /^USAGE: knife #{command_name}.*/]
+                                          end
+
+      # By using bundle exec knife instead of directly loading the command class or using the knife() helper,
+      # we ensure that this is a valid end-to-end test.  This operates on the assumption
+      # that we continue to require the command class to be fully loaded so that it can handle the parsing of
+      # its own options.
+      full_command = "#{modified_command} --invalid-option outputs usage for '#{modified_command}' to stdout"
+      it full_command do
+        result = `bundle exec knife #{full_command}`
+        expect(result).to match(expected_result)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife
 version: !ruby/object:Gem::Version
-  version: 17.1.35
+  version: 17.2.38
 platform: ruby
 authors:
 - Adam Jacob
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -166,20 +166,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.25
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.25
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +256,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: x25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -956,6 +964,7 @@ files:
 - spec/integration/client_key_show_spec.rb
 - spec/integration/client_list_spec.rb
 - spec/integration/client_show_spec.rb
+- spec/integration/commands_spec.rb
 - spec/integration/common_options_spec.rb
 - spec/integration/config_list_spec.rb
 - spec/integration/config_show_spec.rb