chef 12.6.0-universal-mingw32 → 12.7.2-universal-mingw32

data/lib/chef/chef_class.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,10 +26,10 @@
 # injected" into this class by other objects and do not reference the class symbols in those files
 # directly and we do not need to require those files here.
 
-require 'chef/platform/provider_priority_map'
-require 'chef/platform/resource_priority_map'
-require 'chef/platform/provider_handler_map'
-require 'chef/platform/resource_handler_map'
+require "chef/platform/provider_priority_map"
+require "chef/platform/resource_priority_map"
+require "chef/platform/provider_handler_map"
+require "chef/platform/resource_handler_map"
 
 class Chef
   class << self
@@ -56,7 +56,7 @@ class Chef
     #
     # @return[Chef::EventDispatch::Base] handler object
     def event_handler(&block)
-      dsl = Chef::EventDispatch::DSL.new('Chef client DSL')
+      dsl = Chef::EventDispatch::DSL.new("Chef client DSL")
       dsl.instance_eval(&block)
     end
 
@@ -178,14 +178,17 @@ class Chef
       # these slurp in the resource+provider world, so be exceedingly lazy about requiring them
       @provider_priority_map ||= Chef::Platform::ProviderPriorityMap.instance
     end
+
     # @api private
     def resource_priority_map
       @resource_priority_map ||= Chef::Platform::ResourcePriorityMap.instance
     end
+
     # @api private
     def provider_handler_map
       @provider_handler_map ||= Chef::Platform::ProviderHandlerMap.instance
     end
+
     # @api private
     def resource_handler_map
       @resource_handler_map ||= Chef::Platform::ResourceHandlerMap.instance
@@ -204,7 +207,7 @@ class Chef
     #
     # @api private this will likely be removed in favor of an as-yet unwritten
     #      `Chef.log`
-    def log_deprecation(message, location=nil)
+    def log_deprecation(message, location = nil)
       location ||= Chef::Log.caller_location
       # `run_context.events` is the primary deprecation target if we're in a
       # run. If we are not yet in a run, print to `Chef::Log`.

data/lib/chef/chef_fs.rb

@@ -1,4 +1,54 @@
-require 'chef/platform'
+require "chef/platform"
+
+#
+# ChefFS was designed to be a near-1:1 translation between Chef server endpoints
+# and local data, so that it could be used for:
+#
+# 1. User editing, diffing and viewing of server content locally
+# 2. knife download, upload and diff (supporting the above scenario)
+# 3. chef-client -z (serving user repository directly)
+#
+# This is the translation between chef-zero data stores (which correspond
+# closely to server endpoints) and the ChefFS repository format.
+#
+# |-----------------------------------|-----------------------------------|
+# | chef-zero DataStore               | ChefFS (repository)               |
+# |-----------------------------------|-----------------------------------|
+# | <root>                            | org.json                          |
+# | association_requests/NAME         | invitations.json                  |
+# | clients/NAME                      | clients/NAME.json                 |
+# | cookbooks/NAME/VERSION            | cookbooks/NAME/metadata.rb        |
+# | containers/NAME                   | containers/NAME.json              |
+# | data/BAG/ITEM                     | data_bags/BAG/ITEM.json           |
+# | environments/NAME                 | environments/NAME.json            |
+# | groups/NAME                       | groups/NAME.json                  |
+# | nodes/NAME                        | nodes/NAME.json                   |
+# | policies/NAME/REVISION            | policies/NAME-REVISION.json       |
+# | policy_groups/NAME/policies/PNAME | policy_groups/NAME.json           |
+# | roles/NAME                        | roles/NAME.json                   |
+# | sandboxes/ID                      | <not stored on disk, just memory> |
+# | users/NAME                        | members.json                      |
+# | file_store/COOKBOOK/VERSION/PATH  | cookbooks/COOKBOOK/PATH           |
+# | **/_acl                           | acls/**.json                      |
+# |-----------------------------------|-----------------------------------|
+#
+#
+# ## The Code
+#
+# There are two main entry points to ChefFS:
+#
+# - ChefServerRootDir represents the chef server (under an org) and surfaces a
+#   filesystem-like interface (FSBaseObject / FSBaseDir) that maps the REST API
+#   to the same format as you would have on disk.
+# - ChefRepositoryFileSystemRootDir represents the local repository where you
+#   put your cookbooks, roles, policies, etc.
+#
+# Because these two map to a common directory structure, diff, upload, download,
+# and other filesystem operations, can easily be done in a generic manner.
+#
+# These are instantiated by Chef::ChefFS::Config's `chef_fs` and `local_fs`
+# methods.
+#
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,15 +16,15 @@
 # limitations under the License.
 #
 
-require 'chef/cookbook_manifest'
-require 'chef_zero/data_store/memory_store'
-require 'chef_zero/data_store/data_already_exists_error'
-require 'chef_zero/data_store/data_not_found_error'
-require 'chef/chef_fs/file_pattern'
-require 'chef/chef_fs/file_system'
-require 'chef/chef_fs/file_system/not_found_error'
-require 'chef/chef_fs/file_system/memory_root'
-require 'fileutils'
+require "chef/cookbook_manifest"
+require "chef_zero/data_store/memory_store"
+require "chef_zero/data_store/data_already_exists_error"
+require "chef_zero/data_store/data_not_found_error"
+require "chef/chef_fs/file_pattern"
+require "chef/chef_fs/file_system"
+require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/memory/memory_root"
+require "fileutils"
 
 class Chef
   module ChefFS
@@ -126,6 +126,24 @@ class Chef
     #    - `delete(association_requests/NAME)` -> `get(/invitations.json)`, remove name, `set(/invitations.json)`
     #
     class ChefFSDataStore
+
+      # The base directories in a Chef Repo; even when these don't exist, a
+      # matching GET for these objects will return an empty list instead of a
+      # 404.
+      BASE_DIRNAMES = %w{
+        clients
+        cookbooks
+        data
+        environments
+        nodes
+        roles
+        users
+        containers
+        groups
+        policy_groups
+        policies
+      }.freeze
+
       #
       # Create a new ChefFSDataStore
       #
@@ -136,7 +154,7 @@ class Chef
       #   Generally will be a +ChefFS::FileSystem::ChefRepositoryFileSystemRoot+
       #   object, created from +ChefFS::Config.local_fs+.
       #
-      def initialize(chef_fs, chef_config=Chef::Config)
+      def initialize(chef_fs, chef_config = Chef::Config)
         @chef_fs = chef_fs
         @memory_store = ChefZero::DataStore::MemoryStore.new
         @repo_mode = chef_config[:repo_mode]
@@ -153,9 +171,9 @@ class Chef
         if use_memory_store?(path)
           @memory_store.create_dir(path, name, *options)
         else
-          with_dir(path) do |parent|
+          with_parent_dir(path + [name], *options) do |parent, name|
             begin
-              parent.create_child(chef_fs_filename(path + [name]), nil)
+              parent.create_child(name, nil)
             rescue Chef::ChefFS::FileSystem::AlreadyExistsError => e
               raise ChefZero::DataStore::DataAlreadyExistsError.new(to_zero_path(e.entry), e)
             end
@@ -185,15 +203,28 @@ class Chef
         if use_memory_store?(path)
           @memory_store.create(path, name, data, *options)
 
-        elsif path[0] == 'cookbooks' && path.length == 2
+        elsif path[0] == "cookbooks" && path.length == 2
           # Do nothing.  The entry gets created when the cookbook is created.
 
+        # /policy_groups/GROUP/policies/NAME
+        elsif path[0] == "policy_groups" && path[2] == "policies"
+          # Just set or create the proper entry in the hash
+          update_json(to_chef_fs_path(path[0..1]), {}, *options) do |group|
+            if policies.has_key?(path[3])
+              raise ChefZero::DataStore::DataAlreadyExistsError.new(path, group)
+            end
+
+            group["policies"] ||= {}
+            group["policies"][path[3]] = { "revision_id" => Chef::JSONCompat.parse(data) }
+            group
+          end
+
         # create [/organizations/ORG]/users/NAME (with content '{}')
         # Manipulate the `members.json` file that contains a list of all users
-        elsif is_org? && path == [ 'users' ]
-          update_json('members.json', []) do |members|
+        elsif is_org? && path == [ "users" ]
+          update_json("members.json", [], *options) do |members|
             # Format of each entry: { "user": { "username": "jkeiser" } }
-            if members.any? { |member| member['user']['username'] == name }
+            if members.any? { |member| member["user"]["username"] == name }
               raise ChefZero::DataStore::DataAlreadyExistsError.new(path, entry)
             end
 
@@ -203,10 +234,10 @@ class Chef
 
         # create [/organizations/ORG]/association_requests/NAME (with content '{}')
         # Manipulate the `invitations.json` file that contains a list of all users
-        elsif is_org? && path == [ 'association_requests' ]
-          update_json('invitations.json', []) do |invitations|
+        elsif is_org? && path == [ "association_requests" ]
+          update_json("invitations.json", [], *options) do |invitations|
             # Format of each entry: { "id" => "jkeiser-chef", 'username' => 'jkeiser' }
-            if invitations.any? { |member| member['username'] == name }
+            if invitations.any? { |member| member["username"] == name }
               raise ChefZero::DataStore::DataAlreadyExistsError.new(path)
             end
 
@@ -219,9 +250,9 @@ class Chef
             raise "set only works with strings"
           end
 
-          with_dir(path) do |parent|
+          with_parent_dir(path + [name], *options) do |parent, name|
             begin
-              parent.create_child(chef_fs_filename(path + [name]), data)
+              parent.create_child(name, data)
             rescue Chef::ChefFS::FileSystem::AlreadyExistsError => e
               raise ChefZero::DataStore::DataAlreadyExistsError.new(to_zero_path(e.entry), e)
             end
@@ -229,72 +260,99 @@ class Chef
         end
       end
 
-      def get(path, request=nil)
+      def get(path, request = nil)
         if use_memory_store?(path)
           @memory_store.get(path)
 
-        elsif path[0] == 'file_store' && path[1] == 'repo'
-          entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path[2..-1].join('/'))
+        elsif path[0] == "file_store" && path[1] == "repo"
+          entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path[2..-1].join("/"))
           begin
             entry.read
           rescue Chef::ChefFS::FileSystem::NotFoundError => e
             raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
           end
 
+        # /policy_groups/NAME/policies/POLICYNAME: return the revision of the given policy
+        elsif path[0] == "policy_groups" && path[2] == "policies" && path.length == 4
+          # Just set or create the proper entry in the hash
+          policy_group = get_json(to_chef_fs_path(path[0..1]), {})
+          if !policy_group["policies"] || !policy_group["policies"][path[3]]
+            raise ChefZero::DataStore::DataNotFoundError.new(path, entry)
+          end
+          # The policy group looks like:
+          # {
+          #   "policies": {
+          #     "x": { "revision_id": "10" }
+          #   }
+          # }
+          Chef::JSONCompat.to_json_pretty(policy_group["policies"][path[3]]["revision_id"])
+
         # GET [/organizations/ORG]/users/NAME -> /users/NAME
         # Manipulates members.json
-        elsif is_org? && path[0] == 'users' && path.length == 2
-          if get_json('members.json', []).any? { |member| member['user']['username'] == path[1] }
-            '{}'
+        elsif is_org? && path[0] == "users" && path.length == 2
+          if get_json("members.json", []).any? { |member| member["user"]["username"] == path[1] }
+            "{}"
           else
             raise ChefZero::DataStore::DataNotFoundError.new(path)
           end
 
         # GET [/organizations/ORG]/association_requests/NAME -> /users/NAME
         # Manipulates invites.json
-        elsif is_org? && path[0] == 'association_requests' && path.length == 2
-          if get_json('invites.json', []).any? { |member| member['user']['username'] == path[1] }
-            '{}'
+        elsif is_org? && path[0] == "association_requests" && path.length == 2
+          if get_json("invites.json", []).any? { |member| member["user"]["username"] == path[1] }
+            "{}"
           else
             raise ChefZero::DataStore::DataNotFoundError.new(path)
           end
 
-        else
+        # GET /cookbooks/NAME/VERSION or /cookbook_artifacts/NAME/IDENTIFIER
+        elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 3
           with_entry(path) do |entry|
-            if path[0] == 'cookbooks' && path.length == 3
-              # get /cookbooks/NAME/version
-              result = nil
-              begin
-                result = Chef::CookbookManifest.new(entry.chef_object).to_hash
-              rescue Chef::ChefFS::FileSystem::NotFoundError => e
-                raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
-              end
+            cookbook_type = path[0]
+            result = nil
+            begin
+              result = Chef::CookbookManifest.new(entry.chef_object, policy_mode: cookbook_type == "cookbook_artifacts").to_hash
+            rescue Chef::ChefFS::FileSystem::NotFoundError => e
+              raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
+            end
 
-              result.each_pair do |key, value|
-                if value.is_a?(Array)
-                  value.each do |file|
-                    if file.is_a?(Hash) && file.has_key?('checksum')
-                      relative = ['file_store', 'repo', 'cookbooks']
-                      if chef_fs.versioned_cookbooks
-                        relative << "#{path[1]}-#{path[2]}"
-                      else
-                        relative << path[1]
-                      end
-                      relative = relative + file[:path].split('/')
-                      file['url'] = ChefZero::RestBase::build_uri(request.base_uri, relative)
+            result.each_pair do |key, value|
+              if value.is_a?(Array)
+                value.each do |file|
+                  if file.is_a?(Hash) && file.has_key?("checksum")
+                    relative = ["file_store", "repo", cookbook_type]
+                    if chef_fs.versioned_cookbooks || cookbook_type == "cookbook_artifacts"
+                      relative << "#{path[1]}-#{path[2]}"
+                    else
+                      relative << path[1]
                     end
+                    relative = relative + file[:path].split("/")
+                    file["url"] = ChefZero::RestBase::build_uri(request.base_uri, relative)
                   end
                 end
               end
-              Chef::JSONCompat.to_json_pretty(result)
+            end
 
-            else
-              begin
-                entry.read
-              rescue Chef::ChefFS::FileSystem::NotFoundError => e
-                raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
+            if cookbook_type == "cookbook_artifacts"
+              result["metadata"] = result["metadata"].to_hash
+              result["metadata"].delete_if do |key, value|
+                value == [] ||
+                  (value == {} && !%w{dependencies attributes recipes}.include?(key)) ||
+                  (value == "" && %w{source_url issues_url}.include?(key)) ||
+                  (value == false && key == "privacy")
               end
             end
+
+            Chef::JSONCompat.to_json_pretty(result)
+          end
+
+        else
+          with_entry(path) do |entry|
+            begin
+              entry.read
+            rescue Chef::ChefFS::FileSystem::NotFoundError => e
+              raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
+            end
           end
         end
       end
@@ -308,15 +366,25 @@ class Chef
           end
 
           # Write out the files!
-          if path[0] == 'cookbooks' && path.length == 3
+          if %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 3
             write_cookbook(path, data, *options)
+
+          # Handle /policy_groups/some_policy_group/policies/some_policy_name
+          elsif path[0] == "policy_groups" && path[2] == "policies" && path.length == 4
+            # Just set or create the proper entry in the hash
+            update_json(to_chef_fs_path(path[0..1]), {}, *options) do |group|
+              group["policies"] ||= {}
+              group["policies"][path[3]] = { "revision_id" => Chef::JSONCompat.parse(data) }
+              group
+            end
+
           else
-            with_dir(path[0..-2]) do |parent|
-              child = parent.child(chef_fs_filename(path))
+            with_parent_dir(path, *options) do |parent, name|
+              child = parent.child(name)
               if child.exists?
                 child.write(data)
               else
-                parent.create_child(chef_fs_filename(path), data)
+                parent.create_child(name, data)
               end
             end
           end
@@ -327,11 +395,21 @@ class Chef
         if use_memory_store?(path)
           @memory_store.delete(path)
 
+        # DELETE /policy_groups/GROUP/policies/POLICY
+        elsif path[0] == "policy_groups" && path[2] == "policies" && path.length == 4
+          update_json(to_chef_fs_path(path[0..1]), {}) do |group|
+            unless group["policies"] && group["policies"].has_key?(path[3])
+              raise ChefZero::DataStore::DataNotFoundError.new(path)
+            end
+            group["policies"].delete(path[3])
+            group
+          end
+
         # DELETE [/organizations/ORG]/users/NAME
         # Manipulates members.json
-        elsif is_org? && path[0] == 'users' && path.length == 2
-          update_json('members.json', []) do |members|
-            result = members.reject { |member| member['user']['username'] == path[1] }
+        elsif is_org? && path[0] == "users" && path.length == 2
+          update_json("members.json", []) do |members|
+            result = members.reject { |member| member["user"]["username"] == path[1] }
             if result.size == members.size
               raise ChefZero::DataStore::DataNotFoundError.new(path)
             end
@@ -340,9 +418,9 @@ class Chef
 
         # DELETE [/organizations/ORG]/users/NAME
         # Manipulates members.json
-        elsif is_org? && path[0] == 'association_requests' && path.length == 2
-          update_json('invitations.json', []) do |invitations|
-            result = invitations.reject { |invitation| invitation['username'] == path[1] }
+        elsif is_org? && path[0] == "association_requests" && path.length == 2
+          update_json("invitations.json", []) do |invitations|
+            result = invitations.reject { |invitation| invitation["username"] == path[1] }
             if result.size == invitations.size
               raise ChefZero::DataStore::DataNotFoundError.new(path)
             end
@@ -352,7 +430,7 @@ class Chef
         else
           with_entry(path) do |entry|
             begin
-              if path[0] == 'cookbooks' && path.length >= 3
+              if %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length >= 3
                 entry.delete(true)
               else
                 entry.delete(false)
@@ -367,6 +445,24 @@ class Chef
       def delete_dir(path, *options)
         if use_memory_store?(path)
           @memory_store.delete_dir(path, *options)
+
+        # DELETE /policies/POLICY
+        elsif path[0] == "policies" && path.length == 2
+          with_entry(path[0..0]) do |policies|
+            # /policies:
+            #   - a-1.0.0.json
+            #   - a-1.0.1.json
+            #   - b-2.0.0.json
+            found_policy = false
+            policies.children.each do |policy|
+              # We want to delete just the ones that == POLICY
+              next unless policy.name.rpartition("-")[0] == path[1]
+              policy.delete(false)
+              found_policy = true
+            end
+            raise ChefZero::DataStore::DataNotFoundError.new(path) if !found_policy
+          end
+
         else
           with_entry(path) do |entry|
             begin
@@ -382,10 +478,49 @@ class Chef
         if use_memory_store?(path)
           @memory_store.list(path)
 
-        elsif path[0] == 'cookbooks' && path.length == 1
+        # LIST /policies
+        elsif path == [ "policies" ]
+          with_entry([ path[0] ]) do |policies|
+            begin
+              policies.children.map { |policy| policy.name[0..-6].rpartition("-")[0] }.uniq
+            rescue Chef::ChefFS::FileSystem::NotFoundError
+              []
+            end
+          end
+
+        # LIST /policies/POLICY/revisions
+        elsif path[0] == "policies" && path[2] == "revisions" && path.length == 3
+          with_entry([ path[0] ]) do |policies|
+            # /policies:
+            #   - a-1.0.0.json
+            #   - a-1.0.1.json
+            #   - b-2.0.0.json
+            revisions = []
+            policies.children.each do |policy|
+              name, dash, revision = policy.name[0..-6].rpartition("-")
+              revisions << revision if name == path[1]
+            end
+            raise ChefZero::DataStore::DataNotFoundError.new(path) if revisions.empty?
+            revisions
+          end
+
+        elsif path[0] == "policy_groups" && path.length == 2
+          with_entry(path) do |entry|
+            [ "policies" ]
+          end
+
+        elsif path[0] == "policy_groups" && path[2] == "policies" && path.length == 3
+          with_entry(path[0..1]) do |entry|
+            policies = Chef::JSONCompat.parse(entry.read)["policies"] || {}
+            policies.keys
+          end
+
+        elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 1
           with_entry(path) do |entry|
             begin
-              if chef_fs.versioned_cookbooks
+              if path[0] == "cookbook_artifacts"
+                entry.children.map { |child| child.name.rpartition("-")[0] }.uniq
+              elsif chef_fs.versioned_cookbooks
                 # /cookbooks/name-version -> /cookbooks/name
                 entry.children.map { |child| split_name_version(child.name)[0] }.uniq
               else
@@ -397,13 +532,13 @@ class Chef
             end
           end
 
-        elsif path[0] == 'cookbooks' && path.length == 2
-          if chef_fs.versioned_cookbooks
-            result = with_entry([ 'cookbooks' ]) do |entry|
+        elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 2
+          if chef_fs.versioned_cookbooks || path[0] == "cookbook_artifacts"
+            result = with_entry([ path[0] ]) do |entry|
               # list /cookbooks/name = filter /cookbooks/name-version down to name
               entry.children.map { |child| split_name_version(child.name) }.
-                             select { |name, version| name == path[1] }.
-                             map { |name, version| version }
+              select { |name, version| name == path[1] }.
+              map { |name, version| version }
             end
             if result.empty?
               raise ChefZero::DataStore::DataNotFoundError.new(path)
@@ -416,7 +551,7 @@ class Chef
           end
 
         else
-          with_entry(path) do |entry|
+          result = with_entry(path) do |entry|
             begin
               entry.children.map { |c| zero_filename(c) }.sort
             rescue Chef::ChefFS::FileSystem::NotFoundError => e
@@ -428,12 +563,25 @@ class Chef
               end
             end
           end
+
+          # Older versions of chef-zero do not understand policies and cookbook_artifacts,
+          # don't give that stuff to them
+          if path == [] && ChefZero::VERSION.to_f < 4.4
+            result.reject! { |child| %w{policies policy_data cookbook_artifacts}.include?(child) }
+          end
+          result
         end
       end
 
       def exists?(path)
         if use_memory_store?(path)
           @memory_store.exists?(path)
+
+        # /policy_groups/NAME/policies/POLICYNAME
+        elsif path[0] == "policy_groups" && path[2] == "policies" && path.length == 4
+          group = get_json(to_chef_fs_path(path[0..1]), {})
+          group["policies"] && group["policies"].has_key?(path[3])
+
         else
           path_always_exists?(path) || Chef::ChefFS::FileSystem.resolve_path(chef_fs, to_chef_fs_path(path)).exists?
         end
@@ -442,8 +590,18 @@ class Chef
       def exists_dir?(path)
         if use_memory_store?(path)
           @memory_store.exists_dir?(path)
-        elsif path[0] == 'cookbooks' && path.length == 2
+
+        elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 2
+          list([ path[0] ]).include?(path[1])
+
+        # /policies/NAME
+        elsif path[0] == "policies" && path.length == 2
           list([ path[0] ]).include?(path[1])
+
+        # /policy_groups/NAME/policies
+        elsif path[0] == "policy_groups" && path[2] == "policies" && path.length == 3
+          exists_dir?(path[0..1])
+
         else
           Chef::ChefFS::FileSystem.resolve_path(chef_fs, to_chef_fs_path(path)).exists?
         end
@@ -452,34 +610,35 @@ class Chef
       private
 
       def use_memory_store?(path)
-        return path[0] == 'sandboxes' || path[0] == 'file_store' && path[1] == 'checksums' || path == [ 'environments', '_default' ]
+        return path[0] == "sandboxes" || path[0] == "file_store" && path[1] == "checksums" || path == [ "environments", "_default" ]
       end
 
       def write_cookbook(path, data, *options)
+        cookbook_type = path[0]
         if chef_fs.versioned_cookbooks
-          cookbook_path = File.join('cookbooks', "#{path[1]}-#{path[2]}")
+          cookbook_path = File.join(cookbook_type, "#{path[1]}-#{path[2]}")
         else
-          cookbook_path = File.join('cookbooks', path[1])
+          cookbook_path = File.join(cookbook_type, path[1])
         end
 
         # Create a little Chef::ChefFS memory filesystem with the data
-        cookbook_fs = Chef::ChefFS::FileSystem::MemoryRoot.new('uploading')
+        cookbook_fs = Chef::ChefFS::FileSystem::Memory::MemoryRoot.new("uploading")
         cookbook = Chef::JSONCompat.parse(data)
         cookbook.each_pair do |key, value|
           if value.is_a?(Array)
             value.each do |file|
-              if file.is_a?(Hash) && file.has_key?('checksum')
-                file_data = @memory_store.get(['file_store', 'checksums', file['checksum']])
-                cookbook_fs.add_file(File.join(cookbook_path, file['path']), file_data)
+              if file.is_a?(Hash) && file.has_key?("checksum")
+                file_data = @memory_store.get(["file_store", "checksums", file["checksum"]])
+                cookbook_fs.add_file(File.join(cookbook_path, file["path"]), file_data)
               end
             end
           end
         end
 
         # Create the .uploaded-cookbook-version.json
-        cookbooks = chef_fs.child('cookbooks')
+        cookbooks = chef_fs.child(cookbook_type)
         if !cookbooks.exists?
-          cookbooks = chef_fs.create_child('cookbooks')
+          cookbooks = chef_fs.create_child(cookbook_type)
         end
         # We are calling a cookbooks-specific API, so get multiplexed_dirs out of the way if it is there
         if cookbooks.respond_to?(:multiplexed_dirs)
@@ -489,14 +648,14 @@ class Chef
       end
 
       def split_name_version(entry_name)
-        name_version = entry_name.split('-')
-        name = name_version[0..-2].join('-')
+        name_version = entry_name.split("-")
+        name = name_version[0..-2].join("-")
         version = name_version[-1]
-        [name,version]
+        [name, version]
       end
 
       def to_chef_fs_path(path)
-        _to_chef_fs_path(path).join('/')
+        _to_chef_fs_path(path).join("/")
       end
 
       def chef_fs_filename(path)
@@ -504,27 +663,28 @@ class Chef
       end
 
       def _to_chef_fs_path(path)
-        if path[0] == 'data'
-          path = path.dup
-          path[0] = 'data_bags'
-          if path.length >= 3
-            path[2] = "#{path[2]}.json"
-          end
-        elsif path[0] == 'policies'
+        # /data -> /data_bags
+        # /data/BAG -> /data_bags/BAG
+        # /data/BAG/ITEM -> /data_bags/BAG/ITEM.json
+        if path[0] == "data"
           path = path.dup
+          path[0] = "data_bags"
           if path.length >= 3
             path[2] = "#{path[2]}.json"
           end
-        elsif path[0] == 'cookbooks'
+
+        # /policies/POLICY/revisions/REVISION -> /policies/POLICY-REVISION.json
+        elsif path[0] == "policies" && path[2] == "revisions" && path.length >= 4
+          path = [ "policies", "#{path[1]}-#{path[3]}.json" ]
+
+        elsif %w{cookbooks cookbook_artifacts}.include?(path[0])
           if path.length == 2
             raise ChefZero::DataStore::DataNotFoundError.new(path)
-          elsif chef_fs.versioned_cookbooks
-            if path.length >= 3
+          elsif path.length >= 3
+            if chef_fs.versioned_cookbooks || path[0] == "cookbook_artifacts"
               # cookbooks/name/version -> cookbooks/name-version
               path = [ path[0], "#{path[1]}-#{path[2]}" ] + path[3..-1]
-            end
-          else
-            if path.length >= 3
+            else
               # cookbooks/name/version/... -> /cookbooks/name/... iff metadata says so
               version = get_single_cookbook_version(path)
               if path[2] == version
@@ -535,10 +695,16 @@ class Chef
             end
           end
 
-        elsif path[0] == 'acls'
+        elsif path[0] == "acls"
+          # /acls/data -> /acls/data_bags
+          if path[1] == "data"
+            path = path.dup
+            path[1] = "data_bags"
+          end
+
           # /acls/containers|nodes|.../x.json
           # /acls/organization.json
-          if path.length == 3 || path == [ 'acls', 'organization' ]
+          if path.length == 3 || path == [ "acls", "organization" ]
             path = path.dup
             path[-1] = "#{path[-1]}.json"
           end
@@ -555,16 +721,16 @@ class Chef
       end
 
       def to_zero_path(entry)
-        path = entry.path.split('/')[1..-1]
-        if path[0] == 'data_bags'
+        path = entry.path.split("/")[1..-1]
+        if path[0] == "data_bags"
           path = path.dup
-          path[0] = 'data'
+          path[0] = "data"
           if path.length >= 3
             path[2] = path[2][0..-6]
           end
 
-        elsif path[0] == 'cookbooks'
-          if chef_fs.versioned_cookbooks
+        elsif %w{cookbooks cookbook_artifacts}.include?(path[0])
+          if chef_fs.versioned_cookbooks || path[0] == "cookbook_artifacts"
             # cookbooks/name-version/... -> cookbooks/name/version/...
             if path.length >= 2
               name, version = split_name_version(path[1])
@@ -578,7 +744,14 @@ class Chef
             end
           end
 
-        elsif path.length == 2 && path[0] != 'cookbooks'
+        # /policies/NAME-REVISION.json -> /policies/NAME/revisions/REVISION
+        elsif path[0] == "policies"
+          if path.length >= 2
+            name, dash, revision = path[1][0..-6].rpartition("-")
+            path = [ "policies", name, "revisions", revision ]
+          end
+
+        elsif path.length == 2 && path[0] != "cookbooks"
           path = path.dup
           path[1] = path[1][0..-6]
         end
@@ -590,7 +763,7 @@ class Chef
       end
 
       def path_always_exists?(path)
-        return path.length == 1 && %w(clients cookbooks data environments nodes roles users).include?(path[0])
+        return path.length == 1 && BASE_DIRNAMES.include?(path[0])
       end
 
       def with_entry(path)
@@ -601,9 +774,20 @@ class Chef
         end
       end
 
+      def with_parent_dir(path, *options)
+        path = _to_chef_fs_path(path)
+        begin
+          yield get_dir(path[0..-2], options.include?(:create_dir)), path[-1]
+        rescue Chef::ChefFS::FileSystem::NotFoundError => e
+          err = ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
+          err.set_backtrace(e.backtrace)
+          raise err
+        end
+      end
+
       def with_dir(path)
         # Do not automatically create data bags
-        create = !(path[0] == 'data' && path.size >= 2)
+        create = !(path[0] == "data" && path.size >= 2)
 
         begin
           yield get_dir(_to_chef_fs_path(path), create)
@@ -614,11 +798,11 @@ class Chef
         end
       end
 
-      def get_dir(path, create=false)
-        result = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path.join('/'))
+      def get_dir(path, create = false)
+        result = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path.join("/"))
         if result.exists?
           result
-        elsif create
+        elsif create || path.size == 1
           get_dir(path[0..-2], create).create_child(result.name, nil)
         else
           raise ChefZero::DataStore::DataNotFoundError.new(path)
@@ -626,21 +810,32 @@ class Chef
       end
 
       def get_single_cookbook_version(path)
-        dir = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path[0..1].join('/'))
+        dir = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path[0..1].join("/"))
         metadata = ChefZero::CookbookData.metadata_from(dir, path[1], nil, [])
-        metadata[:version] || '0.0.0'
+        metadata[:version] || "0.0.0"
       end
 
-      def update_json(path, default_value)
+      def update_json(path, default_value, *options)
         entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path)
         begin
           input = Chef::JSONCompat.parse(entry.read)
-          output = yield input.dup
-          entry.write(Chef::JSONCompat.to_json_pretty(output)) if output != input
+          output = yield input
+          entry.write(Chef::JSONCompat.to_json_pretty(output)) if output != Chef::JSONCompat.parse(entry.read)
         rescue Chef::ChefFS::FileSystem::NotFoundError
           # Send the default value to the caller, and create the entry if the caller updates it
           output = yield default_value
-          entry.parent.create_child(entry.name, Chef::JSONCompat.to_json_pretty(output)) if output != []
+          parent = entry.parent
+          parent = ensure_dir(parent) if options.include?(:create_dir)
+          parent.create_child(entry.name, Chef::JSONCompat.to_json_pretty(output)) if output != []
+        end
+      end
+
+      def ensure_dir(entry)
+        return entry if entry.exists?
+        parent = entry.parent
+        if parent
+          ensure_dir(parent)
+          parent.create_child(entry.name)
         end
       end
 
@@ -654,7 +849,7 @@ class Chef
       end
 
       def is_org?
-        repo_mode == 'hosted_everything'
+        repo_mode == "hosted_everything"
       end
     end
   end