chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

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

@@ -26,7 +26,7 @@ class Chef
         use_multipackage_api
 
         provides :package, platform_family: "debian"
-        provides :apt_package, os: "linux"
+        provides :apt_package
 
         def initialize(new_resource, run_context)
           super
@@ -71,22 +71,18 @@ class Chef
         end
 
         def package_locked(name, version)
-          islocked = false
           locked = shell_out_compact_timeout!("apt-mark", "showhold")
-          locked.stdout.each_line do |line|
-            line_package = line.strip
-            if line_package == name
-              islocked = true
-            end
+          locked_packages = locked.stdout.each_line.map do |line|
+            line.strip
           end
-          islocked
+          name.all? { |n| locked_packages.include? n }
         end
 
         def install_package(name, version)
           package_name = name.zip(version).map do |n, v|
             package_data[n][:virtual] ? n : "#{n}=#{v}"
           end
-          run_noninteractive("apt-get", "-q", "-y", default_release_options, options, "install", package_name)
+          run_noninteractive("apt-get", "-q", "-y", config_file_options, default_release_options, options, "install", package_name)
         end
 
         def upgrade_package(name, version)
@@ -108,12 +104,12 @@ class Chef
         end
 
         def preseed_package(preseed_file)
-          Chef::Log.info("#{new_resource} pre-seeding package installation instructions")
+          logger.info("#{new_resource} pre-seeding package installation instructions")
           run_noninteractive("debconf-set-selections", preseed_file)
         end
 
         def reconfig_package(name, version)
-          Chef::Log.info("#{new_resource} reconfiguring")
+          logger.info("#{new_resource} reconfiguring")
           run_noninteractive("dpkg-reconfigure", name)
         end
 
@@ -157,6 +153,20 @@ class Chef
           end
         end
 
+        def config_file_options
+          # If the user has specified config file options previously, respect those.
+          return if Array(options).any? { |opt| opt =~ /--force-conf/ }
+
+          # It doesn't make sense to install packages in a scenario that can
+          # result in a prompt. Have users decide up-front whether they want to
+          # forcibly overwrite the config file, otherwise preserve it.
+          if new_resource.overwrite_config_files
+            [ "-o", "Dpkg::Options::=--force-confnew" ]
+          else
+            [ "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold" ]
+          end
+        end
+
         def resolve_package_versions(pkg)
           current_version = nil
           candidate_version = nil
@@ -164,10 +174,10 @@ class Chef
             case line
             when /^\s{2}Installed: (.+)$/
               current_version = ( $1 != "(none)" ) ? $1 : nil
-              Chef::Log.debug("#{new_resource} installed version for #{pkg} is #{$1}")
+              logger.trace("#{new_resource} installed version for #{pkg} is #{$1}")
             when /^\s{2}Candidate: (.+)$/
               candidate_version = ( $1 != "(none)" ) ? $1 : nil
-              Chef::Log.debug("#{new_resource} candidate version for #{pkg} is #{$1}")
+              logger.trace("#{new_resource} candidate version for #{pkg} is #{$1}")
             end
           end
           [ current_version, candidate_version ]
@@ -199,7 +209,7 @@ class Chef
 
             if newpkg
               virtual = true
-              Chef::Log.info("#{new_resource} is a virtual package, actually acting on package[#{newpkg}]")
+              logger.info("#{new_resource} is a virtual package, actually acting on package[#{newpkg}]")
               current_version, candidate_version = resolve_package_versions(newpkg)
             end
           end

data/lib/chef/provider/package/{aix.rb → bff.rb}

@@ -23,10 +23,10 @@ require "chef/mixin/get_source_from_package"
 class Chef
   class Provider
     class Package
-      class Aix < Chef::Provider::Package
+      class Bff < Chef::Provider::Package
 
         provides :package, os: "aix"
-        provides :bff_package, os: "aix"
+        provides :bff_package
 
         include Chef::Mixin::GetSourceFromPackage
 
@@ -48,7 +48,7 @@ class Chef
           current_resource.package_name(new_resource.package_name)
 
           if package_source_found?
-            Chef::Log.debug("#{new_resource} checking pkg status")
+            logger.trace("#{new_resource} checking pkg status")
             ret = shell_out_compact_timeout("installp", "-L", "-d", new_resource.source)
             ret.stdout.each_line do |line|
               case line
@@ -56,7 +56,7 @@ class Chef
                 fields = line.split(":")
                 new_resource.version(fields[2])
               when /^#{new_resource.package_name}:/
-                Chef::Log.warn("You are installing a bff package by product name. For idempotent installs, please install individual filesets")
+                logger.warn("You are installing a bff package by product name. For idempotent installs, please install individual filesets")
                 fields = line.split(":")
                 new_resource.version(fields[2])
               end
@@ -64,13 +64,13 @@ class Chef
             raise Chef::Exceptions::Package, "package source #{new_resource.source} does not provide package #{new_resource.package_name}" unless new_resource.version
           end
 
-          Chef::Log.debug("#{new_resource} checking install state")
+          logger.trace("#{new_resource} checking install state")
           ret = shell_out_compact_timeout("lslpp", "-lcq", current_resource.package_name)
           ret.stdout.each_line do |line|
             case line
             when /#{current_resource.package_name}/
               fields = line.split(":")
-              Chef::Log.debug("#{new_resource} version #{fields[2]} is already installed")
+              logger.trace("#{new_resource} version #{fields[2]} is already installed")
               current_resource.version(fields[2])
             end
           end
@@ -92,7 +92,7 @@ class Chef
                 fields = line.split(":")
                 @candidate_version = fields[2]
                 new_resource.version(fields[2])
-                Chef::Log.debug("#{new_resource} setting install candidate version to #{@candidate_version}")
+                logger.trace("#{new_resource} setting install candidate version to #{@candidate_version}")
               end
             end
             unless ret.exitstatus == 0
@@ -110,13 +110,13 @@ class Chef
         # So far, the code has been tested only with standalone packages.
         #
         def install_package(name, version)
-          Chef::Log.debug("#{new_resource} package install options: #{options}")
+          logger.trace("#{new_resource} package install options: #{options}")
           if options.nil?
             shell_out_compact_timeout!("installp", "-aYF", "-d", new_resource.source, new_resource.package_name)
-            Chef::Log.debug("#{new_resource} installed version #{new_resource.version} from: #{new_resource.source}")
+            logger.trace("#{new_resource} installed version #{new_resource.version} from: #{new_resource.source}")
           else
             shell_out_compact_timeout!("installp", "-aYF", options, "-d", new_resource.source, new_resource.package_name)
-            Chef::Log.debug("#{new_resource} installed version #{new_resource.version} from: #{new_resource.source}")
+            logger.trace("#{new_resource} installed version #{new_resource.version} from: #{new_resource.source}")
           end
         end
 
@@ -125,10 +125,10 @@ class Chef
         def remove_package(name, version)
           if options.nil?
             shell_out_compact_timeout!("installp", "-u", name)
-            Chef::Log.debug("#{new_resource} removed version #{new_resource.version}")
+            logger.trace("#{new_resource} removed version #{new_resource.version}")
           else
             shell_out_compact_timeout!("installp", "-u", options, name)
-            Chef::Log.debug("#{new_resource} removed version #{new_resource.version}")
+            logger.trace("#{new_resource} removed version #{new_resource.version}")
           end
         end
 

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

@@ -46,7 +46,7 @@ class Chef
 
         def download_source_file
           source_resource.run_action(:create)
-          Chef::Log.debug("#{new_resource} fetched source file to #{source_resource.path}")
+          logger.trace("#{new_resource} fetched source file to #{source_resource.path}")
           source_resource.path
         end
 
@@ -84,7 +84,7 @@ class Chef
           # e.g. Package_for_KB2975719~31bf3856ad364e35~amd64~~6.3.1.8
           package = new_cab_identity
           # Search for just the package name to catch a different version being installed
-          Chef::Log.debug("#{new_resource} searching for installed package #{package['name']}")
+          logger.trace("#{new_resource} searching for installed package #{package['name']}")
           existing_package_identities = installed_packages.map do |p|
             split_package_identity(p["package_identity"])
           end
@@ -108,7 +108,7 @@ class Chef
         end
 
         def new_cab_identity
-          Chef::Log.debug("#{new_resource} getting product version for package at #{cab_file_source}")
+          logger.trace("#{new_resource} getting product version for package at #{cab_file_source}")
           @new_cab_identity ||= cab_identity_from_cab_file
         end
 

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

@@ -25,7 +25,7 @@ class Chef
       class Chocolatey < Chef::Provider::Package
         include Chef::Mixin::PowershellOut
 
-        provides :chocolatey_package, os: "windows"
+        provides :chocolatey_package
 
         # Declare that our arguments should be arrays
         use_multipackage_api
@@ -124,14 +124,6 @@ EOS
           choco_command("uninstall -y", cmd_args(include_source: false), *names)
         end
 
-        # Support :uninstall as an action in order for users to easily convert
-        # from the `chocolatey` provider in the cookbook.  It is, however,
-        # already deprecated.
-        def action_uninstall
-          Chef::Log.deprecation "The use of action :uninstall on the chocolatey_package provider is deprecated, please use :remove"
-          action_remove
-        end
-
         # Choco does not have dpkg's distinction between purge and remove
         alias purge_package remove_package
 

data/lib/chef/provider/package/dnf/python_helper.rb

@@ -64,7 +64,7 @@ class Chef
           def compare_versions(version1, version2)
             with_helper do
               json = build_version_query("versioncompare", [version1, version2])
-              Chef::Log.debug "sending '#{json}' to python helper"
+              Chef::Log.trace "sending '#{json}' to python helper"
               stdin.syswrite json + "\n"
               stdout.sysread(4096).chomp.to_i
             end
@@ -74,12 +74,12 @@ class Chef
           def query(action, provides, version = nil, arch = nil)
             with_helper do
               json = build_query(action, provides, version, arch)
-              Chef::Log.debug "sending '#{json}' to python helper"
+              Chef::Log.trace "sending '#{json}' to python helper"
               stdin.syswrite json + "\n"
               output = stdout.sysread(4096).chomp
-              Chef::Log.debug "got '#{output}' from python helper"
+              Chef::Log.trace "got '#{output}' from python helper"
               version = parse_response(output)
-              Chef::Log.debug "parsed #{version} from python helper"
+              Chef::Log.trace "parsed #{version} from python helper"
               version
             end
           end
@@ -149,14 +149,14 @@ class Chef
             end
             output = drain_stderr
             unless output.empty?
-              Chef::Log.debug "discarding output on stderr from python helper: #{output}"
+              Chef::Log.trace "discarding output on stderr from python helper: #{output}"
             end
             ret
           rescue EOFError, Errno::EPIPE, Timeout::Error, Errno::ESRCH => e
             output = drain_stderr
             if ( max_retries -= 1 ) > 0
               unless output.empty?
-                Chef::Log.debug "discarding output on stderr from python helper: #{output}"
+                Chef::Log.trace "discarding output on stderr from python helper: #{output}"
               end
               restart
               retry

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

@@ -27,7 +27,7 @@ class Chef
         DPKG_INSTALLED = /^Status: install ok installed/
         DPKG_VERSION   = /^Version: (.+)$/
 
-        provides :dpkg_package, os: "linux"
+        provides :dpkg_package
 
         use_multipackage_api
         use_package_name_for_source
@@ -73,17 +73,17 @@ class Chef
 
         def install_package(name, version)
           sources = name.map { |n| name_sources[n] }
-          Chef::Log.info("#{new_resource} installing package(s): #{name.join(' ')}")
+          logger.info("#{new_resource} installing package(s): #{name.join(' ')}")
           run_noninteractive("dpkg", "-i", *options, *sources)
         end
 
         def remove_package(name, version)
-          Chef::Log.info("#{new_resource} removing package(s): #{name.join(' ')}")
+          logger.info("#{new_resource} removing package(s): #{name.join(' ')}")
           run_noninteractive("dpkg", "-r", *options, *name)
         end
 
         def purge_package(name, version)
-          Chef::Log.info("#{new_resource} purging packages(s): #{name.join(' ')}")
+          logger.info("#{new_resource} purging packages(s): #{name.join(' ')}")
           run_noninteractive("dpkg", "-P", *options, *name)
         end
 
@@ -92,12 +92,12 @@ class Chef
         end
 
         def preseed_package(preseed_file)
-          Chef::Log.info("#{new_resource} pre-seeding package installation instructions")
+          logger.info("#{new_resource} pre-seeding package installation instructions")
           run_noninteractive("debconf-set-selections", *preseed_file)
         end
 
         def reconfig_package(name, version)
-          Chef::Log.info("#{new_resource} reconfiguring")
+          logger.info("#{new_resource} reconfiguring")
           run_noninteractive("dpkg-reconfigure", *name)
         end
 
@@ -123,7 +123,7 @@ class Chef
         end
 
         def read_current_version_of_package(package_name)
-          Chef::Log.debug("#{new_resource} checking install state of #{package_name}")
+          logger.trace("#{new_resource} checking install state of #{package_name}")
           status = shell_out_compact_timeout!("dpkg", "-s", package_name, returns: [0, 1])
           package_installed = false
           status.stdout.each_line do |line|
@@ -135,7 +135,7 @@ class Chef
               package_installed = true
             when DPKG_VERSION
               if package_installed
-                Chef::Log.debug("#{new_resource} current version is #{$1}")
+                logger.trace("#{new_resource} current version is #{$1}")
                 return $1
               end
             end
@@ -191,7 +191,7 @@ class Chef
           @name_pkginfo ||=
             begin
               pkginfos = resolved_source_array.map do |src|
-                Chef::Log.debug("#{new_resource} checking #{src} dpkg status")
+                logger.trace("#{new_resource} checking #{src} dpkg status")
                 status = shell_out_compact_timeout!("dpkg-deb", "-W", src)
                 status.stdout
               end

data/lib/chef/provider/package/freebsd/base.rb

@@ -74,10 +74,10 @@ class Chef
             current_resource.package_name(new_resource.package_name)
 
             current_resource.version(current_installed_version)
-            Chef::Log.debug("#{new_resource} current version is #{current_resource.version}") if current_resource.version
+            logger.trace("#{new_resource} current version is #{current_resource.version}") if current_resource.version
 
             @candidate_version = candidate_version
-            Chef::Log.debug("#{new_resource} candidate version is #{@candidate_version}") if @candidate_version
+            logger.trace("#{new_resource} candidate version is #{@candidate_version}") if @candidate_version
 
             current_resource
           end

data/lib/chef/provider/package/freebsd/pkg.rb

@@ -38,11 +38,11 @@ class Chef
                 else
                   shell_out_compact_timeout!("pkg_add", "-r", package_name, env: { "PACKAGEROOT" => new_resource.source, "LC_ALL" => nil }).status
                 end
-                Chef::Log.debug("#{new_resource} installed from: #{new_resource.source}")
+                logger.trace("#{new_resource} installed from: #{new_resource.source}")
 
               when /^\//
                 shell_out_compact_timeout!("pkg_add", file_candidate_version_path, env: { "PKG_PATH" => new_resource.source, "LC_ALL" => nil }).status
-                Chef::Log.debug("#{new_resource} installed from: #{new_resource.source}")
+                logger.trace("#{new_resource} installed from: #{new_resource.source}")
 
               else
                 shell_out_compact_timeout!("pkg_add", "-r", latest_link_name, env: nil).status

data/lib/chef/provider/package/freebsd/pkgng.rb

@@ -29,7 +29,7 @@ class Chef
               case new_resource.source
               when /^(http|ftp|\/)/
                 shell_out_compact_timeout!("pkg", "add", options, new_resource.source, env: { "LC_ALL" => nil }).status
-                Chef::Log.debug("#{new_resource} installed from: #{new_resource.source}")
+                logger.trace("#{new_resource} installed from: #{new_resource.source}")
               else
                 shell_out_compact_timeout!("pkg", "install", "-y", options, name, env: { "LC_ALL" => nil }).status
               end

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

@@ -35,11 +35,11 @@ class Chef
           self.current_resource = Chef::Resource::HomebrewPackage.new(new_resource.name)
           current_resource.package_name(new_resource.package_name)
           current_resource.version(current_installed_version)
-          Chef::Log.debug("#{new_resource} current version is #{current_resource.version}") if current_resource.version
+          logger.trace("#{new_resource} current version is #{current_resource.version}") if current_resource.version
 
           @candidate_version = candidate_version
 
-          Chef::Log.debug("#{new_resource} candidate version is #{@candidate_version}") if @candidate_version
+          logger.trace("#{new_resource} candidate version is #{@candidate_version}") if @candidate_version
 
           current_resource
         end
@@ -126,7 +126,7 @@ class Chef
           homebrew_uid = find_homebrew_uid(new_resource.respond_to?(:homebrew_user) && new_resource.homebrew_user)
           homebrew_user = Etc.getpwuid(homebrew_uid)
 
-          Chef::Log.debug "Executing '#{command.join(' ')}' as user '#{homebrew_user.name}'"
+          logger.trace "Executing '#{command.join(' ')}' as user '#{homebrew_user.name}'"
           # FIXME: this 1800 second default timeout should be deprecated
           output = shell_out_compact_timeout!(*command, timeout: 1800, user: homebrew_uid, environment: { "HOME" => homebrew_user.dir, "RUBYOPT" => nil, "TMPDIR" => nil })
           output.stdout.chomp

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

@@ -27,7 +27,7 @@ class Chef
       class Ips < Chef::Provider::Package
 
         provides :package, platform: %w{openindiana opensolaris omnios solaris2}
-        provides :ips_package, os: "solaris2"
+        provides :ips_package
 
         attr_accessor :virtual
 
@@ -58,7 +58,7 @@ class Chef
         def load_current_resource
           @current_resource = Chef::Resource::IpsPackage.new(new_resource.name)
           current_resource.package_name(new_resource.package_name)
-          Chef::Log.debug("Checking package status for #{new_resource.name}")
+          logger.trace("Checking package status for #{new_resource.name}")
           current_resource.version(get_current_version)
           @candidate_version = get_candidate_version
           current_resource

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

@@ -11,7 +11,7 @@ class Chef
           current_resource.package_name(new_resource.package_name)
 
           current_resource.version(current_installed_version)
-          Chef::Log.debug("#{new_resource} current version is #{current_resource.version}") if current_resource.version
+          logger.trace("#{new_resource} current version is #{current_resource.version}") if current_resource.version
 
           @candidate_version = macports_candidate_version
 
@@ -19,7 +19,7 @@ class Chef
             raise Chef::Exceptions::Package, "Could not get a candidate version for this package -- #{new_resource.name} does not seem to be a valid package!"
           end
 
-          Chef::Log.debug("#{new_resource} candidate version is #{@candidate_version}") if @candidate_version
+          logger.trace("#{new_resource} candidate version is #{@candidate_version}") if @candidate_version
 
           current_resource
         end
@@ -91,7 +91,7 @@ class Chef
             raise Chef::Exceptions::Package, "Could not read from STDOUT on command: #{command}"
           end
           unless status.exitstatus == 0 || status.exitstatus == 1
-            raise Chef::Exceptions::Package, "#{command} failed - #{status.insect}!"
+            raise Chef::Exceptions::Package, "#{command} failed - #{status.inspect}!"
           end
           output
         end

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

@@ -36,7 +36,7 @@ class Chef
         include Chef::Mixin::Uris
         include Chef::Mixin::Checksum
 
-        provides :msu_package, os: "windows"
+        provides :msu_package
 
         def load_current_resource
           @current_resource = Chef::Resource::MsuPackage.new(new_resource.name)
@@ -83,7 +83,7 @@ class Chef
 
         def download_source_file
           source_resource.run_action(:create)
-          Chef::Log.debug("#{new_resource} fetched source file to #{source_resource.path}")
+          logger.trace("#{new_resource} fetched source file to #{source_resource.path}")
           source_resource.path
         end