chef 14.2.0 → 14.3.37

data/lib/chef/provider/package/macports.rb

@@ -16,7 +16,7 @@ class Chef
           @candidate_version = macports_candidate_version
 
           if !new_resource.version && !@candidate_version
-            raise Chef::Exceptions::Package, "Could not get a candidate version for this package -- #{new_resource.name} does not seem to be a valid package!"
+            raise Chef::Exceptions::Package, "Could not get a candidate version for this package -- #{new_resource.package_name} does not seem to be a valid package!"
           end
 
           logger.trace("#{new_resource} candidate version is #{@candidate_version}") if @candidate_version
@@ -49,21 +49,21 @@ class Chef
           unless current_resource.version == version
             command = [ "port", options, "install", name ]
             command << "@#{version}" if version && !version.empty?
-            shell_out_compact_timeout!(command)
+            shell_out!(command)
           end
         end
 
         def purge_package(name, version)
           command = [ "port", options, "uninstall", name ]
           command << "@#{version}" if version && !version.empty?
-          shell_out_compact_timeout!(command)
+          shell_out!(command)
         end
 
         def remove_package(name, version)
           command = [ "port", options, "deactivate", name ]
           command << "@#{version}" if version && !version.empty?
 
-          shell_out_compact_timeout!(command)
+          shell_out!(command)
         end
 
         def upgrade_package(name, version)
@@ -76,7 +76,7 @@ class Chef
             # that hasn't been installed.
             install_package(name, version)
           elsif current_version != version
-            shell_out_compact_timeout!( "port", options, "upgrade", name, "@#{version}" )
+            shell_out!( "port", options, "upgrade", name, "@#{version}" )
           end
         end
 
@@ -84,7 +84,7 @@ class Chef
 
         def get_response_from_command(command)
           output = nil
-          status = shell_out_compact_timeout(command)
+          status = shell_out(command)
           begin
             output = status.stdout
           rescue Exception

data/lib/chef/provider/package/msu.rb

@@ -125,7 +125,7 @@ class Chef
 
         def extract_msu_contents(msu_file, destination)
           with_os_architecture(nil) do
-            shell_out_with_timeout!("#{ENV['SYSTEMROOT']}\\system32\\expand.exe -f:* #{msu_file} #{destination}")
+            shell_out!("#{ENV['SYSTEMROOT']}\\system32\\expand.exe -f:* #{msu_file} #{destination}")
           end
         end
 

data/lib/chef/provider/package/openbsd.rb

@@ -72,7 +72,7 @@ class Chef
             if parts = name.match(/^(.+?)--(.+)/) # use double-dash for stems with flavors, see man page for pkg_add
               name = parts[1]
             end
-            shell_out_compact_timeout!("pkg_add", "-r", package_string(name, version), env: { "PKG_PATH" => pkg_path }).status
+            shell_out!("pkg_add", "-r", package_string(name, version), env: { "PKG_PATH" => pkg_path }).status
             logger.trace("#{new_resource.package_name} installed")
           end
         end
@@ -81,7 +81,7 @@ class Chef
           if parts = name.match(/^(.+?)--(.+)/)
             name = parts[1]
           end
-          shell_out_compact_timeout!("pkg_delete", package_string(name, version), env: nil).status
+          shell_out!("pkg_delete", package_string(name, version), env: nil).status
         end
 
         private
@@ -92,7 +92,7 @@ class Chef
                  else
                    new_resource.package_name
                  end
-          pkg_info = shell_out_compact_timeout!("pkg_info", "-e", "#{name}->0", env: nil, returns: [0, 1])
+          pkg_info = shell_out!("pkg_info", "-e", "#{name}->0", env: nil, returns: [0, 1])
           result = pkg_info.stdout[/^inst:#{Regexp.escape(name)}-(.+?)\s/, 1]
           logger.trace("installed_version of '#{new_resource.package_name}' is '#{result}'")
           result
@@ -101,7 +101,7 @@ class Chef
         def candidate_version
           @candidate_version ||= begin
             results = []
-            shell_out_compact_timeout!("pkg_info", "-I", package_string(new_resource.package_name, new_resource.version), env: nil, returns: [0, 1]).stdout.each_line do |line|
+            shell_out!("pkg_info", "-I", package_string(new_resource.package_name, new_resource.version), env: nil, returns: [0, 1]).stdout.each_line do |line|
               results << if parts = new_resource.package_name.match(/^(.+?)--(.+)/)
                            line[/^#{Regexp.escape(parts[1])}-(.+?)\s/, 1]
                          else
@@ -116,7 +116,7 @@ class Chef
             when 1
               results[0]
             else
-              raise Chef::Exceptions::Package, "#{new_resource.name} has multiple matching candidates. Please use a more specific name" if results.length > 1
+              raise Chef::Exceptions::Package, "#{new_resource.package_name} has multiple matching candidates. Please use a more specific name" if results.length > 1
             end
           end
         end

data/lib/chef/provider/package/pacman.rb

@@ -32,7 +32,7 @@ class Chef
           current_resource.package_name(new_resource.package_name)
 
           logger.trace("#{new_resource} checking pacman for #{new_resource.package_name}")
-          status = shell_out_compact_timeout("pacman", "-Qi", new_resource.package_name)
+          status = shell_out("pacman", "-Qi", new_resource.package_name)
           status.stdout.each_line do |line|
             case line
             when /^Version(\s?)*: (.+)$/
@@ -60,7 +60,7 @@ class Chef
 
           package_repos = repos.map { |r| Regexp.escape(r) }.join("|")
 
-          status = shell_out_compact_timeout("pacman", "-Sl")
+          status = shell_out("pacman", "-Sl")
           status.stdout.each_line do |line|
             case line
             when /^(#{package_repos}) #{Regexp.escape(new_resource.package_name)} (.+)$/
@@ -82,7 +82,7 @@ class Chef
         end
 
         def install_package(name, version)
-          shell_out_compact_timeout!( "pacman", "--sync", "--noconfirm", "--noprogressbar", options, name)
+          shell_out!( "pacman", "--sync", "--noconfirm", "--noprogressbar", options, name)
         end
 
         def upgrade_package(name, version)
@@ -90,7 +90,7 @@ class Chef
         end
 
         def remove_package(name, version)
-          shell_out_compact_timeout!( "pacman", "--remove", "--noconfirm", "--noprogressbar", options, name )
+          shell_out!( "pacman", "--remove", "--noconfirm", "--noprogressbar", options, name )
         end
 
         def purge_package(name, version)

data/lib/chef/provider/package/paludis.rb

@@ -35,7 +35,7 @@ class Chef
           installed = false
           re = Regexp.new("(.*)[[:blank:]](.*)[[:blank:]](.*)$")
 
-          shell_out_compact!("cave", "-L", "warning", "print-ids", "-M", "none", "-m", new_resource.package_name, "-f", "%c/%p %v %r\n").stdout.each_line do |line|
+          shell_out!("cave", "-L", "warning", "print-ids", "-M", "none", "-m", new_resource.package_name, "-f", "%c/%p %v %r\n").stdout.each_line do |line|
             res = re.match(line)
             next if res.nil?
             case res[3]
@@ -58,7 +58,7 @@ class Chef
                 else
                   new_resource.package_name.to_s
                 end
-          shell_out_compact_timeout!("cave", "-L", "warning", "resolve", "-x", options, pkg)
+          shell_out!("cave", "-L", "warning", "resolve", "-x", options, pkg)
         end
 
         def upgrade_package(name, version)
@@ -72,7 +72,7 @@ class Chef
                   new_resource.package_name.to_s
                 end
 
-          shell_out_compact!("cave", "-L", "warning", "uninstall", "-x", options, pkg)
+          shell_out!("cave", "-L", "warning", "uninstall", "-x", options, pkg)
         end
 
         def purge_package(name, version)

data/lib/chef/provider/package/portage.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Ezra Zygmuntowicz (<ezra@engineyard.com>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,7 @@ class Chef
         PACKAGE_NAME_PATTERN = %r{(?:([^/]+)/)?([^/]+)}
 
         def load_current_resource
-          @current_resource = Chef::Resource::Package.new(new_resource.name)
+          @current_resource = Chef::Resource::PortagePackage.new(new_resource.name)
           current_resource.package_name(new_resource.package_name)
 
           category, pkg = /^#{PACKAGE_NAME_PATTERN}$/.match(new_resource.package_name)[1, 2]
@@ -66,7 +66,7 @@ class Chef
         def candidate_version
           return @candidate_version if @candidate_version
 
-          pkginfo = shell_out_compact("portageq", "best_visible", "/", new_resource.package_name)
+          pkginfo = shell_out("portageq", "best_visible", "/", new_resource.package_name)
 
           if pkginfo.exitstatus != 0
             pkginfo.stderr.each_line do |line|
@@ -106,7 +106,7 @@ class Chef
             pkg = "~#{name}-#{$1}"
           end
 
-          shell_out_compact!( "emerge", "-g", "--color", "n", "--nospinner", "--quiet", options, pkg )
+          shell_out!( "emerge", "-g", "--color", "n", "--nospinner", "--quiet", options, pkg )
         end
 
         def upgrade_package(name, version)
@@ -120,7 +120,7 @@ class Chef
                   new_resource.package_name.to_s
                 end
 
-          shell_out_compact!( "emerge", "--unmerge", "--color", "n", "--nospinner", "--quiet", options, pkg )
+          shell_out!( "emerge", "--unmerge", "--color", "n", "--nospinner", "--quiet", options, pkg )
         end
 
         def purge_package(name, version)

data/lib/chef/provider/package/powershell.rb

@@ -53,7 +53,9 @@ class Chef
         # Installs the package specified with the version passed else latest version will be installed
         def install_package(names, versions)
           names.each_with_index do |name, index|
-            powershell_out(build_powershell_package_command("Install-Package '#{name}'", versions[index]), timeout: new_resource.timeout)
+            cmd = powershell_out(build_powershell_package_command("Install-Package '#{name}'", versions[index]), timeout: new_resource.timeout)
+            next if cmd.nil?
+            raise Chef::Exceptions::PowershellCmdletException, "Failed to install package due to catalog signing error, use skip_publisher_check to force install" if cmd.stderr =~ /SkipPublisherCheck/
           end
         end
 
@@ -110,12 +112,14 @@ class Chef
 
         def build_powershell_package_command(command, version = nil)
           command = [command] unless command.is_a?(Array)
+          cmdlet_name = command.first
           command.unshift("(")
           %w{-Force -ForceBootstrap}.each do |arg|
             command.push(arg)
           end
           command.push("-RequiredVersion #{version}") if version
-          command.push("-Source #{new_resource.source}") if new_resource.source && command[1] =~ Regexp.union(/Install-Package/, /Find-Package/)
+          command.push("-Source #{new_resource.source}") if new_resource.source && cmdlet_name =~ Regexp.union(/Install-Package/, /Find-Package/)
+          command.push("-SkipPublisherCheck") if new_resource.skip_publisher_check && cmdlet_name !~ /Find-Package/
           command.push(").Version")
           command.join(" ")
         end

data/lib/chef/provider/package/rpm.rb

@@ -33,13 +33,13 @@ class Chef
 
           requirements.assert(:all_actions) do |a|
             a.assertion { @package_source_exists }
-            a.failure_message Chef::Exceptions::Package, "Package #{new_resource.name} not found: #{new_resource.source}"
-            a.whyrun "Assuming package #{new_resource.name} would have been made available."
+            a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
+            a.whyrun "Assuming package #{new_resource.package_name} would have been made available."
           end
           requirements.assert(:all_actions) do |a|
             a.assertion { !@rpm_status.nil? && (@rpm_status.exitstatus == 0 || @rpm_status.exitstatus == 1) }
             a.failure_message Chef::Exceptions::Package, "Unable to determine current version due to RPM failure. Detail: #{@rpm_status.inspect}"
-            a.whyrun "Assuming current version would have been determined for package#{new_resource.name}."
+            a.whyrun "Assuming current version would have been determined for package #{new_resource.package_name}."
           end
         end
 
@@ -57,7 +57,7 @@ class Chef
             end
 
             logger.trace("#{new_resource} checking rpm status")
-            shell_out_compact_timeout!("rpm", "-qp", "--queryformat", "%{NAME} %{VERSION}-%{RELEASE}\n", new_resource.source).stdout.each_line do |line|
+            shell_out!("rpm", "-qp", "--queryformat", "%{NAME} %{VERSION}-%{RELEASE}\n", new_resource.source).stdout.each_line do |line|
               case line
               when /^(\S+)\s(\S+)$/
                 current_resource.package_name($1)
@@ -73,7 +73,7 @@ class Chef
           end
 
           logger.trace("#{new_resource} checking install state")
-          @rpm_status = shell_out_compact_timeout("rpm", "-q", "--queryformat", "%{NAME} %{VERSION}-%{RELEASE}\n", current_resource.package_name)
+          @rpm_status = shell_out("rpm", "-q", "--queryformat", "%{NAME} %{VERSION}-%{RELEASE}\n", current_resource.package_name)
           @rpm_status.stdout.each_line do |line|
             case line
             when /^(\S+)\s(\S+)$/
@@ -88,12 +88,12 @@ class Chef
         def install_package(name, version)
           if current_resource.version
             if allow_downgrade
-              shell_out_compact_timeout!("rpm", options, "-U", "--oldpackage", new_resource.source)
+              shell_out!("rpm", options, "-U", "--oldpackage", new_resource.source)
             else
-              shell_out_compact_timeout!("rpm", options, "-U", new_resource.source)
+              shell_out!("rpm", options, "-U", new_resource.source)
             end
           else
-            shell_out_compact_timeout!("rpm", options, "-i", new_resource.source)
+            shell_out!("rpm", options, "-i", new_resource.source)
           end
         end
 
@@ -101,9 +101,9 @@ class Chef
 
         def remove_package(name, version)
           if version
-            shell_out_compact_timeout!("rpm", options, "-e", "#{name}-#{version}")
+            shell_out!("rpm", options, "-e", "#{name}-#{version}")
           else
-            shell_out_compact_timeout!("rpm", options, "-e", name)
+            shell_out!("rpm", options, "-e", name)
           end
         end
 

data/lib/chef/provider/package/rubygems.rb

@@ -547,9 +547,9 @@ class Chef
           end
           src_str = src.empty? ? "" : " #{src.join(" ")}"
           if !version.nil? && !version.empty?
-            shell_out_with_timeout!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src_str}#{opts}", env: nil)
+            shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src_str}#{opts}", env: nil)
           else
-            shell_out_with_timeout!("#{gem_binary_path} install \"#{name}\" -q --no-rdoc --no-ri #{src_str}#{opts}", env: nil)
+            shell_out!("#{gem_binary_path} install \"#{name}\" -q --no-rdoc --no-ri #{src_str}#{opts}", env: nil)
           end
         end
 
@@ -573,9 +573,9 @@ class Chef
 
         def uninstall_via_gem_command(name, version)
           if version
-            shell_out_with_timeout!("#{gem_binary_path} uninstall #{name} -q -x -I -v \"#{version}\"#{opts}", env: nil)
+            shell_out!("#{gem_binary_path} uninstall #{name} -q -x -I -v \"#{version}\"#{opts}", env: nil)
           else
-            shell_out_with_timeout!("#{gem_binary_path} uninstall #{name} -q -x -I -a#{opts}", env: nil)
+            shell_out!("#{gem_binary_path} uninstall #{name} -q -x -I -a#{opts}", env: nil)
           end
         end
 

data/lib/chef/provider/package/smartos.rb

@@ -43,7 +43,7 @@ class Chef
         def check_package_state(name)
           logger.trace("#{new_resource} checking package #{name}")
           version = nil
-          info = shell_out_compact_timeout!("/opt/local/sbin/pkg_info", "-E", "#{name}*", env: nil, returns: [0, 1])
+          info = shell_out!("/opt/local/sbin/pkg_info", "-E", "#{name}*", env: nil, returns: [0, 1])
 
           if info.stdout
             version = info.stdout[/^#{new_resource.package_name}-(.+)/, 1]
@@ -58,7 +58,7 @@ class Chef
           return @candidate_version if @candidate_version
           name = nil
           version = nil
-          pkg = shell_out_compact_timeout!("/opt/local/bin/pkgin", "se", new_resource.package_name, env: nil, returns: [0, 1])
+          pkg = shell_out!("/opt/local/bin/pkgin", "se", new_resource.package_name, env: nil, returns: [0, 1])
           pkg.stdout.each_line do |line|
             case line
             when /^#{new_resource.package_name}/
@@ -72,7 +72,7 @@ class Chef
         def install_package(name, version)
           logger.trace("#{new_resource} installing package #{name} version #{version}")
           package = "#{name}-#{version}"
-          out = shell_out_compact_timeout!("/opt/local/bin/pkgin", "-y", "install", package, env: nil)
+          out = shell_out!("/opt/local/bin/pkgin", "-y", "install", package, env: nil)
         end
 
         def upgrade_package(name, version)
@@ -83,7 +83,7 @@ class Chef
         def remove_package(name, version)
           logger.trace("#{new_resource} removing package #{name} version #{version}")
           package = name.to_s
-          out = shell_out_compact_timeout!("/opt/local/bin/pkgin", "-y", "remove", package, env: nil)
+          out = shell_out!("/opt/local/bin/pkgin", "-y", "remove", package, env: nil)
         end
 
       end

data/lib/chef/provider/package/solaris.rb

@@ -38,11 +38,11 @@ class Chef
           super
           requirements.assert(:install) do |a|
             a.assertion { new_resource.source }
-            a.failure_message Chef::Exceptions::Package, "Source for package #{new_resource.name} required for action install"
+            a.failure_message Chef::Exceptions::Package, "Source for package #{new_resource.package_name} required for action install"
           end
           requirements.assert(:all_actions) do |a|
             a.assertion { !new_resource.source || @package_source_found }
-            a.failure_message Chef::Exceptions::Package, "Package #{new_resource.name} not found: #{new_resource.source}"
+            a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "would assume #{new_resource.source} would be have previously been made available"
           end
         end
@@ -55,7 +55,7 @@ class Chef
             @package_source_found = ::File.exist?(new_resource.source)
             if @package_source_found
               logger.trace("#{new_resource} checking pkg status")
-              shell_out_compact_timeout("pkginfo", "-l", "-d", new_resource.source, new_resource.package_name).stdout.each_line do |line|
+              shell_out("pkginfo", "-l", "-d", new_resource.source, new_resource.package_name).stdout.each_line do |line|
                 case line
                 when /VERSION:\s+(.+)/
                   new_resource.version($1)
@@ -65,7 +65,7 @@ class Chef
           end
 
           logger.trace("#{new_resource} checking install state")
-          status = shell_out_compact_timeout("pkginfo", "-l", current_resource.package_name)
+          status = shell_out("pkginfo", "-l", current_resource.package_name)
           status.stdout.each_line do |line|
             case line
             when /VERSION:\s+(.+)/
@@ -83,7 +83,7 @@ class Chef
 
         def candidate_version
           return @candidate_version if @candidate_version
-          status = shell_out_compact_timeout("pkginfo", "-l", "-d", new_resource.source, new_resource.package_name)
+          status = shell_out("pkginfo", "-l", "-d", new_resource.source, new_resource.package_name)
           status.stdout.each_line do |line|
             case line
             when /VERSION:\s+(.+)/
@@ -106,7 +106,7 @@ class Chef
                       else
                         [ "pkgadd", "-n", "-d", new_resource.source, "all" ]
                       end
-            shell_out_compact_timeout!(command)
+            shell_out!(command)
             logger.trace("#{new_resource} installed version #{new_resource.version} from: #{new_resource.source}")
           else
             command = if ::File.directory?(new_resource.source) # CHEF-4469
@@ -114,7 +114,7 @@ class Chef
                       else
                         [ "pkgadd", "-n", options, "-d", new_resource.source, "all" ]
                       end
-            shell_out_compact_timeout!(*command)
+            shell_out!(*command)
             logger.trace("#{new_resource} installed version #{new_resource.version} from: #{new_resource.source}")
           end
         end
@@ -123,10 +123,10 @@ class Chef
 
         def remove_package(name, version)
           if options.nil?
-            shell_out_compact_timeout!( "pkgrm", "-n", name )
+            shell_out!( "pkgrm", "-n", name )
             logger.trace("#{new_resource} removed version #{new_resource.version}")
           else
-            shell_out_compact_timeout!( "pkgrm", "-n", options, name )
+            shell_out!( "pkgrm", "-n", options, name )
             logger.trace("#{new_resource} removed version #{new_resource.version}")
           end
         end

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

@@ -37,13 +37,14 @@ class Chef
         def define_resource_requirements
           requirements.assert(:install) do |a|
             a.assertion { new_resource.source || msi? }
-            a.failure_message Chef::Exceptions::NoWindowsPackageSource, "Source for package #{new_resource.name} must be specified in the resource's source property for package to be installed because the package_name property is used to test for the package installation state for this package type."
+            a.failure_message Chef::Exceptions::NoWindowsPackageSource, "Source for package #{new_resource.package_name} must be specified in the resource's source property for package to be installed because the package_name property is used to test for the package installation state for this package type."
           end
 
           unless uri_scheme?(new_resource.source)
             requirements.assert(:install) do |a|
               a.assertion { ::File.exist?(new_resource.source) }
-              a.failure_message Chef::Exceptions::Package, "Source for package #{new_resource.name} does not exist"
+              a.failure_message Chef::Exceptions::Package, "Source for package #{new_resource.package_name} does not exist"
+              a.whyrun "Assuming source file #{new_resource.source} would have been created."
             end
           end
         end
@@ -120,7 +121,7 @@ class Chef
                 if basename == "setup.exe"
                   :installshield
                 else
-                  raise Chef::Exceptions::CannotDetermineWindowsInstallerType, "Installer type for Windows Package '#{new_resource.name}' not specified and cannot be determined from file extension '#{file_extension}'"
+                  raise Chef::Exceptions::CannotDetermineWindowsInstallerType, "Installer type for Windows Package '#{new_resource.package_name}' not specified and cannot be determined from file extension '#{file_extension}'"
                 end
               end
             end