knife 17.4.46 → 17.7.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bce1fdf8a026140f71d734c579f29ac19eeb68da7965ebc5426cdad7c00eb51
-  data.tar.gz: b10eafb114347dec04f3e1f0aaf0c1a9d9806ba2f76cfad8b57c1065e72bb0b9
+  metadata.gz: be4b06276e35e8607fd42ccf9adab45beb709e3de9812b9f7d9bd026b83d2395
+  data.tar.gz: ddc9acce8bde6e250514a4850507c80c1e1b1c2934206c421a9e43d9d1a04e15
 SHA512:
-  metadata.gz: 4a5df15d3687dddd23e0469fb170fd2ea6325ee186378f98a334f7a1d42757195d2dc541ff9b370b624f949a0ab06de11d607b2029559788f0a1e406b0d8ac8d
-  data.tar.gz: 24414b3f673ae91d6c837c3b3c8740cf60746dc337c770b752fa1baf65f1773510ea9a8c72ee19e2979d70688ca1810a502afbe43092c321ae0cc1dceb8a8e69
+  metadata.gz: 529677a2f81ba1fe3b9288c56175459108673497ee744e1a2697f6734949d927ff030ad37272ebb7d3a113e62c50e796ba8ed36ed8781a1b90c199e551654334
+  data.tar.gz: 06fc0ab9696defb918483b5d6e4d0aa2ca57229a0847d3c457d5b140e715c22ce823e80dd7da08db0b7e65722699d7181df89958c89b02459fff4ef504656a8a

data/knife.gemspec

@@ -28,9 +28,9 @@ 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
-  s.add_dependency "x25519", ">= 1.0.9" # ed25519 KEX module. 1.0.9+ required to resolve sigill failures
+  # 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
   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/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/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.4.46".freeze
+    VERSION = "17.7.29".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" },
               },
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife
 version: !ruby/object:Gem::Version
-  version: 17.4.46
+  version: 17.7.29
 platform: ruby
 authors:
 - Adam Jacob
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-10-29 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
@@ -256,20 +242,6 @@ 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: 1.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement