chef-zero 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca7530fffb7dc24422a41d298d2411f8661d5e7d
-  data.tar.gz: a18a46c9da1936c3d89ec33e83d7e97ed0b82bb6
+  metadata.gz: 89e89d5a719b55d744d62cea1d0dcfeb87d8e295
+  data.tar.gz: b638371b3c6f3570e00037ac3a0952fa11d0ce63
 SHA512:
-  metadata.gz: 9e5a78f306534fc4849f8f40c1ba435d3efa9c8cebbd182e26b68e34c92a08aed491c5259780847c0cf05ab19480cc485b61b12b01992b27ddad4a776be81897
-  data.tar.gz: 4add88aed368a2044f817a5f7caa2429a27c2d6f23e81c3054ba4a68270250c404f926abaf571c354069fcbe61dcbc4163ec9dc31e7255e77d0dd75e5302d553
+  metadata.gz: 253ea9e0d6893270f4b98603947dd6cb7da8d4c0e2298ec1312ea693752108696120617eb05e3f373fc7cd9954506b42fcc33cdf25bf14f2089dd365c5a5c370
+  data.tar.gz: 2b733043fe37e015d796c2e7353981022ca46a348af15b1185147e8bb73b47a9b73775022eaa823d582a11cae8241649acfe67eaba75535cec33b743dc6904ec

data/lib/chef_zero/endpoints/actor_endpoint.rb

@@ -161,22 +161,23 @@ module ChefZero
 
       # Return the data store keys path for the request client or user, e.g.
       #
-      #     [ "organizations", <org>, "client_keys", <client>, "keys" ]
-      #
-      # Or:
-      #
-      #     [ "user_keys", <user>, "keys" ]
+      # /organizations/ORG/clients/CLIENT -> /organizations/ORG/client_keys/CLIENT/keys
+      # /organizations/ORG/users/USER -> /organizations/ORG/user_keys/USER/keys
+      # /users/USER -> /user_keys/USER
       #
       def keys_path_base(request, client_or_user_name=nil)
         rest_path = (rest_path || request.rest_path).dup
-        rest_path[-1] = client_or_user_name if client_or_user_name
-
-        if client?(request, rest_path)
-          [ *rest_path[0..1], "client_keys" ]
+        rest_path = rest_path.dup
+        case rest_path[-2]
+        when "users"
+          rest_path[-2] = "user_keys"
+        when "clients"
+          rest_path[-2] = "client_keys"
         else
-          [ "user_keys" ]
+          raise "Unexpected URL #{rest_path.join("/")}: cannot determine key path"
         end
-        .push(rest_path.last, "keys")
+        rest_path << "keys"
+        rest_path
       end
     end
   end

data/lib/chef_zero/endpoints/actors_endpoint.rb

@@ -65,7 +65,7 @@ module ChefZero
 
           response =
             if request.api_v0?
-              user_data.merge(key_data)
+              user_data.merge!(key_data)
             elsif skip_key_create && !public_key
               user_data
             else

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.6.0'
+  VERSION = '4.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - John Keiser