chef-zero 13.0.0 → 13.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396ae8f8740ff30a19cf21a04cf020be332b9f9e
-  data.tar.gz: e9d0bab91a60b421e3e17b69488ff377777bdeb3
+  metadata.gz: f5d647a2d5e5efa6c92eb7c4285f529b35aef7a5
+  data.tar.gz: ec2f33f80f230f44228b24c3ea308918e823b7e3
 SHA512:
-  metadata.gz: a059d4ae5e327a1e9b1d6c1bfb1ba5a0585483935b3499c83167c580daf1fc7300ad378e236276a05555e4f9feb0629b40899f5ccfcc86aff09f7a4acefdf82d
-  data.tar.gz: 5a160f7e546ab7242335f0416ed2443d0d64c0d19547c26f1796cac9c4078c865b092e7172c221c8c180ac882b938c7af7d354f4af6b17bf473d3b323a899536
+  metadata.gz: cb417d730349ccd4d32e5bd4b87fdd1e0469118da5cc08d58604759b1f78069dd5a7fbbc65fa33189d1749002d36a4962773ec3d856bf1b4ef8b0b5709b5f09f
+  data.tar.gz: 6a0b06a288410ffad9f2f8af5f061964292f77a130c1b0c1f68fe0dab319bd1056c86c2a430a13dbd1203f55e3ea084b4bef5af1b46f32f28bc452317cdd91e3

data/Gemfile

@@ -15,7 +15,7 @@ group :development, :test do
   gem "chefstyle", "= 0.3.1"
 end
 
-gem "chef"
+gem "chef", "~> 13"
 
 if ENV["GEMFILE_MOD"]
   puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"

data/lib/chef_zero/endpoints/actors_endpoint.rb

@@ -13,7 +13,7 @@ module ChefZero
         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])
+          response[2] = filter("email", value, request, response[2], insensitive: true)
         end
 
         if request.query_params["verbose"]
@@ -83,18 +83,22 @@ module ChefZero
 
       private
 
-      def filter(key, value, request, resp)
+      def filter(key, value, request, resp, opts = {})
         results = parse_json(resp)
         new_results = {}
         results.each do |name, url|
           record = get_data(request, request.rest_path + [ name ], :nil)
           if record
             record = parse_json(record)
-            new_results[name] = url if record[key] == value
+            new_results[name] = url if record[key] && is_equal(record[key], value, opts[:insensitive])
           end
         end
         to_json(new_results)
       end
+
+      def is_equal(a, b, ignore_case)
+        ignore_case ? a.casecmp(b).zero? : a == b
+      end
     end
   end
 end

data/lib/chef_zero/endpoints/cookbooks_base.rb

@@ -23,6 +23,22 @@ module ChefZero
         results
       end
 
+      def format_universe_list(request, cookbooks_list)
+        results = {}
+        cookbooks_list.each do |name, versions|
+          results[name] ||= {}
+          versions.each do |version|
+            cookbook_data = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + [ "cookbooks", name, version ], :nil))
+            results[name][version] ||= {
+              "dependencies" => cookbook_data["metadata"]["dependencies"],
+              "location_path" => build_uri(request.base_uri, request.rest_path[0..1] + ["cookbooks", name, version]),
+              "location_type" => "chef_server",
+            }
+          end
+        end
+        results
+      end
+
       def all_cookbooks_list(request)
         result = {}
         # Race conditions exist here (if someone deletes while listing).  I don't care.

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -20,6 +20,10 @@ module ChefZero
         super(request)
       end
 
+      def head(request)
+        head_request(request)
+      end
+
       def populate_defaults(request, response_json)
         node = FFI_Yajl::Parser.parse(response_json)
         node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])

data/lib/chef_zero/endpoints/universe_endpoint.rb

@@ -0,0 +1,15 @@
+require "ffi_yajl"
+require "chef_zero/endpoints/rest_object_endpoint"
+require "chef_zero/chef_data/data_normalizer"
+
+module ChefZero
+  module Endpoints
+    # /universe
+    class UniverseEndpoint < CookbooksBase
+
+      def get(request)
+        json_response(200, format_universe_list(request, all_cookbooks_list(request)))
+      end
+    end
+  end
+end

data/lib/chef_zero/rest_base.rb

@@ -231,6 +231,16 @@ module ChefZero
       [response_code, { "Content-Type" => "text/plain" }, text]
     end
 
+    # rfc090 returns 404 error or 200 with an emtpy body
+    # @param [ChefZero::RestRequest] request The HTTP request object
+    #
+    # @return (see #json_response)
+    #
+    def head_request(request)
+      get_data(request) # will raise 404 if non-existant
+      json_response(200, nil)
+    end
+
     # Returns an Array with the response code, HTTP headers, and JSON body.
     #
     # @param [Fixnum] response_code The HTTP response code

data/lib/chef_zero/server.rb

@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2012-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -105,6 +105,7 @@ require "chef_zero/endpoints/file_store_file_endpoint"
 require "chef_zero/endpoints/not_found_endpoint"
 require "chef_zero/endpoints/version_endpoint"
 require "chef_zero/endpoints/server_api_version_endpoint"
+require "chef_zero/endpoints/universe_endpoint"
 
 module ChefZero
 
@@ -623,6 +624,7 @@ module ChefZero
         [ "/organizations/*/sandboxes/*", SandboxEndpoint.new(self) ],
         [ "/organizations/*/search", SearchesEndpoint.new(self) ],
         [ "/organizations/*/search/*", SearchEndpoint.new(self) ],
+        [ "/organizations/*/universe", UniverseEndpoint.new(self) ],
         [ "/version", VersionEndpoint.new(self) ],
         [ "/server_api_version", ServerAPIVersionEndpoint.new(self) ],
 

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "13.0.0"
+  VERSION = "13.1.0"
 end

data/spec/run_oc_pedant.rb

@@ -130,12 +130,6 @@ begin
                       "--skip-organizations",
                       "--skip-multiuser",
                       "--skip-user-keys",
-
-                      # chef-zero has some non-removable quirks, such as the fact that files
-                      # with 255-character names cannot be stored in local mode. This is
-                      # reserved only for quirks that are *irrevocable* and by design; and
-                      # should barely be used at all.
-                      "--skip-chef-zero-quirks",
                     ]
                   else
                     []
@@ -167,6 +161,10 @@ begin
     # Chef Zero does not intend to support authorization the way erchef does.
     "--skip-authorization",
 
+    # Chef Zero does not intend to support oc_id authentication/authorization
+    # the way erchef does.
+    "--skip-oc_id",
+
     # Omnibus tests depend on erchef features that are specific to erchef and
     # bundled in the omnibus package. Currently the only test in this category
     # is for the search reindexing script.
@@ -181,8 +179,13 @@ begin
 
     # Chef 12 features not yet 100% supported by Chef Zero
 
-    # The universe endpoint is unlikely to ever make sense for Chef Zero
-    "--skip-universe",
+    # chef-zero has some non-removable quirks, such as the fact that files
+    # with 255-character names cannot be stored in local mode. This is
+    # reserved only for quirks that are *irrevocable* and by design; and
+    # should barely be used at all. This is also used to skip the user acl
+    # tests from chef-server as the user acls are not supported in chef-zero
+    # at this time.
+    "--skip-chef-zero-quirks",
   ]
 
   # The knife tests are very slow and don't give us a lot of extra coverage,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 13.1.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -253,6 +253,7 @@ files:
 - lib/chef_zero/endpoints/searches_endpoint.rb
 - lib/chef_zero/endpoints/server_api_version_endpoint.rb
 - lib/chef_zero/endpoints/system_recovery_endpoint.rb
+- lib/chef_zero/endpoints/universe_endpoint.rb
 - lib/chef_zero/endpoints/user_association_request_endpoint.rb
 - lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb
 - lib/chef_zero/endpoints/user_association_requests_endpoint.rb