chef-zero 4.8.0 → 4.9.0

data/lib/chef_zero/endpoints/rest_list_endpoint.rb

@@ -1,11 +1,11 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
+require "ffi_yajl"
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
     # Typical REST list endpoint (/roles or /data/BAG)
     class RestListEndpoint < RestBase
-      def initialize(server, identity_keys = [ 'name' ])
+      def initialize(server, identity_keys = [ "name" ])
         super(server)
         identity_keys = [ identity_keys ] if identity_keys.is_a?(String)
         @identity_keys = identity_keys
@@ -29,7 +29,7 @@ module ChefZero
           error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")
         else
           create_data(request, request.rest_path, key, contents)
-          json_response(201, {'uri' => "#{build_uri(request.base_uri, request.rest_path + [key])}"})
+          json_response(201, { "uri" => "#{build_uri(request.base_uri, request.rest_path + [key])}" })
         end
       end
 

data/lib/chef_zero/endpoints/rest_object_endpoint.rb

@@ -1,12 +1,12 @@
-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
     # Typical REST leaf endpoint (/roles/NAME or /data/BAG/NAME)
     class RestObjectEndpoint < RestBase
-      def initialize(server, identity_keys = [ 'name' ])
+      def initialize(server, identity_keys = [ "name" ])
         super(server)
         identity_keys = [ identity_keys ] if identity_keys.is_a?(String)
         @identity_keys = identity_keys

data/lib/chef_zero/endpoints/role_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/role_environments_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,7 +7,7 @@ module ChefZero
     class RoleEnvironmentsEndpoint < RestBase
       def get(request)
         role = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
-        json_response(200, [ '_default' ] + (role['env_run_lists'].keys || []))
+        json_response(200, [ "_default" ] + (role["env_run_lists"].keys || []))
       end
     end
   end

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -1,6 +1,6 @@
-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"
+require "ffi_yajl"
 
 module ChefZero
   module Endpoints
@@ -8,8 +8,8 @@ module ChefZero
     class SandboxEndpoint < RestBase
       def put(request)
         existing_sandbox = FFI_Yajl::Parser.parse(get_data(request), :create_additions => false)
-        existing_sandbox['checksums'].each do |checksum|
-          if !exists_data?(request, request.rest_path[0..1] + ['file_store', 'checksums', checksum])
+        existing_sandbox["checksums"].each do |checksum|
+          if !exists_data?(request, request.rest_path[0..1] + ["file_store", "checksums", checksum])
             raise RestErrorResponse.new(503, "Checksum not uploaded: #{checksum}")
           end
         end
@@ -17,9 +17,9 @@ module ChefZero
         json_response(200, {
           :guid => request.rest_path[3],
           :name => request.rest_path[3],
-          :checksums => existing_sandbox['checksums'],
-          :create_time => existing_sandbox['create_time'],
-          :is_completed => true
+          :checksums => existing_sandbox["checksums"],
+          :create_time => existing_sandbox["create_time"],
+          :is_completed => true,
         })
       end
     end

data/lib/chef_zero/endpoints/sandboxes_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
@@ -13,15 +13,15 @@ module ChefZero
       def post(request)
         sandbox_checksums = []
 
-        needed_checksums = FFI_Yajl::Parser.parse(request.body, :create_additions => false)['checksums']
+        needed_checksums = FFI_Yajl::Parser.parse(request.body, :create_additions => false)["checksums"]
         result_checksums = {}
         needed_checksums.keys.each do |needed_checksum|
-          if list_data(request, request.rest_path[0..1] + ['file_store', 'checksums']).include?(needed_checksum)
+          if list_data(request, request.rest_path[0..1] + %w{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, request.rest_path[0..1] + ['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
@@ -29,20 +29,20 @@ module ChefZero
 
         # There is an obvious race condition here.
         id = @next_id.to_s
-        @next_id+=1
+        @next_id += 1
 
-        time_str = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%S%z')
+        time_str = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S%z")
         time_str = "#{time_str[0..21]}:#{time_str[22..23]}"
 
         create_data(request, request.rest_path, id, FFI_Yajl::Encoder.encode({
           :create_time => time_str,
-          :checksums => sandbox_checksums
+          :checksums => sandbox_checksums,
         }, :pretty => true))
 
         json_response(201, {
           :uri => build_uri(request.base_uri, request.rest_path + [id]),
           :checksums => result_checksums,
-          :sandbox_id => id
+          :sandbox_id => id,
         })
       end
     end

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -1,9 +1,9 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/chef_data/data_normalizer'
-require 'chef_zero/rest_error_response'
-require 'chef_zero/solr/solr_parser'
-require 'chef_zero/solr/solr_doc'
+require "ffi_yajl"
+require "chef_zero/endpoints/rest_object_endpoint"
+require "chef_zero/chef_data/data_normalizer"
+require "chef_zero/rest_error_response"
+require "chef_zero/solr/solr_parser"
+require "chef_zero/solr/solr_doc"
 
 module ChefZero
   module Endpoints
@@ -12,7 +12,7 @@ module ChefZero
       def get(request)
         orgname = request.rest_path[1]
         results = search(request, orgname)
-        results['rows'] = results['rows'].map { |name,uri,value,search_value| value }
+        results["rows"] = results["rows"].map { |name, uri, value, search_value| value }
         json_response(200, results)
       rescue ChefZero::Solr::ParseError
         bad_search_request(request)
@@ -22,7 +22,7 @@ module ChefZero
         orgname = request.rest_path[1]
         full_results = search(request, orgname)
         keys = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        partial_results = full_results['rows'].map do |name, uri, doc, search_value|
+        partial_results = full_results["rows"].map do |name, uri, doc, search_value|
           data = {}
           keys.each_pair do |key, path|
             if path.size > 0
@@ -36,14 +36,14 @@ module ChefZero
             end
           end
           {
-            'url' => uri,
-            'data' => data
+            "url" => uri,
+            "data" => data,
           }
         end
         json_response(200, {
-          'rows' => partial_results,
-          'start' => full_results['start'],
-          'total' => full_results['total']
+          "rows" => partial_results,
+          "start" => full_results["start"],
+          "total" => full_results["total"],
         })
       rescue ChefZero::Solr::ParseError
         bad_search_request(request)
@@ -52,53 +52,55 @@ module ChefZero
       private
 
       def bad_search_request(request)
-        query_string = request.query_params['q']
-        resp = {"error" => ["invalid search query: '#{query_string}'"]}
+        query_string = request.query_params["q"]
+        resp = { "error" => ["invalid search query: '#{query_string}'"] }
         json_response(400, resp)
       end
 
       def search_container(request, index, orgname)
-        relative_parts, normalize_proc = case index
-        when 'client'
-          [ ['clients'], Proc.new { |client, name| ChefData::DataNormalizer.normalize_client(client, name, orgname) } ]
-        when 'node'
-          [ ['nodes'], Proc.new { |node, name| ChefData::DataNormalizer.normalize_node(node, name) } ]
-        when 'environment'
-          [ ['environments'], Proc.new { |environment, name| ChefData::DataNormalizer.normalize_environment(environment, name) } ]
-        when 'role'
-          [ ['roles'], Proc.new { |role, name| ChefData::DataNormalizer.normalize_role(role, name) } ]
-        else
-          [ ['data', index], Proc.new { |data_bag_item, id| ChefData::DataNormalizer.normalize_data_bag_item(data_bag_item, index, id, 'DELETE') } ]
-        end
+        relative_parts, normalize_proc =
+          case index
+          when "client"
+            [ ["clients"], Proc.new { |client, name| ChefData::DataNormalizer.normalize_client(client, name, orgname) } ]
+          when "node"
+            [ ["nodes"], Proc.new { |node, name| ChefData::DataNormalizer.normalize_node(node, name) } ]
+          when "environment"
+            [ ["environments"], Proc.new { |environment, name| ChefData::DataNormalizer.normalize_environment(environment, name) } ]
+          when "role"
+            [ ["roles"], Proc.new { |role, name| ChefData::DataNormalizer.normalize_role(role, name) } ]
+          else
+            [ ["data", index], Proc.new { |data_bag_item, id| ChefData::DataNormalizer.normalize_data_bag_item(data_bag_item, index, id, "DELETE") } ]
+          end
+
         [
           request.rest_path[0..1] + relative_parts,
-          normalize_proc
+          normalize_proc,
         ]
       end
 
       def expand_for_indexing(value, index, id)
-        if index == 'node'
+        if index == "node"
           result = {}
-          deep_merge!(value['default'] || {}, result)
-          deep_merge!(value['normal'] || {}, result)
-          deep_merge!(value['override'] || {}, result)
-          deep_merge!(value['automatic'] || {}, result)
-          result['recipe'] = []
-          result['role'] = []
-          if value['run_list']
-            value['run_list'].each do |run_list_entry|
+          deep_merge!(value["default"] || {}, result)
+          deep_merge!(value["normal"] || {}, result)
+          deep_merge!(value["override"] || {}, result)
+          deep_merge!(value["automatic"] || {}, result)
+          result["recipe"] = []
+          result["role"] = []
+          if value["run_list"]
+            value["run_list"].each do |run_list_entry|
               if run_list_entry =~ /^(recipe|role)\[(.*)\]/
                 result[$1] << $2
               end
             end
           end
           value.each_pair do |key, value|
-            result[key] = value unless %w(default normal override automatic).include?(key)
+            result[key] = value unless %w{default normal override automatic}.include?(key)
           end
           result
 
-        elsif !%w(client environment role).include?(index)
-          ChefData::DataNormalizer.normalize_data_bag_item(value, index, id, 'GET')
+        elsif !%w{client environment role}.include?(index)
+          ChefData::DataNormalizer.normalize_data_bag_item(value, index, id, "GET")
         else
           value
         end
@@ -107,12 +109,12 @@ module ChefZero
       def search(request, orgname = nil)
         # Extract parameters
         index = request.rest_path[3]
-        query_string = request.query_params['q'] || '*:*'
+        query_string = request.query_params["q"] || "*:*"
         solr_query = ChefZero::Solr::SolrParser.new(query_string).parse
-        sort_string = request.query_params['sort']
-        start = request.query_params['start']
+        sort_string = request.query_params["sort"]
+        start = request.query_params["start"]
         start = start.to_i if start
-        rows = request.query_params['rows']
+        rows = request.query_params["rows"]
         rows = rows.to_i if rows
 
         # Get the search container
@@ -133,18 +135,18 @@ module ChefZero
         # Sort
         if sort_string
           sort_key, sort_order = sort_string.split(/\s+/, 2)
-          result = result.sort_by { |name,uri,value,search_value| ChefZero::Solr::SolrDoc.new(search_value, name)[sort_key] }
+          result = result.sort_by { |name, uri, value, search_value| ChefZero::Solr::SolrDoc.new(search_value, name)[sort_key] }
           result = result.reverse if sort_order == "DESC"
         end
 
         # Paginate
         if start
-          result = result[start..start+(rows||-1)]
+          result = result[start..start + (rows || -1)]
         end
         {
-          'rows' => result,
-          'start' => start || 0,
-          'total' => total
+          "rows" => result,
+          "start" => start || 0,
+          "total" => total,
         }
       end
 

data/lib/chef_zero/endpoints/searches_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/rest_base'
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -7,7 +7,7 @@ module ChefZero
       def get(request)
         # Get the result
         result_hash = {}
-        indices = (%w(client environment node role) + data_store.list(request.rest_path[0..1] + ['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/endpoints/server_api_version_endpoint.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/rest_base'
+require "chef_zero/rest_base"
 
 module ChefZero
   module Endpoints
@@ -6,7 +6,7 @@ module ChefZero
     class ServerAPIVersionEndpoint < RestBase
       API_VERSION = 1
       def get(request)
-        json_response(200, {"min_api_version"=>MIN_API_VERSION, "max_api_version"=>MAX_API_VERSION},
+        json_response(200, { "min_api_version" => MIN_API_VERSION, "max_api_version" => MAX_API_VERSION },
           request_version: request.api_version, response_version: API_VERSION)
       end
     end

data/lib/chef_zero/endpoints/system_recovery_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,19 +7,19 @@ module ChefZero
     class SystemRecoveryEndpoint < RestBase
       def post(request)
         request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        name = request_json['username']
-        password = request_json['password']
-        user = get_data(request, request.rest_path[0..-2] + ['users', name], :nil)
+        name = request_json["username"]
+        password = request_json["password"]
+        user = get_data(request, request.rest_path[0..-2] + ["users", name], :nil)
         if !user
           raise RestErrorResponse.new(403, "Nonexistent user")
         end
 
         user = FFI_Yajl::Parser.parse(user, :create_additions => false)
-        user = ChefData::DataNormalizer.normalize_user(user, name, [ 'username' ], server.options[:osc_compat])
-        if !user['recovery_authentication_enabled']
+        user = ChefData::DataNormalizer.normalize_user(user, name, [ "username" ], server.options[:osc_compat])
+        if !user["recovery_authentication_enabled"]
           raise RestErrorResponse.new(403, "Only users with recovery_authentication_enabled=true may use /system_recovery to log in")
         end
-        if user['password'] != password
+        if user["password"] != password
           raise RestErrorResponse.new(401, "Incorrect password")
         end
 

data/lib/chef_zero/endpoints/user_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
@@ -14,26 +14,26 @@ module ChefZero
         orgname = $1
 
         json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        association_request_path = [ 'organizations', orgname, 'association_requests', username ]
-        if json['response'] == 'accept'
-          users = get_data(request, [ 'organizations', orgname, 'groups', 'users' ])
+        association_request_path = [ "organizations", orgname, "association_requests", username ]
+        if json["response"] == "accept"
+          users = get_data(request, [ "organizations", orgname, "groups", "users" ])
           users = FFI_Yajl::Parser.parse(users, :create_additions => false)
 
           delete_data(request, association_request_path)
-          create_data(request, [ 'organizations', orgname, 'users' ], username, '{}')
+          create_data(request, [ "organizations", orgname, "users" ], username, "{}")
 
           # Add the user to the users group if it isn't already there
-          if !users['users'] || !users['users'].include?(username)
-            users['users'] ||= []
-            users['users'] |= [ username ]
-            set_data(request, [ 'organizations', orgname, 'groups', 'users' ], FFI_Yajl::Encoder.encode(users, :pretty => true))
+          if !users["users"] || !users["users"].include?(username)
+            users["users"] ||= []
+            users["users"] |= [ username ]
+            set_data(request, [ "organizations", orgname, "groups", "users" ], FFI_Yajl::Encoder.encode(users, :pretty => true))
           end
-        elsif json['response'] == 'reject'
+        elsif json["response"] == "reject"
           delete_data(request, association_request_path)
         else
           raise RestErrorResponse.new(400, "response parameter was missing or set to the wrong value (must be accept or reject)")
         end
-        json_response(200, { 'organization' => { 'name' => orgname } })
+        json_response(200, { "organization" => { "name" => orgname } })
       end
     end
   end

data/lib/chef_zero/endpoints/user_association_requests_count_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,8 +9,8 @@ module ChefZero
         get_data(request, request.rest_path[0..-3])
 
         username = request.rest_path[1]
-        result = list_data(request, [ 'organizations' ]).select do |org|
-          exists_data?(request, [ 'organizations', org, 'association_requests', username ])
+        result = list_data(request, [ "organizations" ]).select do |org|
+          exists_data?(request, [ "organizations", org, "association_requests", username ])
         end
         json_response(200, { "value" => result.size })
       end