chef 11.6.2 → 11.8.0.rc.1

data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb

@@ -18,6 +18,7 @@
 
 require 'chef/chef_fs/file_system/chef_repository_file_system_entry'
 require 'chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir'
+require 'chef/chef_fs/file_system/not_found_error'
 
 class Chef
   module ChefFS
@@ -33,10 +34,14 @@ class Chef
         attr_reader :recursive
 
         def children
-          Dir.entries(file_path).sort.
-              select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
-              map { |child_name| ChefRepositoryFileSystemCookbookEntry.new(child_name, self, nil, ruby_only, recursive) }.
-              select { |entry| !(entry.dir? && entry.children.size == 0) }
+          begin
+            Dir.entries(file_path).sort.
+                select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
+                map { |child_name| make_child(child_name) }.
+                select { |entry| !(entry.dir? && entry.children.size == 0) }
+          rescue Errno::ENOENT
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+          end
         end
 
         def can_have_child?(name, is_dir)
@@ -65,6 +70,16 @@ class Chef
 
           true
         end
+
+        def write_pretty_json
+          false
+        end
+
+        protected
+
+        def make_child(child_name)
+          ChefRepositoryFileSystemCookbookEntry.new(child_name, self, nil, ruby_only, recursive)
+        end
       end
     end
   end

data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb

@@ -26,29 +26,44 @@ class Chef
       class ChefRepositoryFileSystemCookbooksDir < ChefRepositoryFileSystemEntry
         def initialize(name, parent, file_path)
           super(name, parent, file_path)
-          @chefignore = Chef::Cookbook::Chefignore.new(self.file_path)
+          begin
+            @chefignore = Chef::Cookbook::Chefignore.new(self.file_path)
+          rescue Errno::EISDIR
+          rescue Errno::EACCES
+            # Work around a bug in Chefignore when chefignore is a directory
+          end
         end
 
         attr_reader :chefignore
 
         def children
-          Dir.entries(file_path).sort.
-              select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
-              map { |child_name| ChefRepositoryFileSystemCookbookDir.new(child_name, self) }.
-              select do |entry|
-                # empty cookbooks and cookbook directories are ignored
-                if entry.children.size == 0
-                  Chef::Log.warn("Cookbook '#{entry.name}' is empty or entirely chefignored at #{entry.path_for_printing}")
-                  false
-                else
-                  true
+          begin
+            Dir.entries(file_path).sort.
+                select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
+                map { |child_name| make_child(child_name) }.
+                select do |entry|
+                  # empty cookbooks and cookbook directories are ignored
+                  if entry.children.size == 0
+                    Chef::Log.warn("Cookbook '#{entry.name}' is empty or entirely chefignored at #{entry.path_for_printing}")
+                    false
+                  else
+                    true
+                  end
                 end
-              end
+          rescue Errno::ENOENT
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+          end
         end
 
         def can_have_child?(name, is_dir)
           is_dir && !name.start_with?('.')
         end
+
+        protected
+
+        def make_child(child_name)
+          ChefRepositoryFileSystemCookbookDir.new(child_name, self)
+        end
       end
     end
   end

data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb

@@ -18,6 +18,7 @@
 #
 
 require 'chef/chef_fs/file_system/file_system_entry'
+require 'chef/chef_fs/file_system/not_found_error'
 
 class Chef
   module ChefFS
@@ -30,6 +31,10 @@ class Chef
           @data_handler = data_handler
         end
 
+        def write_pretty_json
+          root.write_pretty_json
+        end
+
         def data_handler
           @data_handler || parent.data_handler
         end
@@ -47,13 +52,36 @@ class Chef
           !is_dir && name[-5..-1] == '.json'
         end
 
+        def write(file_contents)
+          if file_contents && write_pretty_json && name[-5..-1] == '.json'
+            file_contents = minimize(file_contents, self)
+          end
+          super(file_contents)
+        end
+
+        def minimize(file_contents, entry)
+          object = JSONCompat.from_json(file_contents, :create_additions => false)
+          object = data_handler.normalize(object, entry)
+          object = data_handler.minimize(object, entry)
+          JSONCompat.to_json_pretty(object)
+        end
+
         def children
           # Except cookbooks and data bag dirs, all things must be json files
-          Dir.entries(file_path).sort.
-              select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
-              map { |child_name| ChefRepositoryFileSystemEntry.new(child_name, self) }
+          begin
+            Dir.entries(file_path).sort.
+                select { |child_name| can_have_child?(child_name, File.directory?(File.join(file_path, child_name))) }.
+                map { |child_name| make_child(child_name) }
+          rescue Errno::ENOENT
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+          end
         end
 
+        protected
+
+        def make_child(child_name)
+          ChefRepositoryFileSystemEntry.new(child_name, self)
+        end
       end
     end
   end

data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb

@@ -18,6 +18,7 @@
 
 require 'chef/chef_fs/file_system/base_fs_dir'
 require 'chef/chef_fs/file_system/chef_repository_file_system_entry'
+require 'chef/chef_fs/file_system/chef_repository_file_system_acls_dir'
 require 'chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir'
 require 'chef/chef_fs/file_system/chef_repository_file_system_data_bags_dir'
 require 'chef/chef_fs/file_system/multiplexed_dir'
@@ -28,7 +29,6 @@ require 'chef/chef_fs/data_handler/role_data_handler'
 require 'chef/chef_fs/data_handler/user_data_handler'
 require 'chef/chef_fs/data_handler/group_data_handler'
 require 'chef/chef_fs/data_handler/container_data_handler'
-require 'chef/chef_fs/data_handler/acl_data_handler'
 
 class Chef
   module ChefFS
@@ -39,6 +39,8 @@ class Chef
           @child_paths = child_paths
         end
 
+        attr_accessor :write_pretty_json
+
         attr_reader :child_paths
 
         def children
@@ -51,9 +53,14 @@ class Chef
 
         def create_child(name, file_contents = nil)
           child_paths[name].each do |path|
-            Dir.mkdir(path)
+            begin
+              Dir.mkdir(path)
+            rescue Errno::EEXIST
+            end
           end
-          make_child_entry(name)
+          child = make_child_entry(name)
+          @children = nil
+          child
         end
 
         def json_class
@@ -90,6 +97,8 @@ class Chef
             dirs = paths.map { |path| ChefRepositoryFileSystemCookbooksDir.new(name, self, path) }
           elsif name == 'data_bags'
             dirs = paths.map { |path| ChefRepositoryFileSystemDataBagsDir.new(name, self, path) }
+          elsif name == 'acls'
+            dirs = paths.map { |path| ChefRepositoryFileSystemAclsDir.new(name, self, path) }
           else
             data_handler = case name
               when 'clients'
@@ -106,8 +115,6 @@ class Chef
                 Chef::ChefFS::DataHandler::GroupDataHandler.new
               when 'containers'
                 Chef::ChefFS::DataHandler::ContainerDataHandler.new
-              when 'acls'
-                Chef::ChefFS::DataHandler::AclDataHandler.new
               else
                 raise "Unknown top level path #{name}"
               end

data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'chef/server_api'
 require 'chef/chef_fs/file_system/acls_dir'
 require 'chef/chef_fs/file_system/base_fs_dir'
 require 'chef/chef_fs/file_system/rest_list_dir'
@@ -23,7 +24,6 @@ require 'chef/chef_fs/file_system/cookbooks_dir'
 require 'chef/chef_fs/file_system/data_bags_dir'
 require 'chef/chef_fs/file_system/nodes_dir'
 require 'chef/chef_fs/file_system/environments_dir'
-require 'chef/rest'
 require 'chef/chef_fs/data_handler/client_data_handler'
 require 'chef/chef_fs/data_handler/role_data_handler'
 require 'chef/chef_fs/data_handler/user_data_handler'
@@ -34,7 +34,7 @@ class Chef
   module ChefFS
     module FileSystem
       class ChefServerRootDir < BaseFSDir
-        def initialize(root_name, chef_config)
+        def initialize(root_name, chef_config, options = {})
           super("", nil)
           @chef_server_url = chef_config[:chef_server_url]
           @chef_username = chef_config[:node_name]
@@ -42,6 +42,7 @@ class Chef
           @environment = chef_config[:environment]
           @repo_mode = chef_config[:repo_mode]
           @root_name = root_name
+          @cookbook_version = options[:cookbook_version] # Used in knife diff and download for server cookbook version
         end
 
         attr_reader :chef_server_url
@@ -49,12 +50,21 @@ class Chef
         attr_reader :chef_private_key
         attr_reader :environment
         attr_reader :repo_mode
+        attr_reader :cookbook_version
 
         def fs_description
           "Chef server at #{chef_server_url} (user #{chef_username}), repo_mode = #{repo_mode}"
         end
 
         def rest
+          Chef::ServerAPI.new(chef_server_url, :client_name => chef_username, :signing_key_filename => chef_private_key, :raw_output => true)
+        end
+
+        def get_json(path)
+          Chef::ServerAPI.new(chef_server_url, :client_name => chef_username, :signing_key_filename => chef_private_key).get(path)
+        end
+
+        def chef_rest
           Chef::REST.new(chef_server_url, chef_username, chef_private_key)
         end
 

data/lib/chef/chef_fs/file_system/cookbook_dir.rb

@@ -41,6 +41,7 @@ class Chef
             end
           else
             @cookbook_name = name
+            @version = root.cookbook_version # nil unless --cookbook-version specified in download/diff
           end
         end
 
@@ -125,7 +126,7 @@ class Chef
         def delete(recurse)
           if recurse
             begin
-              rest.delete_rest(api_path)
+              rest.delete(api_path)
             rescue Timeout::Error => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:delete, self, e), "Timeout deleting: #{e}"
             rescue Net::HTTPServerException
@@ -190,7 +191,7 @@ class Chef
             old_retry_count = Chef::Config[:http_retry_count]
             begin
               Chef::Config[:http_retry_count] = 0
-              @chef_object ||= Chef::CookbookVersion.json_create(Chef::ChefFS::RawRequest.raw_json(rest, api_path))
+              @chef_object ||= Chef::CookbookVersion.json_create(root.get_json(api_path))
             ensure
               Chef::Config[:http_retry_count] = old_retry_count
             end

data/lib/chef/chef_fs/file_system/cookbook_file.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef/chef_fs/file_system/base_fs_object'
+require 'chef/http/simple'
 require 'digest/md5'
 
 class Chef
@@ -35,16 +36,12 @@ class Chef
         end
 
         def read
-          old_sign_on_redirect = rest.sign_on_redirect
-          rest.sign_on_redirect = false
           begin
-            tmpfile = rest.get_rest(file[:url], true)
+            tmpfile = rest.streaming_request(file[:url])
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e), "Timeout reading #{file[:url]}: #{e}"
           rescue Net::HTTPServerException => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e), "#{e.message} retrieving #{file[:url]}"
-          ensure
-            rest.sign_on_redirect = old_sign_on_redirect
           end
 
           begin

data/lib/chef/chef_fs/file_system/cookbooks_dir.rb

@@ -18,10 +18,10 @@
 
 require 'chef/chef_fs/file_system/rest_list_dir'
 require 'chef/chef_fs/file_system/cookbook_dir'
-require 'chef/chef_fs/raw_request'
 require 'chef/chef_fs/file_system/operation_failed_error'
 require 'chef/chef_fs/file_system/cookbook_frozen_error'
 require 'chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir'
+require 'chef/mixin/file_class'
 
 require 'tmpdir'
 
@@ -29,6 +29,9 @@ class Chef
   module ChefFS
     module FileSystem
       class CookbooksDir < RestListDir
+
+        include Chef::Mixin::FileClass
+
         def initialize(parent)
           super("cookbooks", parent)
         end
@@ -50,19 +53,20 @@ class Chef
           @children ||= begin
             if Chef::Config[:versioned_cookbooks]
               result = []
-              Chef::ChefFS::RawRequest.raw_json(rest, "#{api_path}/?num_versions=all").each_pair do |cookbook_name, cookbooks|
+              root.get_json("#{api_path}/?num_versions=all").each_pair do |cookbook_name, cookbooks|
                 cookbooks['versions'].each do |cookbook_version|
                   result << CookbookDir.new("#{cookbook_name}-#{cookbook_version['version']}", self, :exists => true)
                 end
               end
             else
-              result = Chef::ChefFS::RawRequest.raw_json(rest, api_path).keys.map { |cookbook_name| CookbookDir.new(cookbook_name, self, :exists => true) }
+              result = root.get_json(api_path).keys.map { |cookbook_name| CookbookDir.new(cookbook_name, self, :exists => true) }
             end
             result.sort_by(&:name)
           end
         end
 
         def create_child_from(other, options = {})
+          @children = nil
           upload_cookbook_from(other, options)
         end
 
@@ -92,7 +96,7 @@ class Chef
             proxy_cookbook_path = "#{temp_cookbooks_path}/#{cookbook_name}"
 
             # Make a symlink
-            File.symlink other.file_path, proxy_cookbook_path
+            file_class.symlink other.file_path, proxy_cookbook_path
 
             # Instantiate a proxy loader using the temporary symlink
             proxy_loader = Chef::Cookbook::CookbookVersionLoader.new(proxy_cookbook_path, other.parent.chefignore)
@@ -102,18 +106,29 @@ class Chef
             cookbook_to_upload.freeze_version if options[:freeze]
 
             # Instantiate a new uploader based on the proxy loader
-            uploader = Chef::CookbookUploader.new(cookbook_to_upload, proxy_cookbook_path, :force => options[:force], :rest => rest)
+            uploader = Chef::CookbookUploader.new(cookbook_to_upload, proxy_cookbook_path, :force => options[:force], :rest => root.chef_rest)
 
             with_actual_cookbooks_dir(temp_cookbooks_path) do
               upload_cookbook!(uploader)
             end
+
+            #
+            # When the temporary directory is being deleted on
+            # windows, the contents of the symlink under that
+            # directory is also deleted. So explicitly remove
+            # the symlink without removing the original contents if we
+            # are running on windows
+            #
+            if Chef::Platform.windows?
+              Dir.rmdir proxy_cookbook_path
+            end
           end
         end
 
         def upload_unversioned_cookbook(other, options)
           cookbook_to_upload = other.chef_object
           cookbook_to_upload.freeze_version if options[:freeze]
-          uploader = Chef::CookbookUploader.new(cookbook_to_upload, other.parent.file_path, :force => options[:force], :rest => rest)
+          uploader = Chef::CookbookUploader.new(cookbook_to_upload, other.parent.file_path, :force => options[:force], :rest => root.chef_rest)
 
           with_actual_cookbooks_dir(other.parent.file_path) do
             upload_cookbook!(uploader)

data/lib/chef/chef_fs/file_system/data_bag_dir.rb

@@ -52,7 +52,7 @@ class Chef
             raise MustDeleteRecursivelyError.new(self), "#{path_for_printing} must be deleted recursively"
           end
           begin
-            rest.delete_rest(api_path)
+            rest.delete(api_path)
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:delete, self, e), "Timeout deleting: #{e}"
           rescue Net::HTTPServerException => e

data/lib/chef/chef_fs/file_system/data_bags_dir.rb

@@ -34,7 +34,7 @@ class Chef
 
         def children
           begin
-            @children ||= Chef::ChefFS::RawRequest.raw_json(rest, api_path).keys.sort.map do |entry|
+            @children ||= root.get_json(api_path).keys.sort.map do |entry|
               DataBagDir.new(entry, self, true)
             end
           rescue Timeout::Error => e
@@ -54,7 +54,7 @@ class Chef
 
         def create_child(name, file_contents)
           begin
-            rest.post_rest(api_path, { 'name' => name })
+            rest.post(api_path, { 'name' => name })
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "Timeout creating child '#{name}': #{e}"
           rescue Net::HTTPServerException => e
@@ -64,6 +64,7 @@ class Chef
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "HTTP error creating child '#{name}': #{e}"
             end
           end
+          @children = nil
           DataBagDir.new(name, self, true)
         end
       end

data/lib/chef/chef_fs/file_system/file_system_entry.rb

@@ -40,20 +40,24 @@ class Chef
 
         def children
           begin
-            @children ||= Dir.entries(file_path).sort.select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) }
+            Dir.entries(file_path).sort.select { |entry| entry != '.' && entry != '..' }.map { |entry| make_child(entry) }
           rescue Errno::ENOENT
             raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
           end
         end
 
         def create_child(child_name, file_contents=nil)
-          result = FileSystemEntry.new(child_name, self)
+          child = make_child(child_name)
           if file_contents
-            result.write(file_contents)
+            child.write(file_contents)
           else
-            Dir.mkdir(result.file_path)
+            begin
+              Dir.mkdir(child.file_path)
+            rescue Errno::EEXIST
+            end
           end
-          result
+          @children = nil
+          child
         end
 
         def dir?
@@ -84,6 +88,12 @@ class Chef
             file.write(content)
           end
         end
+
+        protected
+
+        def make_child(child_name)
+          FileSystemEntry.new(child_name, self)
+        end
       end
     end
   end