chef 12.18.31 → 13.0.118

data/lib/chef/chef_fs/command_line.rb

@@ -266,26 +266,25 @@ class Chef
         def diff_text(old_path, new_path, old_value, new_value)
           # Copy to tempfiles before diffing
           # TODO don't copy things that are already in files!  Or find an in-memory diff algorithm
-          begin
-            new_tempfile = Tempfile.new("new")
-            new_tempfile.write(new_value)
-            new_tempfile.close
 
-            begin
-              old_tempfile = Tempfile.new("old")
-              old_tempfile.write(old_value)
-              old_tempfile.close
+          new_tempfile = Tempfile.new("new")
+          new_tempfile.write(new_value)
+          new_tempfile.close
 
-              result = Chef::Util::Diff.new.udiff(old_tempfile.path, new_tempfile.path)
-              result = result.gsub(/^--- #{old_tempfile.path}/, "--- #{old_path}")
-              result = result.gsub(/^\+\+\+ #{new_tempfile.path}/, "+++ #{new_path}")
-              result
-            ensure
-              old_tempfile.close!
-            end
+          begin
+            old_tempfile = Tempfile.new("old")
+            old_tempfile.write(old_value)
+            old_tempfile.close
+
+            result = Chef::Util::Diff.new.udiff(old_tempfile.path, new_tempfile.path)
+            result = result.gsub(/^--- #{old_tempfile.path}/, "--- #{old_path}")
+            result = result.gsub(/^\+\+\+ #{new_tempfile.path}/, "+++ #{new_path}")
+            result
           ensure
-            new_tempfile.close!
+            old_tempfile.close!
           end
+        ensure
+          new_tempfile.close!
         end
       end
     end

data/lib/chef/chef_fs/data_handler/client_data_handler.rb

@@ -25,7 +25,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "name"
+          key == "name"
         end
 
         def chef_class

data/lib/chef/chef_fs/data_handler/container_data_handler.rb

@@ -12,7 +12,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "containername"
+          key == "containername"
         end
 
         # Verify that the JSON hash for this type has a key that matches its name.

data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb

@@ -24,7 +24,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "cookbook_name" || key == "version"
+          key == "cookbook_name" || key == "version"
         end
 
         def chef_class

data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb

@@ -35,7 +35,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "id"
+          key == "id"
         end
 
         def chef_class

data/lib/chef/chef_fs/data_handler/environment_data_handler.rb

@@ -18,7 +18,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "name"
+          key == "name"
         end
 
         def chef_class

data/lib/chef/chef_fs/data_handler/group_data_handler.rb

@@ -41,7 +41,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "name"
+          key == "name"
         end
 
         def chef_class

data/lib/chef/chef_fs/data_handler/node_data_handler.rb

@@ -22,7 +22,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "name"
+          key == "name"
         end
 
         def chef_class

data/lib/chef/chef_fs/data_handler/organization_data_handler.rb

@@ -16,7 +16,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "name"
+          key == "name"
         end
 
         # Verify that the JSON hash for this type has a key that matches its name.

data/lib/chef/chef_fs/data_handler/role_data_handler.rb

@@ -24,7 +24,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "name"
+          key == "name"
         end
 
         def chef_class

data/lib/chef/chef_fs/data_handler/user_data_handler.rb

@@ -19,7 +19,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == "name"
+          key == "name"
         end
 
         # There is no chef_class for users, nor does to_ruby work.

data/lib/chef/chef_fs/file_pattern.rb

@@ -84,7 +84,7 @@ class Chef
         # Otherwise, it's possible we could match: the path matches to this point, and the pattern is longer than the path.
         # TODO There is one edge case where the double star comes after some characters like abc**def--we could check whether the next
         # bit of path starts with abc in that case.
-        return true
+        true
       end
 
       # Returns the immediate child of a path that would be matched
@@ -114,7 +114,7 @@ class Chef
         path = path[1, path.length - 1] if Chef::ChefFS::PathUtils.is_absolute?(path)
         dirs_in_path = Chef::ChefFS::PathUtils.split(path).length
         return nil if exact_parts.length <= dirs_in_path
-        return exact_parts[dirs_in_path]
+        exact_parts[dirs_in_path]
       end
 
       # If this pattern represents an exact path, returns the exact path.

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

@@ -103,11 +103,11 @@ class Chef
           end
 
           def get_json(path)
-            Chef::ServerAPI.new(chef_server_url, :client_name => chef_username, :signing_key_filename => chef_private_key, :api_version => "0").get(path)
+            chef_rest.get(path)
           end
 
           def chef_rest
-            Chef::ServerAPI.new(chef_server_url, :client_name => chef_username, :signing_key_filename => chef_private_key)
+            Chef::ServerAPI.new(chef_server_url, :client_name => chef_username, :signing_key_filename => chef_private_key, :api_version => "0")
           end
 
           def api_path

data/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb

@@ -56,7 +56,7 @@ class Chef
           # to make this work. So instead, we make a temporary cookbook
           # symlinking back to real cookbook, and upload the proxy.
           def upload_cookbook(other, options)
-            cookbook_name, dash, identifier = other.name.rpartition("-")
+            cookbook_name, _, identifier = other.name.rpartition("-")
 
             Dir.mktmpdir do |temp_cookbooks_path|
               proxy_cookbook_path = "#{temp_cookbooks_path}/#{cookbook_name}"
@@ -73,7 +73,7 @@ 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, force: options[:force], rest: root.chef_rest, policy_mode: true)
+              uploader = Chef::CookbookUploader.new(cookbook_to_upload, force: options[:force], rest: chef_rest, policy_mode: true)
 
               with_actual_cookbooks_dir(temp_cookbooks_path) do
                 uploader.upload_cookbooks
@@ -92,6 +92,10 @@ class Chef
             end
           end
 
+          def chef_rest
+            Chef::ServerAPI.new(root.chef_rest.url, root.chef_rest.options.merge(version_class: Chef::CookbookManifestVersions))
+          end
+
           def can_have_child?(name, is_dir)
             is_dir && name.include?("-")
           end

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

@@ -49,18 +49,6 @@ class Chef
 
           attr_reader :cookbook_name, :version
 
-          COOKBOOK_SEGMENT_INFO = {
-            :attributes => { :ruby_only => true },
-            :definitions => { :ruby_only => true },
-            :recipes => { :ruby_only => true },
-            :libraries => { :recursive => true },
-            :templates => { :recursive => true },
-            :files => { :recursive => true },
-            :resources => { :ruby_only => true, :recursive => true },
-            :providers => { :ruby_only => true, :recursive => true },
-            :root_files => {},
-          }
-
           def add_child(child)
             @children << child
           end
@@ -73,42 +61,36 @@ class Chef
             # 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
-              children.find { |child| child.name == name }
-            rescue Chef::ChefFS::FileSystem::NotFoundError
-              nil
-            end
+
+            children.find { |child| child.name == name }
+          rescue Chef::ChefFS::FileSystem::NotFoundError
+            nil
           end
 
           def can_have_child?(name, is_dir)
-            # A cookbook's root may not have directories unless they are segment directories
-            return name != "root_files" && COOKBOOK_SEGMENT_INFO.keys.include?(name.to_sym) if is_dir
-            return true
+            return name != "root_files" if is_dir
+            true
           end
 
           def children
             if @children.nil?
               @children = []
-              manifest = chef_object.manifest
-              COOKBOOK_SEGMENT_INFO.each do |segment, segment_info|
-                next unless manifest.has_key?(segment)
-
-                # Go through each file in the manifest for the segment, and
-                # add cookbook subdirs and files for it.
-                manifest[segment].each do |segment_file|
-                  parts = segment_file[:path].split("/")
+              manifest = chef_object.cookbook_manifest
+              manifest.by_parent_directory.each do |segment, files|
+                files.each do |file|
+                  parts = file[:path].split("/")
                   # Get or create the path to the file
                   container = self
                   parts[0, parts.length - 1].each do |part|
                     old_container = container
                     container = old_container.children.find { |child| part == child.name }
                     if !container
-                      container = CookbookSubdir.new(part, old_container, segment_info[:ruby_only], segment_info[:recursive])
+                      container = CookbookSubdir.new(part, old_container, false, true)
                       old_container.add_child(container)
                     end
                   end
                   # Create the file itself
-                  container.add_child(CookbookFile.new(parts[parts.length - 1], container, segment_file))
+                  container.add_child(CookbookFile.new(parts[parts.length - 1], container, file))
                 end
               end
               @children = @children.sort_by { |c| c.name }
@@ -166,7 +148,11 @@ class Chef
           end
 
           def rest
-            parent.rest
+            Chef::ServerAPI.new(parent.rest.url, parent.rest.options.merge(version_class: Chef::CookbookManifestVersions))
+          end
+
+          def chef_rest
+            Chef::ServerAPI.new(parent.chef_rest.url, parent.chef_rest.options.merge(version_class: Chef::CookbookManifestVersions))
           end
 
           def chef_object
@@ -188,7 +174,7 @@ class Chef
               old_retry_count = Chef::Config[:http_retry_count]
               begin
                 Chef::Config[:http_retry_count] = 0
-                @chef_object ||= Chef::CookbookVersion.from_hash(root.get_json(api_path))
+                @chef_object ||= Chef::CookbookVersion.from_hash(chef_rest.get(api_path))
               ensure
                 Chef::Config[:http_retry_count] = old_retry_count
               end

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

@@ -37,16 +37,14 @@ class Chef
           end
 
           def read
-            begin
-              tmpfile = rest.streaming_request(file[:url])
-              File.open(tmpfile, "rb") { |f| f.read }
-            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]}")
-            rescue Errno::ENOENT
-              raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-            end
+            tmpfile = rest.streaming_request(file[:url])
+            File.open(tmpfile, "rb") { |f| f.read }
+          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]}")
+          rescue Errno::ENOENT
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
           end
 
           def rest

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

@@ -74,13 +74,17 @@ class Chef
           def upload_cookbook(other, options)
             cookbook_to_upload = other.chef_object
             cookbook_to_upload.freeze_version if options[:freeze]
-            uploader = Chef::CookbookUploader.new(cookbook_to_upload, :force => options[:force], :rest => root.chef_rest)
+            uploader = Chef::CookbookUploader.new(cookbook_to_upload, :force => options[:force], :rest => chef_rest)
 
             with_actual_cookbooks_dir(other.parent.file_path) do
               uploader.upload_cookbooks
             end
           end
 
+          def chef_rest
+            Chef::ServerAPI.new(root.chef_rest.url, root.chef_rest.options.merge(version_class: Chef::CookbookManifestVersions))
+          end
+
           # Work around the fact that CookbookUploader doesn't understand chef_repo_path (yet)
           def with_actual_cookbooks_dir(actual_cookbook_path)
             old_cookbook_path = Chef::Config.cookbook_path

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

@@ -30,16 +30,14 @@ class Chef
           end
 
           def children
-            begin
-              @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
-              if e.response.code == "404"
-                raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
-              else
-                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error getting children: #{e}")
-              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
+            if e.response.code == "404"
+              raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
+            else
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error getting children: #{e}")
             end
           end
 

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

@@ -28,18 +28,16 @@ class Chef
         class NodesDir < RestListDir
           # Identical to RestListDir.children, except supports environments
           def children
-            begin
-              @children ||= root.get_json(env_api_path).keys.sort.map do |key|
-                make_child_entry(key, true)
-              end
-            rescue Timeout::Error => e
-              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
-            rescue Net::HTTPServerException => e
-              if $!.response.code == "404"
-                raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-              else
-                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
-              end
+            @children ||= root.get_json(env_api_path).keys.sort.map do |key|
+              make_child_entry(key, true)
+            end
+          rescue Timeout::Error => e
+            raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
+          rescue Net::HTTPServerException => e
+            if $!.response.code == "404"
+              raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+            else
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
             end
           end
 

data/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb

@@ -66,42 +66,40 @@ class Chef
           #   }
           # }
           def children
-            begin
               # Grab the names of the children, append json, and make child entries
-              @children ||= begin
-                result = []
-                data = root.get_json(api_path)
-                data.keys.sort.each do |policy_name|
-                  data[policy_name]["revisions"].keys.each do |policy_revision|
-                    filename = "#{policy_name}-#{policy_revision}.json"
-                    result << make_child_entry(filename, true)
-                  end
+            @children ||= begin
+              result = []
+              data = root.get_json(api_path)
+              data.keys.sort.each do |policy_name|
+                data[policy_name]["revisions"].keys.each do |policy_revision|
+                  filename = "#{policy_name}-#{policy_revision}.json"
+                  result << make_child_entry(filename, true)
                 end
-                result
               end
-            rescue Timeout::Error => e
-              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
-            rescue Net::HTTPServerException => e
-              # 404 = NotFoundError
-              if $!.response.code == "404"
-                # GET /organizations/ORG/policies returned 404, but that just might be because
-                # we are talking to an older version of the server that doesn't support policies.
-                # Do GET /orgqanizations/ORG to find out if the org exists at all.
-                # TODO use server API version instead of a second network request.
-                begin
-                  root.get_json(parent.api_path)
-                  # Return empty list if the organization exists but /policies didn't work
-                  []
-                rescue Net::HTTPServerException => e
-                  if e.response.code == "404"
-                    raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-                  end
-                  raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
+              result
+            end
+          rescue Timeout::Error => e
+            raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
+          rescue Net::HTTPServerException => e
+            # 404 = NotFoundError
+            if $!.response.code == "404"
+              # GET /organizations/ORG/policies returned 404, but that just might be because
+              # we are talking to an older version of the server that doesn't support policies.
+              # Do GET /orgqanizations/ORG to find out if the org exists at all.
+              # TODO use server API version instead of a second network request.
+              begin
+                root.get_json(parent.api_path)
+                # Return empty list if the organization exists but /policies didn't work
+                []
+              rescue Net::HTTPServerException => e
+                if e.response.code == "404"
+                  raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
                 end
-              # Anything else is unexpected (OperationFailedError)
-              else
                 raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
               end
+            # Anything else is unexpected (OperationFailedError)
+            else
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
             end
           end
 

data/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb

@@ -93,7 +93,7 @@ class Chef
               end
 
               begin
-                existing_group = Chef::JSONCompat.parse(self.read)
+                existing_group = Chef::JSONCompat.parse(read)
               rescue NotFoundError
                 # It's OK if the group doesn't already exist, just means no existing policies
               end

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

@@ -71,40 +71,38 @@ class Chef
           # Children are foo.json and bar.json in this case.
           #
           def children
-            begin
               # Grab the names of the children, append json, and make child entries
-              @children ||= root.get_json(api_path).keys.sort.map do |key|
-                make_child_entry(key, true)
-              end
-            rescue Timeout::Error => e
-              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
-            rescue Net::HTTPServerException => e
-              # 404 = NotFoundError
-              if $!.response.code == "404"
-
-                if parent.is_a?(ChefServerRootDir)
-                  # GET /organizations/ORG/<container> returned 404, but that just might be because
-                  # we are talking to an older version of the server that doesn't support policies.
-                  # Do GET /organizations/ORG to find out if the org exists at all.
-                  # TODO use server API version instead of a second network request.
-                  begin
-                    root.get_json(parent.api_path)
-                    # Return empty list if the organization exists but /policies didn't work
-                    []
-                  rescue Net::HTTPServerException => e
-                    if e.response.code == "404"
-                      raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-                    end
-                    raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
+            @children ||= root.get_json(api_path).keys.sort.map do |key|
+              make_child_entry(key, true)
+            end
+          rescue Timeout::Error => e
+            raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
+          rescue Net::HTTPServerException => e
+            # 404 = NotFoundError
+            if $!.response.code == "404"
+
+              if parent.is_a?(ChefServerRootDir)
+                # GET /organizations/ORG/<container> returned 404, but that just might be because
+                # we are talking to an older version of the server that doesn't support policies.
+                # Do GET /organizations/ORG to find out if the org exists at all.
+                # TODO use server API version instead of a second network request.
+                begin
+                  root.get_json(parent.api_path)
+                  # Return empty list if the organization exists but /policies didn't work
+                  []
+                rescue Net::HTTPServerException => e
+                  if e.response.code == "404"
+                    raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
                   end
-                else
-                  raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+                  raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
                 end
-
-              # Anything else is unexpected (OperationFailedError)
               else
-                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
+                raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
               end
+
+            # Anything else is unexpected (OperationFailedError)
+            else
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
             end
           end