chef 12.4.3-universal-mingw32 → 12.5.1-universal-mingw32

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

@@ -58,14 +58,7 @@ class Chef
         end
 
         def children
-          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
+          super.select { |entry| !(entry.dir? && entry.children.size == 0 ) }
         end
 
         def can_have_child?(name, is_dir)
@@ -99,7 +92,7 @@ class Chef
 
         protected
 
-        def make_child(child_name)
+        def make_child_entry(child_name)
           segment_info = CookbookDir::COOKBOOK_SEGMENT_INFO[child_name.to_sym] || {}
           ChefRepositoryFileSystemCookbookEntry.new(child_name, self, nil, segment_info[:ruby_only], segment_info[:recursive])
         end

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

@@ -34,14 +34,7 @@ class Chef
         attr_reader :recursive
 
         def children
-          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
+          super.select { |entry| !(entry.dir? && entry.children.size == 0 ) }
         end
 
         def can_have_child?(name, is_dir)
@@ -78,7 +71,7 @@ class Chef
 
         protected
 
-        def make_child(child_name)
+        def make_child_entry(child_name)
           ChefRepositoryFileSystemCookbookEntry.new(child_name, self, nil, ruby_only, recursive)
         end
       end

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

@@ -37,21 +37,14 @@ class Chef
         attr_reader :chefignore
 
         def children
-          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.can_upload?
-                    Chef::Log.warn("Cookbook '#{entry.name}' is empty or entirely chefignored at #{entry.path_for_printing}")
-                    false
-                  else
-                    true
-                  end
-                end
-          rescue Errno::ENOENT
-            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+          super.select do |entry|
+            # empty cookbooks and cookbook directories are ignored
+            if !entry.can_upload?
+              Chef::Log.warn("Cookbook '#{entry.name}' is empty or entirely chefignored at #{entry.path_for_printing}")
+              false
+            else
+              true
+            end
           end
         end
 
@@ -61,7 +54,7 @@ class Chef
 
         def write_cookbook(cookbook_path, cookbook_version_json, from_fs)
           cookbook_name = File.basename(cookbook_path)
-          child = make_child(cookbook_name)
+          child = make_child_entry(cookbook_name)
 
           # Use the copy/diff algorithm to copy it down so we don't destroy
           # chefignored data.  This is terribly un-thread-safe.
@@ -80,7 +73,7 @@ class Chef
 
         protected
 
-        def make_child(child_name)
+        def make_child_entry(child_name)
           ChefRepositoryFileSystemCookbookDir.new(child_name, self)
         end
       end

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

@@ -70,20 +70,9 @@ class Chef
           Chef::JSONCompat.to_json_pretty(object)
         end
 
-        def children
-          # Except cookbooks and data bag dirs, all things must be json files
-          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)
+        def make_child_entry(child_name)
           ChefRepositoryFileSystemEntry.new(child_name, self)
         end
       end

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

@@ -68,13 +68,13 @@ class Chef
         attr_reader :child_paths
         attr_reader :versioned_cookbooks
 
-        CHILDREN = %w(invitations.json members.json org.json)
+        CHILDREN = %w(org.json invitations.json members.json)
 
         def children
           @children ||= begin
-            result = child_paths.keys.sort.map { |name| make_child_entry(name) }.select { |child| !child.nil? }
-            result += root_dir.children.select { |c| CHILDREN.include?(c.name) } if root_dir
-            result.sort_by { |c| c.name }
+            result = child_paths.keys.sort.map { |name| make_child_entry(name) }
+            result += CHILDREN.map { |name| make_child_entry(name) }
+            result.select { |c| c && c.exists? }.sort_by { |c| c.name }
           end
         end
 
@@ -149,19 +149,23 @@ class Chef
         # cookbooks from all of them when you list or grab them).
         #
         def make_child_entry(name)
-          paths = child_paths[name].select do |path|
-            File.exists?(path)
+          if CHILDREN.include?(name)
+            return nil if !root_dir
+            return root_dir.child(name)
           end
+
+          paths = (child_paths[name] || []).select { |path| File.exists?(path) }
           if paths.size == 0
-            return nil
+            return NonexistentFSObject.new(name, self)
           end
-          if name == 'cookbooks'
+          case name
+          when 'cookbooks'
             dirs = paths.map { |path| ChefRepositoryFileSystemCookbooksDir.new(name, self, path) }
-          elsif name == 'data_bags'
+          when 'data_bags'
             dirs = paths.map { |path| ChefRepositoryFileSystemDataBagsDir.new(name, self, path) }
-          elsif name == 'policies'
+          when 'policies'
             dirs = paths.map { |path| ChefRepositoryFileSystemPoliciesDir.new(name, self, path) }
-          elsif name == 'acls'
+          when 'acls'
             dirs = paths.map { |path| ChefRepositoryFileSystemAclsDir.new(name, self, path) }
           else
             data_handler = case name

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

@@ -110,7 +110,8 @@ class Chef
         end
 
         def can_have_child?(name, is_dir)
-          is_dir && children.any? { |child| child.name == name }
+          result = children.select { |child| child.name == name }.first
+          result && !!result.dir? == !!is_dir
         end
 
         def org
@@ -119,11 +120,16 @@ class Chef
             if File.dirname(path) == '/organizations'
               File.basename(path)
             else
-              nil
+              # In Chef 12, everything is in an org.
+              'chef'
             end
           end
         end
 
+        def make_child_entry(name)
+          children.select { |child| child.name == name }.first
+        end
+
         def children
           @children ||= begin
             result = [

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

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'chef/chef_fs/command_line'
 require 'chef/chef_fs/file_system/rest_list_dir'
 require 'chef/chef_fs/file_system/cookbook_subdir'
 require 'chef/chef_fs/file_system/cookbook_file'
@@ -71,16 +72,15 @@ class Chef
           "#{parent.api_path}/#{cookbook_name}/#{version || "_latest"}"
         end
 
-        def child(name)
+        def make_child_entry(name)
           # Since we're ignoring the rules and doing a network request here,
           # we need to make sure we don't rethrow the exception.  (child(name)
           # is not supposed to fail.)
           begin
-            result = children.select { |child| child.name == name }.first
-            return result if result
+            children.select { |child| child.name == name }.first
           rescue Chef::ChefFS::FileSystem::NotFoundError
+            nil
           end
-          return NonexistentFSObject.new(name, self)
         end
 
         def can_have_child?(name, is_dir)

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

@@ -31,7 +31,7 @@ class Chef
         def children
           if @children.nil?
             names = parent.parent.child(name).children.map { |child| "#{child.cookbook_name}.json" }
-            @children = names.uniq.map { |name| AclEntry.new(name, self, true) }
+            @children = names.uniq.map { |name| make_child_entry(name, true) }
           end
           @children
         end

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

@@ -36,17 +36,9 @@ class Chef
           super("cookbooks", parent)
         end
 
-        def child(name)
-          if @children
-            result = self.children.select { |child| child.name == name }.first
-            if result
-              result
-            else
-              NonexistentFSObject.new(name, self)
-            end
-          else
-            CookbookDir.new(name, self)
-          end
+        def make_child_entry(name)
+          result = @children.select { |child| child.name == name }.first if @children
+          result || CookbookDir.new(name, self)
         end
 
         def children

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

@@ -27,16 +27,14 @@ class Chef
           super("data_bags", parent, "data")
         end
 
-        def child(name)
+        def make_child_entry(name, exists = false)
           result = @children.select { |child| child.name == name }.first if @children
-          result || DataBagDir.new(name, self)
+          result || DataBagDir.new(name, self, exists)
         end
 
         def children
           begin
-            @children ||= root.get_json(api_path).keys.sort.map do |entry|
-              DataBagDir.new(entry, self, true)
-            end
+            @children ||= root.get_json(api_path).keys.sort.map { |entry| make_child_entry(entry, true) }
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e), "Timeout getting children: #{e}"
           rescue Net::HTTPServerException => e

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

@@ -30,7 +30,7 @@ class Chef
           super("environments", parent, nil, Chef::ChefFS::DataHandler::EnvironmentDataHandler.new)
         end
 
-        def _make_child_entry(name, exists = nil)
+        def make_child_entry(name, exists = nil)
           if name == '_default.json'
             DefaultEnvironmentEntry.new(name, self, exists)
           else

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

@@ -40,15 +40,18 @@ class Chef
         end
 
         def children
+          # Except cookbooks and data bag dirs, all things must be json files
           begin
-            Dir.entries(file_path).sort.select { |entry| entry != '.' && entry != '..' }.map { |entry| make_child(entry) }
+            Dir.entries(file_path).sort.
+                map { |child_name| make_child_entry(child_name) }.
+                select { |child| child && can_have_child?(child.name, child.dir?) }
           rescue Errno::ENOENT
             raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
           end
         end
 
         def create_child(child_name, file_contents=nil)
-          child = make_child(child_name)
+          child = make_child_entry(child_name)
           if child.exists?
             raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, child)
           end
@@ -80,7 +83,7 @@ class Chef
         end
 
         def exists?
-          File.exists?(file_path)
+          File.exists?(file_path) && parent.can_have_child?(name, dir?)
         end
 
         def read
@@ -99,7 +102,7 @@ class Chef
 
         protected
 
-        def make_child(child_name)
+        def make_child_entry(child_name)
           FileSystemEntry.new(child_name, self)
         end
       end

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

@@ -1,5 +1,4 @@
 require 'chef/chef_fs/file_system/base_fs_dir'
-require 'chef/chef_fs/file_system/nonexistent_fs_object'
 require 'chef/chef_fs/file_system/memory_file'
 
 class Chef
@@ -13,8 +12,8 @@ class Chef
 
         attr_reader :children
 
-        def child(name)
-          @children.select { |child| child.name == name }.first || Chef::ChefFS::FileSystem::NonexistentFSObject.new(name, self)
+        def make_child_entry(name)
+          @children.select { |child| child.name == name }.first
         end
 
         def add_child(child)

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

@@ -35,6 +35,21 @@ class Chef
           end
         end
 
+        def make_child_entry(name)
+          result = nil
+          multiplexed_dirs.each do |dir|
+            child_entry = dir.child(name)
+            if child_entry.exists?
+              if result
+                Chef::Log.warn("Child with name '#{child_entry.name}' found in multiple directories: #{result.parent.path_for_printing} and #{child_entry.parent.path_for_printing}")
+              else
+                result = child_entry
+              end
+            end
+          end
+          result
+        end
+
         def can_have_child?(name, is_dir)
           write_dir.can_have_child?(name, is_dir)
         end

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

@@ -33,7 +33,7 @@ class Chef
         def children
           begin
             @children ||= root.get_json(env_api_path).keys.sort.map do |key|
-              _make_child_entry("#{key}.json", true)
+              make_child_entry("#{key}.json", true)
             end
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e), "Timeout retrieving children: #{e}"

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

@@ -39,9 +39,9 @@ class Chef
           members = minimize_value(_read_json)
           (desired_members - members).each do |member|
             begin
-              rest.post(File.join(api_path, member), {})
+              rest.post(api_path, 'username' => member)
             rescue Net::HTTPServerException => e
-              if e.response.code == '404'
+              if %w(404 405).include?(e.response.code)
                 raise "Chef server at #{api_path} does not allow you to directly add members.  Please either upgrade your Chef server or move the users you want into invitations.json instead of members.json."
               else
                 raise

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

@@ -33,12 +33,6 @@ class Chef
         attr_reader :api_path
         attr_reader :data_handler
 
-        def child(name)
-          result = @children.select { |child| child.name == name }.first if @children
-          result ||= can_have_child?(name, false) ?
-                     _make_child_entry(name) : NonexistentFSObject.new(name, self)
-        end
-
         def can_have_child?(name, is_dir)
           name =~ /\.json$/ && !is_dir
         end
@@ -46,7 +40,7 @@ class Chef
         def children
           begin
             @children ||= root.get_json(api_path).keys.sort.map do |key|
-              _make_child_entry("#{key}.json", true)
+              make_child_entry("#{key}.json", true)
             end
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e), "Timeout retrieving children: #{e}"
@@ -66,7 +60,7 @@ class Chef
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "Parse error reading JSON creating child '#{name}': #{e}"
           end
 
-          result = _make_child_entry(name, true)
+          result = make_child_entry(name, true)
 
           if data_handler
             object = data_handler.normalize_for_post(object, result)
@@ -106,7 +100,8 @@ class Chef
           parent.rest
         end
 
-        def _make_child_entry(name, exists = nil)
+        def make_child_entry(name, exists = nil)
+          @children.select { |child| child.name == name }.first if @children
           RestListEntry.new(name, self, exists)
         end
       end

data/lib/chef/chef_fs/knife.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef/knife'
+require 'pathname'
 
 class Chef
   module ChefFS
@@ -63,7 +64,7 @@ class Chef
         # --chef-repo-path forcibly overrides all other paths
         if config[:chef_repo_path]
           Chef::Config[:chef_repo_path] = config[:chef_repo_path]
-          %w(acl client cookbook container data_bag environment group node role user).each do |variable_name|
+          Chef::ChefFS::Config::INFLECTIONS.each_value do |variable_name|
             Chef::Config.delete("#{variable_name}_path".to_sym)
           end
         end
@@ -98,14 +99,41 @@ class Chef
       end
 
       def pattern_arg_from(arg)
-        # TODO support absolute file paths and not just patterns?  Too much?
-        # Could be super useful in a world with multiple repo paths
-        if !@chef_fs_config.base_path && !Chef::ChefFS::PathUtils.is_absolute?(arg)
-          # Check if chef repo path is specified to give a better error message
-          ui.error("Attempt to use relative path '#{arg}' when current directory is outside the repository path")
+        inferred_path = nil
+        if Chef::ChefFS::PathUtils.is_absolute?(arg)
+          # We should be able to use this as-is - but the user might have incorrectly provided
+          # us with a path that is based off of the OS root path instead of the Chef-FS root.
+          # Do a quick and dirty sanity check.
+          if possible_server_path = @chef_fs_config.server_path(arg)
+            ui.warn("The absolute path provided is suspicious: #{arg}")
+            ui.warn("If you wish to refer to a file location, please provide a path that is rooted at the chef-repo.")
+            ui.warn("Consider writing '#{possible_server_path}' instead of '#{arg}'")
+          end
+          # Use the original path because we can't be sure.
+          inferred_path = arg
+        elsif arg[0,1] == '~'
+          # Let's be nice and fix it if possible - but warn the user.
+          ui.warn("A path relative to a user home directory has been provided: #{arg}")
+          ui.warn("Paths provided need to be rooted at the chef-repo being considered or be relative paths.")
+          inferred_path = @chef_fs_config.server_path(arg)
+          ui.warn("Using '#{inferred_path}' as the path instead of '#{arg}'.")
+        elsif Pathname.new(arg).absolute?
+          # It is definitely a system absolute path (such as C:\ or \\foo\bar) but it cannot be
+          # interpreted as a Chef-FS absolute path.  Again attempt to be nice but warn the user.
+          ui.warn("An absolute file system path that isn't a server path was provided: #{arg}")
+          ui.warn("Paths provided need to be rooted at the chef-repo being considered or be relative paths.")
+          inferred_path = @chef_fs_config.server_path(arg)
+          ui.warn("Using '#{inferred_path}' as the path instead of '#{arg}'.")
+        elsif @chef_fs_config.base_path.nil?
+          # These are all relative paths.  We can't resolve and root paths unless we are in the
+          # chef repo.
+          ui.error("Attempt to use relative path '#{arg}' when current directory is outside the repository path.")
+          ui.error("Current working directory is '#{@chef_fs_config.cwd}'.")
           exit(1)
+        else
+          inferred_path = Chef::ChefFS::PathUtils::join(@chef_fs_config.base_path, arg)
         end
-        Chef::ChefFS::FilePattern.relative_to(@chef_fs_config.base_path, arg)
+        Chef::ChefFS::FilePattern.new(inferred_path)
       end
 
       def format_path(entry)