chef-zero 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d28e6a6bda690839d80bd54dce06e9e4bf320fe
-  data.tar.gz: 1858dce1cfdb1a48af5104b29352937ac9fb6138
+  metadata.gz: b00b9dd1a0418e42c1982b8724f0f37f636d8370
+  data.tar.gz: eae57d6dae04d8e748f2d4d11f880c50263d3cf3
 SHA512:
-  metadata.gz: 47705c89adc13d890d9d2454ad3fb4c0d1d451f57a91a593d4c5a31c29b94f06026abc93dbf8a1e73f2931c592833f80e853d6e86cb8a3c22f6e0da13ed1b13c
-  data.tar.gz: 6ae3097039e28c17ceded5a7811b8179c33392c22650450936225e6c81c2af343aceafa75c662862f9565b9f9718d87bf126ac8e4b50124b4de96e761c040338
+  metadata.gz: 3ceb0e894eb2bf6a7d72eed6817d6fe472f7540d8eb78d677f9b0df327ce219a4d3d996017bcf19c5129fc477bf2a18f96ef24e2248bbbbc4c6343ee910cc1af
+  data.tar.gz: be1e03b074776f923a76a81dfdc031f87de2491488e8fbc6f01a47d4e8dcf22c619b6ec2ae07b9630f9a9c88564fa9227cbdd0b526fb0f07523f92f427bd4523

data/lib/chef_zero/endpoints/{cookbook_artifacts_cookbook_endpoint.rb → cookbook_artifact_endpoint.rb}

@@ -2,7 +2,7 @@ require 'chef_zero/chef_data/data_normalizer'
 
 module ChefZero
   module Endpoints
-    class CookbookArtifactsCookbookEndpoint < RestBase
+    class CookbookArtifactEndpoint < RestBase
       # GET /organizations/ORG/cookbook_artifacts/COOKBOOK
       def get(request)
         cookbook_name = request.rest_path.last

data/lib/chef_zero/endpoints/{cookbook_artifacts_cookbook_identifier.rb → cookbook_artifact_identifier_endpoint.rb}

@@ -2,7 +2,7 @@ require 'chef_zero/chef_data/data_normalizer'
 
 module ChefZero
   module Endpoints
-    class CookbookArtifactsCookbookIdentifierEndpoint < ChefZero::Endpoints::CookbookVersionEndpoint
+    class CookbookArtifactIdentifierEndpoint < ChefZero::Endpoints::CookbookVersionEndpoint
       # these endpoints are almost, but not quite, not entirely unlike the corresponding /cookbooks endpoints.
       # it could all be refactored for maximum reuse, but they're short REST methods with well-defined
       # behavioral specs (pedant), so there's not a huge benefit.
@@ -32,13 +32,14 @@ module ChefZero
           delete_data(request)
 
           # go through the recipes and delete stuff in the file store.
-          hoover_unused_checksums(get_checksums(doomed_cookbook_json), request, 'cookbook_artifacts')
+          hoover_unused_checksums(get_checksums(doomed_cookbook_json), request)
 
           # if this was the last revision, delete the directory so future requests will 404, instead of
           # returning 200 with an empty list.
-          artifact_path = request.rest_path[0..-2]
-          if list_data(request, artifact_path).size == 0
-            delete_data_dir(request, artifact_path)
+          # Last one out turns out the lights: delete /organizations/ORG/cookbooks/COOKBOOK if it no longer has versions
+          cookbook_path = request.rest_path[0..3]
+          if exists_data_dir?(request, cookbook_path) && list_data(request, cookbook_path).size == 0
+            delete_data_dir(request, cookbook_path)
           end
 
           json_response(200, identified_cookbook_data)

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -58,8 +58,8 @@ module ChefZero
         deleted_cookbook = get_data(request)
 
         response = super(request)
-        cookbook_name = request.rest_path[3]
-        cookbook_path = request.rest_path[0..1] + ['cookbooks', cookbook_name]
+        # Last one out turns out the lights: delete /organizations/ORG/cookbooks/NAME if it no longer has versions
+        cookbook_path = request.rest_path[0..3]
         if exists_data_dir?(request, cookbook_path) && list_data(request, cookbook_path).size == 0
           delete_data_dir(request, cookbook_path)
         end
@@ -85,11 +85,20 @@ module ChefZero
 
       private
 
-      def hoover_unused_checksums(deleted_checksums, request, data_type='cookbooks')
-        data_store.list(request.rest_path[0..1] + [data_type]).each do |cookbook_name|
-          data_store.list(request.rest_path[0..1] + [data_type, cookbook_name]).each do |version|
-            cookbook = data_store.get(request.rest_path[0..1] + [data_type, cookbook_name, version], request)
-            deleted_checksums = deleted_checksums - get_checksums(cookbook)
+      def hoover_unused_checksums(deleted_checksums, request)
+        %w(cookbooks cookbook_artifacts).each do |cookbook_type|
+          begin
+            cookbooks = data_store.list(request.rest_path[0..1] + [cookbook_type])
+          rescue ChefZero::DataStore::DataNotFoundError
+            # Not all chef versions support cookbook_artifacts
+            raise unless cookbook_type == "cookbook_artifacts"
+            cookbooks = []
+          end
+          cookbooks.each do |cookbook_name|
+            data_store.list(request.rest_path[0..1] + [cookbook_type, cookbook_name]).each do |version|
+              cookbook = data_store.get(request.rest_path[0..1] + [cookbook_type, cookbook_name, version], request)
+              deleted_checksums = deleted_checksums - get_checksums(cookbook)
+            end
           end
         end
         deleted_checksums.each do |checksum|

data/lib/chef_zero/server.rb

@@ -45,9 +45,9 @@ require 'chef_zero/endpoints/actor_endpoint'
 require 'chef_zero/endpoints/cookbooks_endpoint'
 require 'chef_zero/endpoints/cookbook_endpoint'
 require 'chef_zero/endpoints/cookbook_version_endpoint'
-require 'chef_zero/endpoints/cookbook_artifacts_cookbook_endpoint'
-require 'chef_zero/endpoints/cookbook_artifacts_cookbook_identifier'
 require 'chef_zero/endpoints/cookbook_artifacts_endpoint'
+require 'chef_zero/endpoints/cookbook_artifact_endpoint'
+require 'chef_zero/endpoints/cookbook_artifact_identifier_endpoint'
 require 'chef_zero/endpoints/containers_endpoint'
 require 'chef_zero/endpoints/container_endpoint'
 require 'chef_zero/endpoints/dummy_endpoint'
@@ -567,8 +567,8 @@ module ChefZero
         [ "/organizations/*/cookbooks/*", CookbookEndpoint.new(self) ],
         [ "/organizations/*/cookbooks/*/*", CookbookVersionEndpoint.new(self) ],
         [ "/organizations/*/cookbook_artifacts", CookbookArtifactsEndpoint.new(self) ],
-        [ "/organizations/*/cookbook_artifacts/*", CookbookArtifactsCookbookEndpoint.new(self) ],
-        [ "/organizations/*/cookbook_artifacts/*/*", CookbookArtifactsCookbookIdentifierEndpoint.new(self) ],
+        [ "/organizations/*/cookbook_artifacts/*", CookbookArtifactEndpoint.new(self) ],
+        [ "/organizations/*/cookbook_artifacts/*/*", CookbookArtifactIdentifierEndpoint.new(self) ],
         [ "/organizations/*/data", DataBagsEndpoint.new(self) ],
         [ "/organizations/*/data/*", DataBagEndpoint.new(self) ],
         [ "/organizations/*/data/*/*", DataBagItemEndpoint.new(self) ],

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.4.1'
+  VERSION = '4.4.2'
 end

data/spec/run_oc_pedant.rb

@@ -98,13 +98,28 @@ begin
     '--skip-keys',
     '--skip-controls',
     '--skip-acl',
+    '--skip-headers',
+
+    # Chef Zero does not intend to support validation the way erchef does.
     '--skip-validation',
+
+    # Chef Zero does not intend to support authentication the way erchef does.
     '--skip-authentication',
+
+    # Chef Zero does not intend to support authorization the way erchef does.
     '--skip-authorization',
+
+    # 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.
     '--skip-omnibus',
+
+    # USAGs (user-specific association groups) are Authz groups that contain
+    # only one user and represent that user's association with an org. Though
+    # there are good reasons for them, they don't work well in practice and
+    # only the manage console really uses them. Since Chef Zero + Manage is a
+    # quite unusual configuration, we're ignoring them.
     '--skip-usags',
-    '--exclude-internal-orgs',
-    '--skip-headers',
 
     # Chef 12 features not yet 100% supported by Chef Zero
     '--skip-containers',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -207,8 +207,8 @@ files:
 - lib/chef_zero/endpoints/authenticate_user_endpoint.rb
 - lib/chef_zero/endpoints/container_endpoint.rb
 - lib/chef_zero/endpoints/containers_endpoint.rb
-- lib/chef_zero/endpoints/cookbook_artifacts_cookbook_endpoint.rb
-- lib/chef_zero/endpoints/cookbook_artifacts_cookbook_identifier.rb
+- lib/chef_zero/endpoints/cookbook_artifact_endpoint.rb
+- lib/chef_zero/endpoints/cookbook_artifact_identifier_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_version_endpoint.rb