chef-zero 4.8.0 → 4.9.0

data/lib/chef_zero/endpoints/actor_key_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/rest_base'
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/actor_keys_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/rest_base'
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -8,7 +8,7 @@ module ChefZero
       DEFAULT_PUBLIC_KEY_NAME = "default"
       DATE_FORMAT = "%FT%TZ" # e.g. 2015-12-24T21:00:00Z
 
-      def get(request, alt_uri_root=nil)
+      def get(request, alt_uri_root = nil)
         path = data_path(request)
 
         # Get actor or 404 if it doesn't exist
@@ -35,7 +35,7 @@ module ChefZero
         if generate_keys
           private_key, public_key = server.gen_key_pair
         else
-          public_key = request_body['public_key']
+          public_key = request_body["public_key"]
         end
 
         key_name = request_body["name"]
@@ -74,7 +74,6 @@ module ChefZero
 
         actor_data["public_key"] = public_key
         set_data(request, actor_path(request), to_json(actor_data))
-
       end
 
       # Returns the keys data store path, which is the same as
@@ -90,7 +89,7 @@ module ChefZero
         end
       end
 
-      def list_key(request, data_path, alt_uri_root=nil)
+      def list_key(request, data_path, alt_uri_root = nil)
         key_name, expiration_date =
           if data_path[-1] == DEFAULT_PUBLIC_KEY_NAME
             [ DEFAULT_PUBLIC_KEY_NAME, "infinity" ]
@@ -111,7 +110,7 @@ module ChefZero
         request.rest_path[2] == "clients"
       end
 
-      def key_uri(request, key_name, alt_uri_root=nil)
+      def key_uri(request, key_name, alt_uri_root = nil)
         uri_root = alt_uri_root.nil? ? request.rest_path : alt_uri_root
         build_uri(request.base_uri, [ *uri_root, key_name ])
       end

data/lib/chef_zero/endpoints/actors_endpoint.rb

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_list_endpoint'
+require "ffi_yajl"
+require "chef_zero/endpoints/rest_list_endpoint"
 
 module ChefZero
   module Endpoints
@@ -10,13 +10,13 @@ module ChefZero
 
         # apply query filters: if one applies, stop processing rest
         # (precendence matches chef-server: https://github.com/chef/chef-server/blob/268a0c9/src/oc_erchef/apps/chef_objects/src/chef_user.erl#L554-L559)
-        if value = request.query_params['external_authentication_uid']
-          response[2] = filter('external_authentication_uid', value, request, response[2])
-        elsif value = request.query_params['email']
-          response[2] = filter('email', value, request, response[2])
+        if value = request.query_params["external_authentication_uid"]
+          response[2] = filter("external_authentication_uid", value, request, response[2])
+        elsif value = request.query_params["email"]
+          response[2] = filter("email", value, request, response[2])
         end
 
-        if request.query_params['verbose']
+        if request.query_params["verbose"]
           results = parse_json(response[2])
           results.each do |name, url|
             record = get_data(request, request.rest_path + [ name ], :nil)
@@ -35,16 +35,16 @@ module ChefZero
         # First, find out if the user actually posted a public key.  If not, make
         # one.
         request_body = parse_json(request.body)
-        public_key = request_body['public_key']
+        public_key = request_body["public_key"]
 
         skip_key_create = !request.api_v0? && !request_body["create_key"]
 
         if !public_key && !skip_key_create
           private_key, public_key = server.gen_key_pair
-          request_body['public_key'] = public_key
+          request_body["public_key"] = public_key
           request.body = to_json(request_body)
         elsif skip_key_create
-          request_body['public_key'] = nil
+          request_body["public_key"] = nil
           request.body = to_json(request_body)
         end
 
@@ -55,8 +55,8 @@ module ChefZero
           user_data = parse_json(result[2])
 
           key_data = {}
-          key_data['private_key'] = private_key if private_key
-          key_data['public_key'] = public_key unless request.rest_path[0] == 'users'
+          key_data["private_key"] = private_key if private_key
+          key_data["public_key"] = public_key unless request.rest_path[0] == "users"
 
           response =
             if request.api_v0?

data/lib/chef_zero/endpoints/authenticate_user_endpoint.rb

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
+require "ffi_yajl"
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -7,23 +7,23 @@ module ChefZero
     class AuthenticateUserEndpoint < RestBase
       def post(request)
         request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        name = request_json['username']
-        password = request_json['password']
+        name = request_json["username"]
+        password = request_json["password"]
         begin
-          user = data_store.get(['users', name])
+          user = data_store.get(["users", name])
         rescue ChefZero::DataStore::DataNotFoundError
           raise RestErrorResponse.new(401, "Bad username or password")
         end
         user = FFI_Yajl::Parser.parse(user, :create_additions => false)
-        user = ChefData::DataNormalizer.normalize_user(user, name, [ 'username' ], server.options[:osc_compat])
-        if user['password'] != password
+        user = ChefData::DataNormalizer.normalize_user(user, name, [ "username" ], server.options[:osc_compat])
+        if user["password"] != password
           raise RestErrorResponse.new(401, "Bad username or password")
         end
         # Include only particular user data in the response
-        user.keep_if { |key,value| %w(first_name last_name display_name email username).include?(key) }
+        user.keep_if { |key, value| %w{first_name last_name display_name email username}.include?(key) }
         json_response(200, {
-          'status' => 'linked',
-          'user' => user
+          "status" => "linked",
+          "user" => user,
         })
       end
     end

data/lib/chef_zero/endpoints/container_endpoint.rb

@@ -1,13 +1,13 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/chef_data/data_normalizer'
+require "ffi_yajl"
+require "chef_zero/endpoints/rest_object_endpoint"
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
     # /organizations/ORG/containers/NAME
     class ContainerEndpoint < RestObjectEndpoint
       def initialize(server)
-        super(server, %w(id containername))
+        super(server, %w{id containername})
       end
 
       undef_method(:put)

data/lib/chef_zero/endpoints/containers_endpoint.rb

@@ -1,12 +1,12 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_list_endpoint'
+require "ffi_yajl"
+require "chef_zero/endpoints/rest_list_endpoint"
 
 module ChefZero
   module Endpoints
     # /organizations/ORG/containers
     class ContainersEndpoint < RestListEndpoint
       def initialize(server)
-        super(server, %w(id containername))
+        super(server, %w{id containername})
       end
 
       # create a container.

data/lib/chef_zero/endpoints/cookbook_artifact_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/chef_data/data_normalizer'
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/cookbook_artifact_identifier_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/chef_data/data_normalizer'
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/chef_data/data_normalizer'
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/cookbook_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/endpoints/cookbooks_base'
+require "chef_zero/endpoints/cookbooks_base"
 
 module ChefZero
   module Endpoints
@@ -7,19 +7,19 @@ module ChefZero
       def get(request)
         filter = request.rest_path[3]
         case filter
-        when '_latest'
+        when "_latest"
           result = {}
           filter_cookbooks(all_cookbooks_list(request), {}, 1) do |name, versions|
             if versions.size > 0
-              result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ['cookbooks', name, versions[0]])
+              result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name, versions[0]])
             end
           end
           json_response(200, result)
-        when '_recipes'
+        when "_recipes"
           result = []
           filter_cookbooks(all_cookbooks_list(request), {}, 1) do |name, versions|
             if versions.size > 0
-              cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', name, versions[0]]), :create_additions => false)
+              cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]), :create_additions => false)
               result += recipe_names(name, cookbook)
             end
           end

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -1,8 +1,8 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/rest_error_response'
-require 'chef_zero/chef_data/data_normalizer'
-require 'chef_zero/data_store/data_not_found_error'
+require "ffi_yajl"
+require "chef_zero/endpoints/rest_object_endpoint"
+require "chef_zero/rest_error_response"
+require "chef_zero/chef_data/data_normalizer"
+require "chef_zero/data_store/data_not_found_error"
 
 module ChefZero
   module Endpoints
@@ -23,14 +23,14 @@ module ChefZero
         # Honor frozen
         if existing_cookbook
           existing_cookbook_json = FFI_Yajl::Parser.parse(existing_cookbook, :create_additions => false)
-          if existing_cookbook_json['frozen?']
-            if request.query_params['force'] != "true"
+          if existing_cookbook_json["frozen?"]
+            if request.query_params["force"] != "true"
               raise RestErrorResponse.new(409, "The cookbook #{name} at version #{version} is frozen. Use the 'force' option to override.")
             end
             # For some reason, you are forever unable to modify "frozen?" on a frozen cookbook.
             request_body = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-            if !request_body['frozen?']
-              request_body['frozen?'] = true
+            if !request_body["frozen?"]
+              request_body["frozen?"] = true
               request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true)
             end
           end
@@ -74,8 +74,8 @@ module ChefZero
         FFI_Yajl::Parser.parse(cookbook, :create_additions => false).each_pair do |key, value|
           if value.is_a?(Array)
             value.each do |file|
-              if file.is_a?(Hash) && file.has_key?('checksum')
-                result << file['checksum']
+              if file.is_a?(Hash) && file.has_key?("checksum")
+                result << file["checksum"]
               end
             end
           end
@@ -86,7 +86,7 @@ module ChefZero
       private
 
       def hoover_unused_checksums(deleted_checksums, request)
-        %w(cookbooks cookbook_artifacts).each do |cookbook_type|
+        %w{cookbooks cookbook_artifacts}.each do |cookbook_type|
           begin
             cookbooks = data_store.list(request.rest_path[0..1] + [cookbook_type])
           rescue ChefZero::DataStore::DataNotFoundError
@@ -95,9 +95,13 @@ module ChefZero
             cookbooks = []
           end
           cookbooks.each do |cookbook_name|
-            data_store.list(request.rest_path[0..1] + [cookbook_type, cookbook_name]).each do |version|
-              cookbook = data_store.get(request.rest_path[0..1] + [cookbook_type, cookbook_name, version], request)
-              deleted_checksums = deleted_checksums - get_checksums(cookbook)
+            # as below, this can be racy.
+            begin
+              data_store.list(request.rest_path[0..1] + [cookbook_type, cookbook_name]).each do |version|
+                cookbook = data_store.get(request.rest_path[0..1] + [cookbook_type, cookbook_name, version], request)
+                deleted_checksums = deleted_checksums - get_checksums(cookbook)
+              end
+            rescue ChefZero::DataStore::DataNotFoundError
             end
           end
         end
@@ -106,7 +110,7 @@ module ChefZero
           # This deals with an exception on delete, but things can still get deleted
           # that shouldn't be.
           begin
-            delete_data(request, request.rest_path[0..1] + ['file_store', 'checksums', checksum], :data_store_exceptions)
+            delete_data(request, request.rest_path[0..1] + ["file_store", "checksums", checksum], :data_store_exceptions)
           rescue ChefZero::DataStore::DataNotFoundError
           end
         end

data/lib/chef_zero/endpoints/cookbooks_base.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'chef_zero/chef_data/data_normalizer'
+require "ffi_yajl"
+require "chef_zero/rest_base"
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
@@ -11,13 +11,13 @@ module ChefZero
         filter_cookbooks(cookbooks_list, constraints, num_versions) do |name, versions|
           versions_list = versions.map do |version|
             {
-              'url' => build_uri(request.base_uri, request.rest_path[0..1] + ['cookbooks', name, version]),
-              'version' => version
+              "url" => build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name, version]),
+              "version" => version,
             }
           end
           results[name] = {
-            'url' => build_uri(request.base_uri, request.rest_path[0..1] + ['cookbooks', name]),
-            'versions' => versions_list
+            "url" => build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name]),
+            "versions" => versions_list,
           }
         end
         results
@@ -26,8 +26,8 @@ module ChefZero
       def all_cookbooks_list(request)
         result = {}
         # Race conditions exist here (if someone deletes while listing).  I don't care.
-        data_store.list(request.rest_path[0..1] + ['cookbooks']).each do |name|
-          result[name] = data_store.list(request.rest_path[0..1] + ['cookbooks', name])
+        data_store.list(request.rest_path[0..1] + ["cookbooks"]).each do |name|
+          result[name] = data_store.list(request.rest_path[0..1] + ["cookbooks", name])
         end
         result
       end
@@ -48,10 +48,10 @@ module ChefZero
 
       def recipe_names(cookbook_name, cookbook)
         result = []
-        if cookbook['recipes']
-          cookbook['recipes'].each do |recipe|
-            if recipe['path'] == "recipes/#{recipe['name']}" && recipe['name'][-3..-1] == '.rb'
-              if recipe['name'] == 'default.rb'
+        if cookbook["recipes"]
+          cookbook["recipes"].each do |recipe|
+            if recipe["path"] == "recipes/#{recipe['name']}" && recipe["name"][-3..-1] == ".rb"
+              if recipe["name"] == "default.rb"
                 result << cookbook_name
               end
               result << "#{cookbook_name}::#{recipe['name'][0..-4]}"

data/lib/chef_zero/endpoints/cookbooks_endpoint.rb

@@ -1,14 +1,14 @@
-require 'chef_zero/endpoints/cookbooks_base'
+require "chef_zero/endpoints/cookbooks_base"
 
 module ChefZero
   module Endpoints
     # /cookbooks
     class CookbooksEndpoint < CookbooksBase
       def get(request)
-        if request.query_params['num_versions'] == 'all'
+        if request.query_params["num_versions"] == "all"
           num_versions = nil
-        elsif request.query_params['num_versions']
-          num_versions = request.query_params['num_versions'].to_i
+        elsif request.query_params["num_versions"]
+          num_versions = request.query_params["num_versions"].to_i
         else
           num_versions = 1
         end

data/lib/chef_zero/endpoints/data_bag_endpoint.rb

@@ -1,14 +1,14 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_list_endpoint'
-require 'chef_zero/endpoints/data_bag_item_endpoint'
-require 'chef_zero/rest_error_response'
+require "ffi_yajl"
+require "chef_zero/endpoints/rest_list_endpoint"
+require "chef_zero/endpoints/data_bag_item_endpoint"
+require "chef_zero/rest_error_response"
 
 module ChefZero
   module Endpoints
     # /data/NAME
     class DataBagEndpoint < RestListEndpoint
       def initialize(server)
-        super(server, 'id')
+        super(server, "id")
       end
 
       def post(request)
@@ -16,7 +16,7 @@ module ChefZero
         key = identity_keys.map { |k| json[k] }.select { |v| v }.first
         response = super(request)
         if response[0] == 201
-          already_json_response(201, DataBagItemEndpoint::populate_defaults(request, request.body, request.rest_path[3], key))
+          already_json_response(201, DataBagItemEndpoint.populate_defaults(request, request.body, request.rest_path[3], key))
         else
           response
         end
@@ -24,10 +24,10 @@ module ChefZero
 
       def get_key(contents)
         data_bag_item = FFI_Yajl::Parser.parse(contents, :create_additions => false)
-        if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
-          data_bag_item['raw_data']['id']
+        if data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"]
+          data_bag_item["raw_data"]["id"]
         else
-          data_bag_item['id']
+          data_bag_item["id"]
         end
       end
 
@@ -35,9 +35,9 @@ module ChefZero
         key = request.rest_path[3]
         delete_data_dir(request, request.rest_path, :recursive)
         json_response(200, {
-          'chef_type' => 'data_bag',
-          'json_class' => 'Chef::DataBag',
-          'name' => key
+          "chef_type" => "data_bag",
+          "json_class" => "Chef::DataBag",
+          "name" => key,
         })
       end
     end

data/lib/chef_zero/endpoints/data_bag_item_endpoint.rb

@@ -1,18 +1,18 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/endpoints/data_bag_item_endpoint'
-require 'chef_zero/chef_data/data_normalizer'
+require "ffi_yajl"
+require "chef_zero/endpoints/rest_object_endpoint"
+require "chef_zero/endpoints/data_bag_item_endpoint"
+require "chef_zero/chef_data/data_normalizer"
 
 module ChefZero
   module Endpoints
     # /data/NAME/NAME
     class DataBagItemEndpoint < RestObjectEndpoint
       def initialize(server)
-        super(server, 'id')
+        super(server, "id")
       end
 
       def populate_defaults(request, response_json)
-        DataBagItemEndpoint::populate_defaults(request, response_json, request.rest_path[3], request.rest_path[4])
+        DataBagItemEndpoint.populate_defaults(request, response_json, request.rest_path[3], request.rest_path[4])
       end
 
       def self.populate_defaults(request, response_json, data_bag, data_bag_item)