chef 14.8.12-universal-mingw32 → 14.9.13-universal-mingw32

data/lib/chef/http.rb

@@ -152,7 +152,7 @@ class Chef
       response.error! unless success_response?(response)
       return_value
 
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       http_attempts += 1
       response = e.response
       if response.kind_of?(Net::HTTPNotAcceptable) && version_retries - http_attempts > 0
@@ -190,7 +190,7 @@ class Chef
         response.error!
       end
       tempfile
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       http_attempts += 1
       response = e.response
       if response.kind_of?(Net::HTTPNotAcceptable) && version_retries - http_attempts > 0
@@ -245,7 +245,7 @@ class Chef
         end
       end
       tempfile
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       http_attempts += 1
       response = e.response
       if response.kind_of?(Net::HTTPNotAcceptable) && version_retries - http_attempts > 0

data/lib/chef/key.rb

@@ -187,7 +187,7 @@ class Chef
 
     def save
       create
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       if e.response.code == "409"
         update
       else

data/lib/chef/knife.rb

@@ -455,7 +455,7 @@ class Chef
       case e
       when SystemExit
         raise # make sure exit passes through.
-      when Net::HTTPServerException, Net::HTTPFatalError
+      when Net::HTTPClientException, Net::HTTPFatalError
         humanize_http_exception(e)
       when OpenSSL::SSL::SSLError
         ui.error "Could not establish a secure connection to the server."

data/lib/chef/knife/bootstrap/client_builder.rb

@@ -187,7 +187,7 @@ class Chef
         def resource_exists?(relative_path)
           rest.get(relative_path)
           true
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           raise unless e.response.code == "404"
           false
         end

data/lib/chef/knife/cookbook_delete.rb

@@ -88,7 +88,7 @@ class Chef
         @available_versions ||= rest.get("cookbooks/#{@cookbook_name}").map do |name, url_and_version|
           url_and_version["versions"].map { |url_by_version| url_by_version["version"] }
         end.flatten
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         if e.to_s =~ /^404/
           ui.error("Cannot find a cookbook named #{@cookbook_name} to delete.")
           nil

data/lib/chef/knife/cookbook_upload.rb

@@ -226,7 +226,7 @@ WARNING
 
       def assert_environment_valid!
         environment
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         if e.response.code.to_s == "404"
           ui.error "The environment #{config[:environment]} does not exist on the server, aborting."
           Log.debug(e)

data/lib/chef/knife/data_bag_create.rb

@@ -53,7 +53,7 @@ class Chef
         begin
           rest.get("data/#{@data_bag_name}")
           ui.info("Data bag #{@data_bag_name} already exists")
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           raise unless e.to_s =~ /^404/
           # if it doesn't exists, try to create it
           rest.post("data", { "name" => @data_bag_name })

data/lib/chef/knife/raw.rb

@@ -112,7 +112,7 @@ class Chef
         rescue Timeout::Error => e
           ui.error "Server timeout"
           exit 1
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           ui.error "Server responded with error #{e.response.code} \"#{e.response.message}\""
           ui.error "Error Body: #{e.response.body}" if e.response.body && e.response.body != ""
           exit 1

data/lib/chef/knife/search.rb

@@ -109,7 +109,7 @@ class Chef
             result_items << formatted_item
             result_count += 1
           end
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           msg = Chef::JSONCompat.from_json(e.response.body)["error"].first
           ui.error("knife search failed: #{msg}")
           exit 99

data/lib/chef/knife/supermarket_share.rb

@@ -116,7 +116,7 @@ class Chef
         data = noauth_rest.get("#{config[:supermarket_site]}/api/v1/cookbooks/#{@name_args[0]}")
         data["category"]
       rescue => e
-        return "Other" if e.kind_of?(Net::HTTPServerException) && e.response.code == "404"
+        return "Other" if e.kind_of?(Net::HTTPClientException) && e.response.code == "404"
         ui.fatal("Unable to reach Supermarket: #{e.message}. Increase log verbosity (-VV) for more information.")
         Chef::Log.trace("\n#{e.backtrace.join("\n")}")
         exit(1)

data/lib/chef/knife/supermarket_unshare.rb

@@ -48,7 +48,7 @@ class Chef
 
         begin
           rest.delete "#{config[:supermarket_site]}/api/v1/cookbooks/#{@name_args[0]}"
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           raise e unless e.message =~ /Forbidden/
           ui.error "Forbidden: You must be the maintainer of #{@cookbook_name} to unshare it."
           exit 1

data/lib/chef/mixin/api_version_request_handling.rb

@@ -19,7 +19,7 @@
 class Chef
   module Mixin
     module ApiVersionRequestHandling
-      # @param exeception [Net::HTTPServerException] may or may not contain the x-ops-server-api-version header
+      # @param exeception [Net::HTTPClientException] may or may not contain the x-ops-server-api-version header
       # supported_client_versions:
       # @param supported_client_versions [Array<Integer>] The API versions the client supports.
       #

data/lib/chef/monkey_patches/net_http.rb

@@ -5,6 +5,10 @@ module ChefNetHTTPExceptionExtensions
   attr_accessor :chef_rest_request
 end
 
+unless defined?(Net::HTTPClientException)
+  Net::HTTPClientException = Net::HTTPServerException
+end
+
 require "net/http"
 module Net
   class HTTPError
@@ -13,7 +17,7 @@ module Net
   class HTTPRetriableError
     include ChefNetHTTPExceptionExtensions
   end
-  class HTTPServerException
+  class HTTPClientException
     include ChefNetHTTPExceptionExtensions
   end
   class HTTPFatalError

data/lib/chef/node.rb

@@ -575,7 +575,7 @@ class Chef
 
     def self.find_or_create(node_name)
       load(node_name)
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       raise unless e.response.code == "404"
       node = build(node_name)
       node.create
@@ -608,7 +608,7 @@ class Chef
         else
           chef_server_rest.put("nodes/#{name}", data_for_save)
         end
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         if e.response.code == "404"
           chef_server_rest.post("nodes", data_for_save)
         else
@@ -622,7 +622,7 @@ class Chef
     def create
       chef_server_rest.post("nodes", data_for_save)
       self
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       # Chef Server before 12.3 rejects node JSON with 'policy_name' or
       # 'policy_group' keys, but 'policy_name' will be detected first.
       # Backcompat can be removed in 13.0
@@ -655,7 +655,7 @@ class Chef
       trimmed_data = data_for_save_without_policyfile_attrs
 
       chef_server_rest.put("nodes/#{name}", trimmed_data)
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       raise e unless e.response.code == "404"
       chef_server_rest.post("nodes", trimmed_data)
     end

data/lib/chef/node/mixin/immutablize_array.rb

@@ -34,6 +34,7 @@ class Chef
           :at,
           :bsearch,
           :bsearch_index,
+          :chain,
           :chunk,
           :chunk_while,
           :collect,
@@ -43,6 +44,7 @@ class Chef
           :count,
           :cycle,
           :detect,
+          :difference,
           :dig,
           :drop,
           :drop_while,
@@ -56,6 +58,7 @@ class Chef
           :empty?,
           :entries,
           :fetch,
+          :filter,
           :find,
           :find_all,
           :find_index,
@@ -117,6 +120,7 @@ class Chef
           :to_plist,
           :to_set,
           :transpose,
+          :union,
           :uniq,
           :values_at,
           :zip,
@@ -139,6 +143,7 @@ class Chef
           :delete_at,
           :delete_if,
           :fill,
+          :filter!,
           :flatten!,
           :insert,
           :keep_if,

data/lib/chef/node/mixin/immutablize_hash.rb

@@ -30,6 +30,7 @@ class Chef
           :all?,
           :any?,
           :assoc,
+          :chain,
           :chunk,
           :chunk_while,
           :collect,
@@ -58,6 +59,7 @@ class Chef
           :entries,
           :fetch,
           :fetch_values,
+          :filter,
           :find,
           :find_all,
           :find_index,
@@ -131,6 +133,7 @@ class Chef
           :default_proc=,
           :delete,
           :delete_if,
+          :filter!,
           :keep_if,
           :map!,
           :merge!,

data/lib/chef/org.rb

@@ -92,7 +92,7 @@ class Chef
 
     def save
       create
-    rescue Net::HTTPServerException => e
+    rescue Net::HTTPClientException => e
       if e.response.code == "409"
         update
       else

data/lib/chef/policy_builder/policyfile.rb

@@ -311,7 +311,7 @@ class Chef
       # @api private
       def policy
         @policy ||= api_service.get(policyfile_location)
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise ConfigurationError, "Error loading policyfile from `#{policyfile_location}': #{e.class} - #{e.message}"
       end
 

data/lib/chef/provider/apt_repository.rb

@@ -271,7 +271,7 @@ class Chef
         url = "https://launchpad.net/api/1.0/~#{owner}/+archive/#{repo}"
         key_id = Chef::HTTP::Simple.new(url).get("signing_key_fingerprint").delete('"')
         install_key_from_keyserver(key_id, "keyserver.ubuntu.com")
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise "Could not access Launchpad ppa API: #{e.message}"
       end
 

data/lib/chef/provider/group/windows.rb

@@ -77,6 +77,7 @@ class Chef
           else
             @net_group.local_set_members(new_resource.members)
           end
+          @net_group.local_group_set_info(new_resource.comment) if new_resource.comment
         end
 
         def has_current_group_member?(member)

data/lib/chef/provider/remote_file/content.rb

@@ -54,7 +54,7 @@ class Chef
                     as_uri(source)
                   end
             raw_file = grab_file_from_uri(uri)
-          rescue SocketError, Errno::ECONNREFUSED, Errno::ENOENT, Errno::EACCES, Timeout::Error, Net::HTTPServerException, Net::HTTPFatalError, Net::FTPError, Errno::ETIMEDOUT => e
+          rescue SocketError, Errno::ECONNREFUSED, Errno::ENOENT, Errno::EACCES, Timeout::Error, Net::HTTPClientException, Net::HTTPFatalError, Net::FTPError, Errno::ETIMEDOUT => e
             logger.warn("#{@new_resource} cannot be downloaded from #{source}: #{e}")
             if source = sources.shift
               logger.info("#{@new_resource} trying to download from another mirror")

data/lib/chef/provider/windows_task.rb

@@ -145,7 +145,7 @@ class Chef
               task.working_directory = new_resource.cwd if new_resource.cwd
               task.configure_settings(config_settings)
               task.configure_principals(principal_settings)
-              task.set_account_information(new_resource.user, new_resource.password)
+              task.set_account_information(new_resource.user, new_resource.password, new_resource.interactive_enabled)
               task.creator = new_resource.user
               task.description = new_resource.description unless new_resource.description.nil?
               task.activate(new_resource.task_name)
@@ -246,7 +246,7 @@ class Chef
 
         def update_task(task)
           converge_by("#{new_resource} task updated") do
-            task.set_account_information(new_resource.user, new_resource.password)
+            task.set_account_information(new_resource.user, new_resource.password, new_resource.interactive_enabled)
             task.application_name = new_resource.command if new_resource.command
             task.parameters = new_resource.command_arguments if new_resource.command_arguments
             task.working_directory = new_resource.cwd if new_resource.cwd

data/lib/chef/resource/group.rb

@@ -51,6 +51,10 @@ class Chef
       property :non_unique, [ TrueClass, FalseClass ], default: false,
                description: "Allow gid duplication. May only be used with the Groupadd provider."
 
+      property :comment, String,
+               introduced: "14.9",
+               description: "Specifies a comment to associate with the local group."
+
       alias_method :users, :members
     end
   end

data/lib/chef/resource/homebrew_cask.rb

@@ -55,11 +55,11 @@ class Chef
       action :install do
         description "Install an application packaged as a Homebrew cask."
 
-        homebrew_tap "caskroom/cask" if new_resource.install_cask
+        homebrew_tap "homebrew/cask" if new_resource.install_cask
 
         unless casked?
-          converge_by("install cask #{new_resource.name} #{new_resource.options}") do
-            shell_out!("#{new_resource.homebrew_path} cask install #{new_resource.name} #{new_resource.options}",
+          converge_by("install cask #{new_resource.cask_name} #{new_resource.options}") do
+            shell_out!("#{new_resource.homebrew_path} cask install #{new_resource.cask_name} #{new_resource.options}",
                 user: new_resource.owner,
                 env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
                 cwd: ::Dir.home(new_resource.owner))
@@ -70,11 +70,11 @@ class Chef
       action :remove do
         description "Remove an application packaged as a Homebrew cask."
 
-        homebrew_tap "caskroom/cask" if new_resource.install_cask
+        homebrew_tap "homebrew/cask" if new_resource.install_cask
 
         if casked?
-          converge_by("uninstall cask #{new_resource.name}") do
-            shell_out!("#{new_resource.homebrew_path} cask uninstall #{new_resource.name}",
+          converge_by("uninstall cask #{new_resource.cask_name}") do
+            shell_out!("#{new_resource.homebrew_path} cask uninstall #{new_resource.cask_name}",
                 user: new_resource.owner,
                 env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
                 cwd: ::Dir.home(new_resource.owner))
@@ -88,8 +88,8 @@ class Chef
         alias_method :action_uninstall, :action_remove
 
         def casked?
-          unscoped_name = new_resource.name.split("/").last
-          shell_out!('#{new_resource.homebrew_path} cask list 2>/dev/null',
+          unscoped_name = new_resource.cask_name.split("/").last
+          shell_out!("#{new_resource.homebrew_path} cask list 2>/dev/null",
             user: new_resource.owner,
             env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
             cwd: ::Dir.home(new_resource.owner)).stdout.split.include?(unscoped_name)

data/lib/chef/resource/homebrew_tap.rb

@@ -55,9 +55,9 @@ class Chef
       action :tap do
         description "Add a Homebrew tap."
 
-        unless tapped?(new_resource.name)
-          converge_by("tap #{new_resource.name}") do
-            shell_out!("#{new_resource.homebrew_path} tap #{new_resource.full ? '--full' : ''} #{new_resource.name} #{new_resource.url || ''}",
+        unless tapped?(new_resource.tap_name)
+          converge_by("tap #{new_resource.tap_name}") do
+            shell_out!("#{new_resource.homebrew_path} tap #{new_resource.full ? '--full' : ''} #{new_resource.tap_name} #{new_resource.url || ''}",
                 user: new_resource.owner,
                 env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
                 cwd: ::Dir.home(new_resource.owner))
@@ -68,9 +68,9 @@ class Chef
       action :untap do
         description "Remove a Homebrew tap."
 
-        if tapped?(new_resource.name)
-          converge_by("untap #{new_resource.name}") do
-            shell_out!("#{new_resource.homebrew_path} untap #{new_resource.name}",
+        if tapped?(new_resource.tap_name)
+          converge_by("untap #{new_resource.tap_name}") do
+            shell_out!("#{new_resource.homebrew_path} untap #{new_resource.tap_name}",
                 user: new_resource.owner,
                 env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
                 cwd: ::Dir.home(new_resource.owner))

data/lib/chef/resource/openssl_ec_private_key.rb

@@ -68,7 +68,7 @@ class Chef
         unless new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass)
           converge_by("Create an EC private key #{new_resource.path}") do
             log "Generating an #{new_resource.key_curve} "\
-                "EC key file at #{new_resource.name}, this may take some time"
+                "EC key file at #{new_resource.path}, this may take some time"
 
             if new_resource.key_pass
               unencrypted_ec_key = gen_ec_priv_key(new_resource.key_curve)

data/lib/chef/resource/openssl_x509_request.rb

@@ -89,7 +89,7 @@ class Chef
 
         unless ::File.exist? new_resource.path
           converge_by("Create CSR #{@new_resource}") do
-            file new_resource.name do
+            file new_resource.path do
               owner new_resource.owner unless new_resource.owner.nil?
               group new_resource.group unless new_resource.group.nil?
               mode new_resource.mode unless new_resource.mode.nil?

data/lib/chef/resource/powershell_package_source.rb

@@ -55,10 +55,14 @@ class Chef
                description: "The location where scripts will be published to for this source. Only valid if the provider is 'PowerShellGet'."
 
       load_current_value do
-        cmd = load_resource_state_script(name)
+        cmd = load_resource_state_script(source_name)
         repo = powershell_out!(cmd)
-        status = Chef::JSONCompat.from_json(repo.stdout)
-        url status["url"].nil? ? "not_set" : status["url"]
+        if repo.stdout.empty?
+          current_value_does_not_exist!
+        else
+          status = Chef::JSONCompat.from_json(repo.stdout)
+        end
+        url status["url"]
         trusted status["trusted"]
         provider_name status["provider_name"]
         publish_location status["publish_location"]
@@ -113,7 +117,7 @@ class Chef
 
       action_class do
         def package_source_exists?
-          cmd = powershell_out!("(Get-PackageSource -Name '#{new_resource.source_name}').Name")
+          cmd = powershell_out!("(Get-PackageSource -Name '#{new_resource.source_name}' -WarningAction SilentlyContinue).Name")
           cmd.stdout.downcase.strip == new_resource.source_name.downcase
         end
 
@@ -145,6 +149,9 @@ class Chef
 
     def load_resource_state_script(name)
       <<-EOH
+        $PSDefaultParameterValues = @{
+          "*:WarningAction" = "SilentlyContinue"
+        }
         if(Get-PackageSource -Name '#{name}' -ErrorAction SilentlyContinue) {
             if ((Get-PackageSource -Name '#{name}').ProviderName -eq 'PowerShellGet') {
                 (Get-PSRepository -Name '#{name}') | Select @{n='source_name';e={$_.Name}}, @{n='url';e={$_.SourceLocation}},
@@ -156,9 +163,6 @@ class Chef
                 @{n='provider_name';e={$_.ProviderName}}, @{n='trusted';e={$_.IsTrusted}} | ConvertTo-Json
             }
         }
-        else {
-            "" | Select source_name, url, provider_name, trusted | ConvertTo-Json
-        }
       EOH
     end
   end