chef-zero 1.0.1 → 1.1

data/lib/chef_zero/endpoints/authenticate_user_endpoint.rb

@@ -9,8 +9,12 @@ module ChefZero
         request_json = JSON.parse(request.body, :create_additions => false)
         name = request_json['name']
         password = request_json['password']
-        user = data['users'][name]
-        verified = user && JSON.parse(user, :create_additions => false)['password'] == password
+        begin
+          user = data_store.get(['users', name])
+          verified = JSON.parse(user, :create_additions => false)['password'] == password
+        rescue DataStore::DataNotFoundError
+          verified = false
+        end
         json_response(200, {
           'name' => name,
           'verified' => !!verified

data/lib/chef_zero/endpoints/cookbook_endpoint.rb

@@ -9,7 +9,7 @@ module ChefZero
         case filter
         when '_latest'
           result = {}
-          filter_cookbooks(data['cookbooks'], {}, 1) do |name, versions|
+          filter_cookbooks(all_cookbooks_list, {}, 1) do |name, versions|
             if versions.size > 0
               result[name] = build_uri(request.base_uri, ['cookbooks', name, versions[0]])
             end
@@ -17,15 +17,15 @@ module ChefZero
           json_response(200, result)
         when '_recipes'
           result = []
-          filter_cookbooks(data['cookbooks'], {}, 1) do |name, versions|
+          filter_cookbooks(all_cookbooks_list, {}, 1) do |name, versions|
             if versions.size > 0
-              cookbook = JSON.parse(data['cookbooks'][name][versions[0]], :create_additions => false)
+              cookbook = JSON.parse(get_data(request, ['cookbooks', name, versions[0]]), :create_additions => false)
               result += recipe_names(name, cookbook)
             end
           end
           json_response(200, result.sort)
         else
-          cookbook_list = { filter => get_data(request, request.rest_path) }
+          cookbook_list = { filter => list_data(request, request.rest_path) }
           json_response(200, format_cookbooks_list(request, cookbook_list))
         end
       end

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -9,7 +9,7 @@ module ChefZero
     class CookbookVersionEndpoint < RestObjectEndpoint
       def get(request)
         if request.rest_path[2] == "_latest" || request.rest_path[2] == "latest"
-          request.rest_path[2] = latest_version(get_data(request, request.rest_path[0..1]).keys)
+          request.rest_path[2] = latest_version(list_data(request, request.rest_path[0..1]))
         end
         super(request)
       end
@@ -17,9 +17,8 @@ module ChefZero
       def put(request)
         name = request.rest_path[1]
         version = request.rest_path[2]
-        data['cookbooks'][name] = {} if !data['cookbooks'][name]
-        existing_cookbook = data['cookbooks'][name][version]
-
+        existing_cookbook = get_data(request, request.rest_path, :nil)
+        
         # Honor frozen
         if existing_cookbook
           existing_cookbook_json = JSON.parse(existing_cookbook, :create_additions => false)
@@ -37,7 +36,7 @@ module ChefZero
         end
 
         # Set the cookbook
-        data['cookbooks'][name][version] = request.body
+        set_data(request, ['cookbooks', name, version], request.body, :create_dir, :create)
 
         # If the cookbook was updated, check for deleted files and clean them up
         if existing_cookbook
@@ -47,18 +46,19 @@ module ChefZero
           end
         end
 
-        already_json_response(existing_cookbook ? 200 : 201, populate_defaults(request, data['cookbooks'][name][version]))
+        already_json_response(existing_cookbook ? 200 : 201, populate_defaults(request, request.body))
       end
 
       def delete(request)
         if request.rest_path[2] == "_latest" || request.rest_path[2] == "latest"
-          request.rest_path[2] = latest_version(get_data(request, request.rest_path[0..1]).keys)
+          request.rest_path[2] = latest_version(list_data(request, request.rest_path[0..1]))
         end
 
-        deleted_cookbook = get_data(request, request.rest_path)
+        deleted_cookbook = get_data(request)
+
         response = super(request)
         cookbook_name = request.rest_path[1]
-        data['cookbooks'].delete(cookbook_name) if data['cookbooks'][cookbook_name].size == 0
+        delete_data_dir(request, ['cookbooks', cookbook_name]) if list_data(request, ['cookbooks', cookbook_name]).size == 0
 
         # Hoover deleted files, if they exist
         hoover_unused_checksums(get_checksums(deleted_cookbook))
@@ -79,14 +79,18 @@ module ChefZero
         result
       end
 
+      private
+
       def hoover_unused_checksums(deleted_checksums)
-        data['cookbooks'].each_pair do |cookbook_name, versions|
-          versions.each_pair do |cookbook_version, cookbook|
+        data_store.list(['cookbooks']).each do |cookbook_name|
+          data_store.list(['cookbooks', cookbook_name]).each do |version|
+            cookbook = data_store.get(['cookbooks', cookbook_name, version])
             deleted_checksums = deleted_checksums - get_checksums(cookbook)
           end
         end
         deleted_checksums.each do |checksum|
-          data['file_store'].delete(checksum)
+          # There can be a race here if multiple cookbooks are uploading.
+          data_store.delete(['file_store', 'checksums', checksum])
         end
       end
 

data/lib/chef_zero/endpoints/cookbooks_base.rb

@@ -23,11 +23,20 @@ module ChefZero
         results
       end
 
+      def all_cookbooks_list
+        result = {}
+        # Race conditions exist here (if someone deletes while listing).  I don't care.
+        data_store.list(['cookbooks']).each do |name|
+          result[name] = data_store.list(['cookbooks', name])
+        end
+        result
+      end
+
       def filter_cookbooks(cookbooks_list, constraints = {}, num_versions = nil)
         cookbooks_list.keys.sort.each do |name|
           constraint = Gem::Requirement.new(constraints[name])
           versions = []
-          cookbooks_list[name].keys.sort_by { |version| Gem::Version.new(version.dup) }.reverse.each do |version|
+          cookbooks_list[name].sort_by { |version| Gem::Version.new(version.dup) }.reverse.each do |version|
             break if num_versions && versions.size >= num_versions
             if constraint.satisfied_by?(Gem::Version.new(version.dup))
               versions << version

data/lib/chef_zero/endpoints/cookbooks_endpoint.rb

@@ -5,7 +5,7 @@ module ChefZero
     # /cookbooks
     class CookbooksEndpoint < CookbooksBase
       def get(request)
-        json_response(200, format_cookbooks_list(request, data['cookbooks']))
+        json_response(200, format_cookbooks_list(request, all_cookbooks_list))
       end
     end
   end

data/lib/chef_zero/endpoints/data_bag_endpoint.rb

@@ -32,12 +32,7 @@ module ChefZero
 
       def delete(request)
         key = request.rest_path[1]
-        container = data['data']
-        if !container.has_key?(key)
-          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
-        end
-        result = container[key]
-        container.delete(key)
+        delete_data_dir(request, request.rest_path, :recursive)
         json_response(200, {
           'chef_type' => 'data_bag',
           'json_class' => 'Chef::DataBag',

data/lib/chef_zero/endpoints/data_bags_endpoint.rb

@@ -6,15 +6,14 @@ module ChefZero
     # /data
     class DataBagsEndpoint < RestListEndpoint
       def post(request)
-        container = get_data(request)
         contents = request.body
         name = JSON.parse(contents, :create_additions => false)[identity_key]
         if name.nil?
           error(400, "Must specify '#{identity_key}' in JSON")
-        elsif container[name]
+        elsif exists_data_dir?(request, ['data', name])
           error(409, "Object already exists")
         else
-          container[name] = {}
+          data_store.create_dir(['data'], name, :keep_existing)
           json_response(201, {"uri" => "#{build_uri(request.base_uri, request.rest_path + [name])}"})
         end
       end

data/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb

@@ -9,7 +9,7 @@ module ChefZero
         cookbook_name = request.rest_path[3]
         environment = JSON.parse(get_data(request, request.rest_path[0..1]), :create_additions => false)
         constraints = environment['cookbook_versions'] || {}
-        cookbook = get_data(request, request.rest_path[2..3])
+        cookbook_versions = list_data(request, request.rest_path[2..3])
         if request.query_params['num_versions'] == 'all'
           num_versions = nil
         elsif request.query_params['num_versions']
@@ -17,7 +17,7 @@ module ChefZero
         else
           num_versions = nil
         end
-        json_response(200, format_cookbooks_list(request, { cookbook_name => cookbook }, constraints, num_versions))
+        json_response(200, format_cookbooks_list(request, { cookbook_name => cookbook_versions }, constraints, num_versions))
       end
     end
   end

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -6,27 +6,21 @@ module ChefZero
   module Endpoints
     # /environments/NAME/cookbook_versions
     class EnvironmentCookbookVersionsEndpoint < RestBase
-      def cookbooks
-        data['cookbooks']
-      end
-
-      def environments
-        data['environments']
-      end
-
       def post(request)
+        cookbook_names = list_data(request, ['cookbooks'])
+
         # Get the list of cookbooks and versions desired by the runlist
         desired_versions = {}
         run_list = JSON.parse(request.body, :create_additions => false)['run_list']
         run_list.each do |run_list_entry|
           if run_list_entry =~ /(.+)(::.+)?\@(.+)/
-            raise RestErrorResponse.new(412, "No such cookbook: #{$1}") if !cookbooks[$1]
-            raise RestErrorResponse.new(412, "No such cookbook version for cookbook #{$1}: #{$2}") if !cookbooks[$1][$2]
+            raise RestErrorResponse.new(412, "No such cookbook: #{$1}") if !cookbook_names.include?($1)
+            raise RestErrorResponse.new(412, "No such cookbook version for cookbook #{$1}: #{$3}") if !list_data(request, ['cookbooks', $1]).include?($3)
             desired_versions[$1] = [ $3 ]
           else
             desired_cookbook = run_list_entry.split('::')[0]
-            raise RestErrorResponse.new(412, "No such cookbook: #{desired_cookbook}") if !cookbooks[desired_cookbook]
-            desired_versions[desired_cookbook] = cookbooks[desired_cookbook].keys
+            raise RestErrorResponse.new(412, "No such cookbook: #{desired_cookbook}") if !cookbook_names.include?(desired_cookbook)
+            desired_versions[desired_cookbook] = list_data(request, ['cookbooks', desired_cookbook])
           end
         end
 
@@ -39,20 +33,20 @@ module ChefZero
         end
 
         # Depsolve!
-        solved = depsolve(desired_versions.keys, desired_versions, environment_constraints)
+        solved = depsolve(request, desired_versions.keys, desired_versions, environment_constraints)
         if !solved
           return raise RestErrorResponse.new(412, "Unsolvable versions!")
         end
 
         result = {}
         solved.each_pair do |name, versions|
-          cookbook = JSON.parse(data['cookbooks'][name][versions[0]], :create_additions => false)
+          cookbook = JSON.parse(get_data(request, ['cookbooks', name, versions[0]]), :create_additions => false)
           result[name] = DataNormalizer.normalize_cookbook(cookbook, name, versions[0], request.base_uri, 'GET')
         end
         json_response(200, result)
       end
 
-      def depsolve(unsolved, desired_versions, environment_constraints)
+      def depsolve(request, unsolved, desired_versions, environment_constraints)
         return nil if desired_versions.values.any? { |versions| versions.empty? }
 
         # If everything is already
@@ -67,7 +61,7 @@ module ChefZero
           new_unsolved = unsolved[1..-1]
 
           # Pick this cookbook, and add dependencies
-          cookbook_obj = JSON.parse(cookbooks[solve_for][desired_version], :create_additions => false)
+          cookbook_obj = JSON.parse(get_data(request, ['cookbooks', solve_for, desired_version]), :create_additions => false)
           cookbook_metadata = cookbook_obj['metadata'] || {}
           cookbook_dependencies = cookbook_metadata['dependencies'] || {}
           dep_not_found = false
@@ -77,11 +71,11 @@ module ChefZero
             if !new_desired_versions.has_key?(dep_name)
               new_unsolved = new_unsolved + [dep_name]
               # If the dep is missing, we will try other versions of the cookbook that might not have the bad dep.
-              if !cookbooks[dep_name]
+              if !exists_data_dir?(request, ['cookbooks', dep_name])
                 dep_not_found = true
                 break
               end
-              new_desired_versions[dep_name] = cookbooks[dep_name].keys
+              new_desired_versions[dep_name] = list_data(request, ['cookbooks', dep_name])
               new_desired_versions = filter_by_constraint(new_desired_versions, dep_name, environment_constraints[dep_name])
             end
             new_desired_versions = filter_by_constraint(new_desired_versions, dep_name, dep_constraint)
@@ -90,7 +84,7 @@ module ChefZero
           next if dep_not_found
 
           # Depsolve children with this desired version!  First solution wins.
-          result = depsolve(new_unsolved, new_desired_versions, environment_constraints)
+          result = depsolve(request, new_unsolved, new_desired_versions, environment_constraints)
           return result if result
         end
         return nil

data/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb

@@ -15,7 +15,7 @@ module ChefZero
         else
           num_versions = 1
         end
-        json_response(200, format_cookbooks_list(request, data['cookbooks'], constraints, num_versions))
+        json_response(200, format_cookbooks_list(request, all_cookbooks_list, constraints, num_versions))
       end
     end
   end

data/lib/chef_zero/endpoints/environment_nodes_endpoint.rb

@@ -10,8 +10,8 @@ module ChefZero
         get_data(request, request.rest_path[0..1])
 
         result = {}
-        data['nodes'].each_pair do |name, node|
-          node_json = JSON.parse(node, :create_additions => false)
+        list_data(request, ['nodes']).each do |name|
+          node = JSON.parse(get_data(request, ['nodes', name]), :create_additions => false)
           if node['chef_environment'] == request.rest_path[1]
             result[name] = build_uri(request.base_uri, 'nodes', name)
           end

data/lib/chef_zero/endpoints/environment_recipes_endpoint.rb

@@ -9,9 +9,9 @@ module ChefZero
         environment = JSON.parse(get_data(request, request.rest_path[0..1]), :create_additions => false)
         constraints = environment['cookbook_versions'] || {}
         result = []
-        filter_cookbooks(data['cookbooks'], constraints, 1) do |name, versions|
+        filter_cookbooks(all_cookbooks_list, constraints, 1) do |name, versions|
           if versions.size > 0
-            cookbook = JSON.parse(data['cookbooks'][name][versions[0]], :create_additions => false)
+            cookbook = JSON.parse(get_data(request, ['cookbooks', name, versions[0]]), :create_additions => false)
             result += recipe_names(name, cookbook)
           end
         end

data/lib/chef_zero/endpoints/environment_role_endpoint.rb

@@ -15,6 +15,7 @@ module ChefZero
           environment_path = request.rest_path[2..3]
           role_path = request.rest_path[0..1]
         end
+        # Verify that the environment exists
         get_data(request, environment_path)
 
         role = JSON.parse(get_data(request, role_path), :create_additions => false)

data/lib/chef_zero/endpoints/file_store_file_endpoint.rb

@@ -14,7 +14,7 @@ module ChefZero
       end
 
       def put(request)
-        data['file_store'][request.rest_path[1]] = request.body
+        data_store.set(request.rest_path, request.body, :create, :create_dir)
         json_response(200, {})
       end
     end

data/lib/chef_zero/endpoints/principal_endpoint.rb

@@ -8,11 +8,11 @@ module ChefZero
     class PrincipalEndpoint < RestBase
       def get(request)
         name = request.rest_path[-1]
-        json = data['users'][name]
+        json = get_data(request, [ 'users', name ], :nil)
         if json
           type = 'user'
         else
-          json = data['clients'][name]
+          json = get_data(request, [ 'clients', name ], :nil)
           type = 'client'
         end
         if json

data/lib/chef_zero/endpoints/rest_list_endpoint.rb

@@ -15,22 +15,19 @@ module ChefZero
       def get(request)
         # Get the result
         result_hash = {}
-        get_data(request).keys.sort.each do |name|
+        list_data(request).sort.each do |name|
           result_hash[name] = "#{build_uri(request.base_uri, request.rest_path + [name])}"
         end
         json_response(200, result_hash)
       end
 
       def post(request)
-        container = get_data(request)
         contents = request.body
         key = get_key(contents)
         if key.nil?
           error(400, "Must specify '#{identity_key}' in JSON")
-        elsif container[key]
-          error(409, 'Object already exists')
         else
-          container[key] = contents
+          create_data(request, request.rest_path, key, contents)
           json_response(201, {'uri' => "#{build_uri(request.base_uri, request.rest_path + [key])}"})
         end
       end

data/lib/chef_zero/endpoints/rest_object_endpoint.rb

@@ -22,33 +22,29 @@ module ChefZero
         old_body = get_data(request)
         request_json = JSON.parse(request.body, :create_additions => false)
         key = request_json[identity_key] || request.rest_path[-1]
-        container = get_data(request, request.rest_path[0..-2])
         # If it's a rename, check for conflict and delete the old value
         rename = key != request.rest_path[-1]
         if rename
-          if container.has_key?(key)
+          begin
+            data_store.create(request.rest_path[0..-2], key, request.body)
+          rescue DataStore::DataAlreadyExistsError
             return error(409, "Cannot rename '#{request.rest_path[-1]}' to '#{key}': '#{key}' already exists")
           end
-          container.delete(request.rest_path[-1])
+          delete_data(request)
+        else
+          set_data(request, request.rest_path, request.body)
         end
-        container[key] = request.body
         already_json_response(200, populate_defaults(request, request.body))
       end
 
       def delete(request)
-        key = request.rest_path[-1]
-        container = get_data(request, request.rest_path[0..-2])
-        if !container.has_key?(key)
-          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
-        end
-        result = container[key]
-        container.delete(key)
+        result = get_data(request)
+        delete_data(request)
         already_json_response(200, populate_defaults(request, result))
       end
 
       def patch_request_body(request)
-        container = get_data(request, request.rest_path[0..-2])
-        existing_value = container[request.rest_path[-1]]
+        existing_value = get_data(request, nil, :nil)
         if existing_value
           request_json = JSON.parse(request.body, :create_additions => false)
           existing_json = JSON.parse(existing_value, :create_additions => false)

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -5,15 +5,13 @@ module ChefZero
     # /sandboxes/ID
     class SandboxEndpoint < RestBase
       def put(request)
-        existing_sandbox = get_data(request, request.rest_path)
-        data['sandboxes'].delete(request.rest_path[1])
-        time_str = existing_sandbox[:create_time].strftime('%Y-%m-%dT%H:%M:%S%z')
-        time_str = "#{time_str[0..21]}:#{time_str[22..23]}"
+        existing_sandbox = JSON.parse(get_data(request), :create_additions => false)
+        delete_data(request)
         json_response(200, {
           :guid => request.rest_path[1],
           :name => request.rest_path[1],
-          :checksums => existing_sandbox[:checksums],
-          :create_time => time_str,
+          :checksums => existing_sandbox['checksums'],
+          :create_time => existing_sandbox['create_time'],
           :is_completed => true
         })
       end