chef-zero 4.8.0 → 4.9.0

data/lib/chef_zero/endpoints/data_bags_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
@@ -11,11 +11,11 @@ module ChefZero
         name = identity_keys.map { |k| json[k] }.select { |v| v }.first
         if name.nil?
           error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")
-        elsif exists_data_dir?(request, request.rest_path[0..1] + ['data', name])
+        elsif exists_data_dir?(request, request.rest_path[0..1] + ["data", name])
           error(409, "Object already exists")
         else
-          create_data_dir(request, request.rest_path[0..1] + ['data'], name, :recursive)
-          json_response(201, {"uri" => "#{build_uri(request.base_uri, request.rest_path + [name])}"})
+          create_data_dir(request, request.rest_path[0..1] + ["data"], name, :recursive)
+          json_response(201, { "uri" => "#{build_uri(request.base_uri, request.rest_path + [name])}" })
         end
       end
     end

data/lib/chef_zero/endpoints/dummy_endpoint.rb

@@ -7,7 +7,6 @@ module ChefZero
       # called by #direct_solr_query, once each for roles, nodes, and data bag items. each RSpec example makes
       # 3 calls, with the expected sequence of return values [0, 1, 0].
       def get(request)
-
         # this could be made less brittle, but if things change to have more than 3 cycles, we should really
         # be notified by a spec failure.
         @mock_values ||= ([0, 1, 0] * 3).map { |val| make_response(val) }
@@ -28,4 +27,3 @@ module ChefZero
     end
   end
 end
-

data/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/cookbooks_base'
+require "ffi_yajl"
+require "chef_zero/endpoints/cookbooks_base"
 
 module ChefZero
   module Endpoints
@@ -8,12 +8,12 @@ module ChefZero
       def get(request)
         cookbook_name = request.rest_path[5]
         environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
-        constraints = environment['cookbook_versions'] || {}
+        constraints = environment["cookbook_versions"] || {}
         cookbook_versions = list_data(request, request.rest_path[0..1] + request.rest_path[4..5])
-        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 = nil
         end

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'chef_zero/rest_error_response'
+require "ffi_yajl"
+require "chef_zero/rest_base"
+require "chef_zero/rest_error_response"
 
 module ChefZero
   module Endpoints
@@ -8,26 +8,26 @@ module ChefZero
     class EnvironmentCookbookVersionsEndpoint < RestBase
 
       def post(request)
-        cookbook_names = list_data(request, request.rest_path[0..1] + ['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 = {}
-        run_list = FFI_Yajl::Parser.parse(request.body, :create_additions => false)['run_list']
+        run_list = FFI_Yajl::Parser.parse(request.body, :create_additions => false)["run_list"]
         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, request.rest_path[0..1] + ['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]
+            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, request.rest_path[0..1] + ['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 = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
-        environment_constraints = environment['cookbook_versions'] || {}
+        environment_constraints = environment["cookbook_versions"] || {}
 
         desired_versions.each_key do |name|
           desired_versions = filter_by_constraint(desired_versions, name, environment_constraints[name])
@@ -48,8 +48,8 @@ module ChefZero
 
         result = {}
         solved.each_pair do |name, versions|
-          cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', name, versions[0]]), :create_additions => false)
-          result[name] = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, name, versions[0], request.base_uri, 'MIN')
+          cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]), :create_additions => false)
+          result[name] = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, name, versions[0], request.base_uri, "MIN")
         end
         json_response(200, result)
       end
@@ -74,9 +74,9 @@ module ChefZero
           new_unsolved = unsolved[1..-1]
 
           # Pick this cookbook, and add dependencies
-          cookbook_obj = FFI_Yajl::Parser.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'] || {}
+          cookbook_obj = FFI_Yajl::Parser.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
           cookbook_dependencies.each_pair do |dep_name, dep_constraint|
             # If the dep is not already in the list, add it to the list to solve
@@ -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, request.rest_path[0..1] + ['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, request.rest_path[0..1] + ['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

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/cookbooks_base'
+require "ffi_yajl"
+require "chef_zero/endpoints/cookbooks_base"
 
 module ChefZero
   module Endpoints
@@ -7,11 +7,11 @@ module ChefZero
     class EnvironmentCookbooksEndpoint < CookbooksBase
       def get(request)
         environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
-        constraints = environment['cookbook_versions'] || {}
-        if request.query_params['num_versions'] == 'all'
+        constraints = environment["cookbook_versions"] || {}
+        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/environment_endpoint.rb

@@ -1,6 +1,6 @@
-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

data/lib/chef_zero/endpoints/environment_nodes_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
@@ -10,10 +10,10 @@ module ChefZero
         get_data(request, request.rest_path[0..3])
 
         result = {}
-        list_data(request, request.rest_path[0..1] + ['nodes']).each do |name|
-          node = FFI_Yajl::Parser.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])
+        list_data(request, request.rest_path[0..1] + ["nodes"]).each do |name|
+          node = FFI_Yajl::Parser.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

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/cookbooks_base'
+require "ffi_yajl"
+require "chef_zero/endpoints/cookbooks_base"
 
 module ChefZero
   module Endpoints
@@ -7,11 +7,11 @@ module ChefZero
     class EnvironmentRecipesEndpoint < CookbooksBase
       def get(request)
         environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
-        constraints = environment['cookbook_versions'] || {}
+        constraints = environment["cookbook_versions"] || {}
         result = []
         filter_cookbooks(all_cookbooks_list(request), constraints, 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/environment_role_endpoint.rb

@@ -1,5 +1,5 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/cookbooks_base'
+require "ffi_yajl"
+require "chef_zero/endpoints/cookbooks_base"
 
 module ChefZero
   module Endpoints
@@ -8,7 +8,7 @@ module ChefZero
     class EnvironmentRoleEndpoint < CookbooksBase
       def get(request)
         # 404 if environment does not exist
-        if request.rest_path[2] == 'environments'
+        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
@@ -20,16 +20,16 @@ module ChefZero
 
         role = FFI_Yajl::Parser.parse(get_data(request, role_path), :create_additions => false)
         environment_name = environment_path[3]
-        if environment_name == '_default'
-          run_list = role['run_list']
+        if environment_name == "_default"
+          run_list = role["run_list"]
         else
-          if role['env_run_lists']
-            run_list = role['env_run_lists'][environment_name]
+          if role["env_run_lists"]
+            run_list = role["env_run_lists"][environment_name]
           else
             run_list = nil
           end
         end
-        json_response(200, { 'run_list' => run_list })
+        json_response(200, { "run_list" => run_list })
       end
     end
   end

data/lib/chef_zero/endpoints/file_store_file_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/rest_base'
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -10,7 +10,7 @@ module ChefZero
       end
 
       def get(request)
-        [200, {"Content-Type" => 'application/x-binary'}, get_data(request) ]
+        [200, { "Content-Type" => "application/x-binary" }, get_data(request) ]
       end
 
       def put(request)

data/lib/chef_zero/endpoints/group_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/groups/NAME
     class GroupEndpoint < RestObjectEndpoint
       def initialize(server)
-        super(server, %w(id groupname))
+        super(server, %w{id groupname})
       end
 
       def populate_defaults(request, response_json)

data/lib/chef_zero/endpoints/groups_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/groups/NAME
     class GroupsEndpoint < RestListEndpoint
       def initialize(server)
-        super(server, %w(id groupname))
+        super(server, %w{id groupname})
       end
     end
   end

data/lib/chef_zero/endpoints/license_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
@@ -9,15 +9,15 @@ module ChefZero
 
       def get(request)
         node_count = 0
-        list_data(request, [ 'organizations' ]).each do |orgname|
-          node_count += list_data(request, [ 'organizations', orgname, 'nodes' ]).size
+        list_data(request, [ "organizations" ]).each do |orgname|
+          node_count += list_data(request, [ "organizations", orgname, "nodes" ]).size
         end
 
         json_response(200, {
           "limit_exceeded" => (node_count > MAX_NODE_COUNT) ? true : false,
           "node_license" => MAX_NODE_COUNT,
           "node_count" => node_count,
-          "upgrade_url" => 'http://blah.com'
+          "upgrade_url" => "http://blah.com",
         })
       end
     end

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -1,6 +1,6 @@
-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
@@ -28,4 +28,3 @@ module ChefZero
     end
   end
 end
-

data/lib/chef_zero/endpoints/node_identifiers_endpoint.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'uuidtools'
+require "ffi_yajl"
+require "chef_zero/rest_base"
+require "uuidtools"
 
 module ChefZero
   module Endpoints
@@ -8,10 +8,10 @@ module ChefZero
     class NodeIdentifiersEndpoint < RestBase
       def get(request)
         if get_data(request, request.rest_path[0..3])
-          result = { 
-            :id => UUIDTools::UUID.parse_raw(request.rest_path[0..4].to_s).to_s.gsub('-',''),
-            :authz_id => '0'*32,
-            :org_id => UUIDTools::UUID.parse_raw(request.rest_path[0..1].to_s).to_s.gsub('-','') }
+          result = {
+            :id => UUIDTools::UUID.parse_raw(request.rest_path[0..4].to_s).to_s.delete("-"),
+            :authz_id => "0" * 32,
+            :org_id => UUIDTools::UUID.parse_raw(request.rest_path[0..1].to_s).to_s.delete("-") }
           json_response(200, result)
         else
           raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")

data/lib/chef_zero/endpoints/nodes_endpoint.rb

@@ -1,6 +1,6 @@
-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
@@ -32,4 +32,3 @@ module ChefZero
     end
   end
 end
-

data/lib/chef_zero/endpoints/not_found_endpoint.rb

@@ -1,10 +1,10 @@
-require 'ffi_yajl'
+require "ffi_yajl"
 
 module ChefZero
   module Endpoints
     class NotFoundEndpoint
       def call(request)
-        return [404, {"Content-Type" => "application/json"}, FFI_Yajl::Encoder.encode({"error" => ["Object not found: #{request.env['REQUEST_PATH']}"]}, :pretty => true)]
+        return [404, { "Content-Type" => "application/json" }, FFI_Yajl::Encoder.encode({ "error" => ["Object not found: #{request.env['REQUEST_PATH']}"] }, :pretty => true)]
       end
     end
   end

data/lib/chef_zero/endpoints/organization_association_request_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

data/lib/chef_zero/endpoints/organization_association_requests_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,22 +7,22 @@ module ChefZero
     class OrganizationAssociationRequestsEndpoint < RestBase
       def post(request)
         json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        username = json['user']
+        username = json["user"]
         orgname = request.rest_path[1]
         id = "#{username}-#{orgname}"
 
-        if exists_data?(request, [ 'organizations', orgname, 'users', username ])
+        if exists_data?(request, [ "organizations", orgname, "users", username ])
           raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
         end
 
-        create_data(request, request.rest_path, username, '{}')
+        create_data(request, request.rest_path, username, "{}")
         json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ id ]) })
       end
 
       def get(request)
         orgname = request.rest_path[1]
         ChefZero::Endpoints::OrganizationUserBase.get(self, request) do |username|
-          { "id" => "#{username}-#{orgname}", 'username' => username }
+          { "id" => "#{username}-#{orgname}", "username" => username }
         end
       end
     end