chef-zero 2.0.2 → 2.1

data/lib/chef_zero/endpoints/cookbooks_base.rb

@@ -11,23 +11,23 @@ module ChefZero
         filter_cookbooks(cookbooks_list, constraints, num_versions) do |name, versions|
           versions_list = versions.map do |version|
             {
-              'url' => build_uri(request.base_uri, ['cookbooks', name, 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, ['cookbooks', name]),
+            'url' => build_uri(request.base_uri, request.rest_path[0..1] + ['cookbooks', name]),
             'versions' => versions_list
           }
         end
         results
       end
 
-      def all_cookbooks_list
+      def all_cookbooks_list(request)
         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])
+        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

data/lib/chef_zero/endpoints/cookbooks_endpoint.rb

@@ -12,7 +12,7 @@ module ChefZero
         else
           num_versions = 1
         end
-        json_response(200, format_cookbooks_list(request, all_cookbooks_list, {}, num_versions))
+        json_response(200, format_cookbooks_list(request, all_cookbooks_list(request), {}, num_versions))
       end
     end
   end

data/lib/chef_zero/endpoints/data_bag_endpoint.rb

@@ -15,7 +15,7 @@ module ChefZero
         key = JSON.parse(request.body, :create_additions => false)[identity_key]
         response = super(request)
         if response[0] == 201
-          already_json_response(201, DataBagItemEndpoint::populate_defaults(request, request.body, request.rest_path[1], key))
+          already_json_response(201, DataBagItemEndpoint::populate_defaults(request, request.body, request.rest_path[3], key))
         else
           response
         end
@@ -31,7 +31,7 @@ module ChefZero
       end
 
       def delete(request)
-        key = request.rest_path[1]
+        key = request.rest_path[3]
         delete_data_dir(request, request.rest_path, :recursive)
         json_response(200, {
           'chef_type' => 'data_bag',

data/lib/chef_zero/endpoints/data_bag_item_endpoint.rb

@@ -12,7 +12,7 @@ module ChefZero
       end
 
       def populate_defaults(request, response_json)
-        DataBagItemEndpoint::populate_defaults(request, response_json, request.rest_path[1], request.rest_path[2])
+        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)

data/lib/chef_zero/endpoints/data_bags_endpoint.rb

@@ -10,10 +10,10 @@ module ChefZero
         name = JSON.parse(contents, :create_additions => false)[identity_key]
         if name.nil?
           error(400, "Must specify '#{identity_key}' in JSON")
-        elsif exists_data_dir?(request, ['data', name])
+        elsif exists_data_dir?(request, request.rest_path[0..1] + ['data', name])
           error(409, "Object already exists")
         else
-          data_store.create_dir(['data'], name, :recursive)
+          data_store.create_dir(request.rest_path[0..1] + ['data'], name, :recursive)
           json_response(201, {"uri" => "#{build_uri(request.base_uri, request.rest_path + [name])}"})
         end
       end

data/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb

@@ -6,10 +6,10 @@ module ChefZero
     # /environments/NAME/cookbooks/NAME
     class EnvironmentCookbookEndpoint < CookbooksBase
       def get(request)
-        cookbook_name = request.rest_path[3]
-        environment = JSON.parse(get_data(request, request.rest_path[0..1]), :create_additions => false)
+        cookbook_name = request.rest_path[5]
+        environment = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
         constraints = environment['cookbook_versions'] || {}
-        cookbook_versions = list_data(request, request.rest_path[2..3])
+        cookbook_versions = list_data(request, request.rest_path[0..1] + request.rest_path[4..5])
         if request.query_params['num_versions'] == 'all'
           num_versions = nil
         elsif request.query_params['num_versions']

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -8,7 +8,7 @@ module ChefZero
     class EnvironmentCookbookVersionsEndpoint < RestBase
 
       def post(request)
-        cookbook_names = list_data(request, ['cookbooks'])
+        cookbook_names = list_data(request, request.rest_path[0..1] + ['cookbooks'])
 
         # Get the list of cookbooks and versions desired by the runlist
         desired_versions = {}
@@ -16,17 +16,17 @@ module ChefZero
         run_list.each do |run_list_entry|
           if run_list_entry =~ /(.+)::.+\@(.+)/ || run_list_entry =~ /(.+)\@(.+)/
             raise RestErrorResponse.new(412, "No such cookbook: #{$1}") if !cookbook_names.include?($1)
-            raise RestErrorResponse.new(412, "No such cookbook version for cookbook #{$1}: #{$2}") if !list_data(request, ['cookbooks', $1]).include?($2)
+            raise RestErrorResponse.new(412, "No such cookbook version for cookbook #{$1}: #{$2}") if !list_data(request, request.rest_path[0..1] + ['cookbooks', $1]).include?($2)
             desired_versions[$1] = [ $2 ]
           else
             desired_cookbook = run_list_entry.split('::')[0]
             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])
+            desired_versions[desired_cookbook] = list_data(request, request.rest_path[0..1] + ['cookbooks', desired_cookbook])
           end
         end
 
         # Filter by environment constraints
-        environment = JSON.parse(get_data(request, request.rest_path[0..1]), :create_additions => false)
+        environment = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
         environment_constraints = environment['cookbook_versions'] || {}
 
         desired_versions.each_key do |name|
@@ -48,8 +48,8 @@ module ChefZero
 
         result = {}
         solved.each_pair do |name, versions|
-          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, 'MIN')
+          cookbook = JSON.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', name, versions[0]]), :create_additions => false)
+          result[name] = DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, name, versions[0], request.base_uri, 'MIN')
         end
         json_response(200, result)
       end
@@ -74,7 +74,7 @@ module ChefZero
           new_unsolved = unsolved[1..-1]
 
           # Pick this cookbook, and add dependencies
-          cookbook_obj = JSON.parse(get_data(request, ['cookbooks', solve_for, desired_version]), :create_additions => false)
+          cookbook_obj = JSON.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', solve_for, desired_version]), :create_additions => false)
           cookbook_metadata = cookbook_obj['metadata'] || {}
           cookbook_dependencies = cookbook_metadata['dependencies'] || {}
           dep_not_found = false
@@ -84,12 +84,12 @@ 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 !exists_data_dir?(request, ['cookbooks', dep_name])
+              if !exists_data_dir?(request, request.rest_path[0..1] + ['cookbooks', dep_name])
                 @last_missing_dep = dep_name.to_s
                 dep_not_found = true
                 break
               end
-              new_desired_versions[dep_name] = list_data(request, ['cookbooks', dep_name])
+              new_desired_versions[dep_name] = list_data(request, request.rest_path[0..1] + ['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)

data/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb

@@ -6,7 +6,7 @@ module ChefZero
     # /environments/NAME/cookbooks
     class EnvironmentCookbooksEndpoint < CookbooksBase
       def get(request)
-        environment = JSON.parse(get_data(request, request.rest_path[0..1]), :create_additions => false)
+        environment = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
         constraints = environment['cookbook_versions'] || {}
         if request.query_params['num_versions'] == 'all'
           num_versions = nil
@@ -15,7 +15,7 @@ module ChefZero
         else
           num_versions = 1
         end
-        json_response(200, format_cookbooks_list(request, all_cookbooks_list, constraints, num_versions))
+        json_response(200, format_cookbooks_list(request, all_cookbooks_list(request), constraints, num_versions))
       end
     end
   end

data/lib/chef_zero/endpoints/environment_endpoint.rb

@@ -7,7 +7,7 @@ module ChefZero
     # /environments/NAME
     class EnvironmentEndpoint < RestObjectEndpoint
       def delete(request)
-        if request.rest_path[1] == "_default"
+        if request.rest_path[3] == "_default"
           # 405, really?
           error(405, "The '_default' environment cannot be modified.")
         else
@@ -16,7 +16,7 @@ module ChefZero
       end
 
       def put(request)
-        if request.rest_path[1] == "_default"
+        if request.rest_path[3] == "_default"
           error(405, "The '_default' environment cannot be modified.")
         else
           super(request)
@@ -25,7 +25,7 @@ module ChefZero
 
       def populate_defaults(request, response_json)
         response = JSON.parse(response_json, :create_additions => false)
-        response = DataNormalizer.normalize_environment(response, request.rest_path[1])
+        response = DataNormalizer.normalize_environment(response, request.rest_path[3])
         JSON.pretty_generate(response)
       end
     end

data/lib/chef_zero/endpoints/environment_nodes_endpoint.rb

@@ -7,13 +7,13 @@ module ChefZero
     class EnvironmentNodesEndpoint < RestBase
       def get(request)
         # 404 if environment does not exist
-        get_data(request, request.rest_path[0..1])
+        get_data(request, request.rest_path[0..3])
 
         result = {}
-        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])
+        list_data(request, request.rest_path[0..1] + ['nodes']).each do |name|
+          node = JSON.parse(get_data(request, request.rest_path[0..1] + ['nodes', name]), :create_additions => false)
+          if node['chef_environment'] == request.rest_path[3]
+            result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ['nodes', name])
           end
         end
         json_response(200, result)

data/lib/chef_zero/endpoints/environment_recipes_endpoint.rb

@@ -6,12 +6,12 @@ module ChefZero
     # /environment/NAME/recipes
     class EnvironmentRecipesEndpoint < CookbooksBase
       def get(request)
-        environment = JSON.parse(get_data(request, request.rest_path[0..1]), :create_additions => false)
+        environment = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
         constraints = environment['cookbook_versions'] || {}
         result = []
-        filter_cookbooks(all_cookbooks_list, constraints, 1) do |name, versions|
+        filter_cookbooks(all_cookbooks_list(request), constraints, 1) do |name, versions|
           if versions.size > 0
-            cookbook = JSON.parse(get_data(request, ['cookbooks', name, versions[0]]), :create_additions => false)
+            cookbook = JSON.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/environment_role_endpoint.rb

@@ -8,18 +8,18 @@ module ChefZero
     class EnvironmentRoleEndpoint < CookbooksBase
       def get(request)
         # 404 if environment does not exist
-        if request.rest_path[0] == 'environments'
-          environment_path = request.rest_path[0..1]
-          role_path = request.rest_path[2..3]
+        if request.rest_path[2] == 'environments'
+          environment_path = request.rest_path[0..1] + request.rest_path[2..3]
+          role_path = request.rest_path[0..1] + request.rest_path[4..5]
         else
-          environment_path = request.rest_path[2..3]
-          role_path = request.rest_path[0..1]
+          environment_path = request.rest_path[0..1] + request.rest_path[4..5]
+          role_path = request.rest_path[0..1] + request.rest_path[2..3]
         end
         # Verify that the environment exists
         get_data(request, environment_path)
 
         role = JSON.parse(get_data(request, role_path), :create_additions => false)
-        environment_name = environment_path[1]
+        environment_name = environment_path[3]
         if environment_name == '_default'
           run_list = role['run_list']
         else

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -8,7 +8,7 @@ module ChefZero
     class NodeEndpoint < RestObjectEndpoint
       def populate_defaults(request, response_json)
         node = JSON.parse(response_json, :create_additions => false)
-        node = DataNormalizer.normalize_node(node, request.rest_path[1])
+        node = DataNormalizer.normalize_node(node, request.rest_path[3])
         JSON.pretty_generate(node)
       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 = get_data(request, [ 'users', name ], :nil)
+        json = get_data(request, request.rest_path[0..1] + [ 'users', name ], :nil)
         if json
           type = 'user'
         else
-          json = get_data(request, [ 'clients', name ], :nil)
+          json = get_data(request, request.rest_path[0..1] + [ 'clients', name ], :nil)
           type = 'client'
         end
         if json

data/lib/chef_zero/endpoints/rest_object_endpoint.rb

@@ -26,15 +26,16 @@ module ChefZero
         rename = key != request.rest_path[-1]
         if rename
           begin
-            data_store.create(request.rest_path[0..-2], key, request.body)
+            data_store.create(request.rest_path[0..1] + request.rest_path[2..-2], key, request.body)
           rescue DataStore::DataAlreadyExistsError
             return error(409, "Cannot rename '#{request.rest_path[-1]}' to '#{key}': '#{key}' already exists")
           end
           delete_data(request)
+          already_json_response(201, populate_defaults(request, request.body))
         else
           set_data(request, request.rest_path, request.body)
+          already_json_response(200, populate_defaults(request, request.body))
         end
-        already_json_response(200, populate_defaults(request, request.body))
       end
 
       def delete(request)
@@ -58,4 +59,3 @@ module ChefZero
     end
   end
 end
-

data/lib/chef_zero/endpoints/role_endpoint.rb

@@ -8,7 +8,7 @@ module ChefZero
     class RoleEndpoint < RestObjectEndpoint
       def populate_defaults(request, response_json)
         role = JSON.parse(response_json, :create_additions => false)
-        role = DataNormalizer.normalize_role(role, request.rest_path[1])
+        role = DataNormalizer.normalize_role(role, request.rest_path[3])
         JSON.pretty_generate(role)
       end
     end

data/lib/chef_zero/endpoints/role_environments_endpoint.rb

@@ -6,7 +6,7 @@ module ChefZero
     # /roles/NAME/environments
     class RoleEnvironmentsEndpoint < RestBase
       def get(request)
-        role = JSON.parse(get_data(request, request.rest_path[0..1]), :create_additions => false)
+        role = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
         json_response(200, [ '_default' ] + (role['env_run_lists'].keys || []))
       end
     end

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -9,14 +9,14 @@ module ChefZero
       def put(request)
         existing_sandbox = JSON.parse(get_data(request), :create_additions => false)
         existing_sandbox['checksums'].each do |checksum|
-          if !exists_data?(request, ['file_store', 'checksums', checksum])
+          if !exists_data?(request, request.rest_path[0..1] + ['file_store', 'checksums', checksum])
             raise RestErrorResponse.new(503, "Checksum not uploaded: #{checksum}")
           end
         end
         delete_data(request)
         json_response(200, {
-          :guid => request.rest_path[1],
-          :name => request.rest_path[1],
+          :guid => request.rest_path[3],
+          :name => request.rest_path[3],
           :checksums => existing_sandbox['checksums'],
           :create_time => existing_sandbox['create_time'],
           :is_completed => true

data/lib/chef_zero/endpoints/sandboxes_endpoint.rb

@@ -16,12 +16,12 @@ module ChefZero
         needed_checksums = JSON.parse(request.body, :create_additions => false)['checksums']
         result_checksums = {}
         needed_checksums.keys.each do |needed_checksum|
-          if list_data(request, ['file_store', 'checksums']).include?(needed_checksum)
+          if list_data(request, request.rest_path[0..1] + ['file_store', 'checksums']).include?(needed_checksum)
             result_checksums[needed_checksum] = { :needs_upload => false }
           else
             result_checksums[needed_checksum] = {
               :needs_upload => true,
-              :url => build_uri(request.base_uri, ['file_store', 'checksums', needed_checksum])
+              :url => build_uri(request.base_uri, request.rest_path[0..1] + ['file_store', 'checksums', needed_checksum])
             }
             sandbox_checksums << needed_checksum
           end
@@ -48,4 +48,3 @@ module ChefZero
     end
   end
 end
-

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -46,18 +46,22 @@ module ChefZero
       private
 
       def search_container(request, index)
-        case index
+        relative_parts, normalize_proc = case index
         when 'client'
-          [ ['clients'], Proc.new { |client, name| DataNormalizer.normalize_client(client, name) }, build_uri(request.base_uri, [ 'clients' ]) ]
+          [ ['clients'], Proc.new { |client, name| DataNormalizer.normalize_client(client, name) } ]
         when 'node'
-          [ ['nodes'], Proc.new { |node, name| DataNormalizer.normalize_node(node, name) }, build_uri(request.base_uri, [ 'nodes' ]) ]
+          [ ['nodes'], Proc.new { |node, name| DataNormalizer.normalize_node(node, name) } ]
         when 'environment'
-          [ ['environments'], Proc.new { |environment, name| DataNormalizer.normalize_environment(environment, name) }, build_uri(request.base_uri, [ 'environments' ]) ]
+          [ ['environments'], Proc.new { |environment, name| DataNormalizer.normalize_environment(environment, name) } ]
         when 'role'
-          [ ['roles'], Proc.new { |role, name| DataNormalizer.normalize_role(role, name) }, build_uri(request.base_uri, [ 'roles' ]) ]
+          [ ['roles'], Proc.new { |role, name| DataNormalizer.normalize_role(role, name) } ]
         else
-          [ ['data', index], Proc.new { |data_bag_item, id| DataNormalizer.normalize_data_bag_item(data_bag_item, index, id, 'DELETE') }, build_uri(request.base_uri, [ 'data', index ]) ]
+          [ ['data', index], Proc.new { |data_bag_item, id| DataNormalizer.normalize_data_bag_item(data_bag_item, index, id, 'DELETE') } ]
         end
+        [
+          request.rest_path[0..1] + relative_parts,
+          normalize_proc
+        ]
       end
 
       def expand_for_indexing(value, index, id)
@@ -90,7 +94,7 @@ module ChefZero
 
       def search(request)
         # Extract parameters
-        index = request.rest_path[1]
+        index = request.rest_path[3]
         query_string = request.query_params['q'] || '*:*'
         solr_query = ChefZero::Solr::SolrParser.new(query_string).parse
         sort_string = request.query_params['sort']
@@ -100,14 +104,14 @@ module ChefZero
         rows = rows.to_i if rows
 
         # Get the search container
-        container, expander, base_uri = search_container(request, index)
+        container, expander = search_container(request, index)
 
         # Search!
         result = []
         list_data(request, container).each do |name|
           value = get_data(request, container + [name])
           expanded = expander.call(JSON.parse(value, :create_additions => false), name)
-          result << [ name, build_uri(base_uri, [name]), expanded, expand_for_indexing(expanded, index, name) ]
+          result << [ name, build_uri(request.base_uri, container + [name]), expanded, expand_for_indexing(expanded, index, name) ]
         end
         result = result.select do |name, uri, value, search_value|
           solr_query.matches_doc?(ChefZero::Solr::SolrDoc.new(search_value, name))

data/lib/chef_zero/endpoints/searches_endpoint.rb

@@ -7,7 +7,7 @@ module ChefZero
       def get(request)
         # Get the result
         result_hash = {}
-        indices = (%w(client environment node role) + data_store.list(['data'])).sort
+        indices = (%w(client environment node role) + data_store.list(request.rest_path[0..1] + ['data'])).sort
         indices.each do |index|
           result_hash[index] = build_uri(request.base_uri, request.rest_path + [index])
         end

data/lib/chef_zero/rest_base.rb

@@ -28,6 +28,7 @@ module ChefZero
       begin
         self.send(method, request)
       rescue RestErrorResponse => e
+        ChefZero::Log.debug("#{e.inspect}\n#{e.backtrace.join("\n")}")
         error(e.response_code, e.error)
       end
     end
@@ -119,11 +120,18 @@ module ChefZero
     end
 
     def build_uri(base_uri, rest_path)
-      RestBase::build_uri(base_uri, rest_path)
+      if server.options[:single_org]
+        # Strip off /organizations/chef if we are in single org mode
+        if rest_path[0..1] != [ 'organizations', 'chef' ]
+          raise "Unexpected URL #{rest_path[0..1]} passed to build_uri in single org mode"
+        end
+        "#{base_uri}/#{rest_path[2..-1].join('/')}"
+      else
+        "#{base_uri}/#{rest_path.join('/')}"
+      end
     end
 
     def self.build_uri(base_uri, rest_path)
-      "#{base_uri}/#{rest_path.join('/')}"
     end
 
     def populate_defaults(request, response)