chef 15.11.3-universal-mingw32 → 16.1.16-universal-mingw32

data/lib/chef/provider/launchd.rb

@@ -36,7 +36,6 @@ class Chef
         label
         mode
         owner
-        path
         source
         session_type
         type
@@ -44,7 +43,6 @@ class Chef
 
       def load_current_resource
         current_resource = Chef::Resource::Launchd.new(new_resource.name)
-        @path = path ? path : gen_path_from_type
       end
 
       def gen_path_from_type
@@ -55,58 +53,68 @@ class Chef
         types[type]
       end
 
-      def action_create
+      action :create do
         manage_plist(:create)
       end
 
-      def action_create_if_missing
+      action :create_if_missing do
         manage_plist(:create_if_missing)
       end
 
-      def action_delete
-        # If you delete a service you want to make sure its not loaded or
-        # the service will be in memory and you wont be able to stop it.
-        if ::File.exists?(@path)
+      action :delete do
+        if ::File.exists?(path)
           manage_service(:disable)
         end
         manage_plist(:delete)
       end
 
-      def action_enable
-        if manage_plist(:create)
-          manage_service(:restart)
-        else
-          manage_service(:enable)
+      action :enable do
+        manage_service(:nothing)
+        manage_plist(:create) do
+          notifies :restart, "macosx_service[#{label}]", :immediately
         end
+        manage_service(:enable)
       end
 
-      def action_disable
+      action :disable do
+        return unless ::File.exist?(path)
+
         manage_service(:disable)
       end
 
-      def action_restart
+      action :restart do
         manage_service(:restart)
       end
 
-      def manage_plist(action)
-        return unless manage_agent?(action)
-
+      def manage_plist(action, &block)
         if source
-          res = cookbook_file_resource
+          cookbook_file path do
+            cookbook_name = new_resource.cookbook if new_resource.cookbook
+            copy_properties_from(new_resource, :backup, :group, :mode, :owner, :source)
+            action(action)
+            only_if { manage_agent?(action) }
+            instance_eval(&block) if block_given?
+          end
         else
-          res = file_resource
+          file path do
+            copy_properties_from(new_resource, :backup, :group, :mode, :owner)
+            content(file_content) if file_content?
+            action(action)
+            only_if { manage_agent?(action) }
+            instance_eval(&block) if block_given?
+          end
         end
-        res.run_action(action)
-        new_resource.updated_by_last_action(true) if res.updated?
-        res.updated
       end
 
       def manage_service(action)
-        return unless manage_agent?(action)
-
-        res = service_resource
-        res.run_action(action)
-        new_resource.updated_by_last_action(true) if res.updated?
+        plist_path = path
+        macosx_service label do
+          service_name(new_resource.label) if new_resource.label
+          plist(plist_path) if plist_path
+          copy_properties_from(new_resource, :session_type)
+          action(action)
+          only_if { manage_agent?(action) }
+        end
       end
 
       def manage_agent?(action)
@@ -127,38 +135,6 @@ class Chef
         true
       end
 
-      def service_resource
-        res = Chef::Resource::MacosxService.new(label, run_context)
-        res.name(label) if label
-        res.service_name(label) if label
-        res.plist(@path) if @path
-        res.session_type(session_type) if session_type
-        res
-      end
-
-      def file_resource
-        res = Chef::Resource::File.new(@path, run_context)
-        res.name(@path) if @path
-        res.backup(backup) if backup
-        res.content(content) if content?
-        res.group(group) if group
-        res.mode(mode) if mode
-        res.owner(owner) if owner
-        res
-      end
-
-      def cookbook_file_resource
-        res = Chef::Resource::CookbookFile.new(@path, run_context)
-        res.cookbook_name = cookbook if cookbook
-        res.name(@path) if @path
-        res.backup(backup) if backup
-        res.group(group) if group
-        res.mode(mode) if mode
-        res.owner(owner) if owner
-        res.source(source) if source
-        res
-      end
-
       def define_resource_requirements
         requirements.assert(
           :create, :create_if_missing, :delete, :enable, :disable
@@ -170,13 +146,13 @@ class Chef
         end
       end
 
-      def content?
-        !!content
+      def file_content?
+        !!file_content
       end
 
-      def content
+      def file_content
         plist_hash = new_resource.plist_hash || gen_hash
-        Plist::Emit.dump(plist_hash) unless plist_hash.nil?
+        ::Plist::Emit.dump(plist_hash) unless plist_hash.nil?
       end
 
       def gen_hash
@@ -230,6 +206,11 @@ class Chef
           memo[val] = new_resource.send(key) if new_resource.send(key)
         end
       end
+
+      # @api private
+      def path
+        @path ||= new_resource.path ? new_resource.path : gen_path_from_type
+      end
     end
   end
 end

data/lib/chef/provider/link.rb

@@ -85,7 +85,7 @@ class Chef
         ChefUtils.windows? ? path.tr("/", '\\') : path
       end
 
-      def action_create
+      action :create do
         # current_resource is the symlink that currently exists
         # new_resource is the symlink we need to create
         #   to - the location to link to
@@ -141,7 +141,7 @@ class Chef
         end
       end
 
-      def action_delete
+      action :delete do
         if current_resource.to # Exists
           if ChefUtils.windows? && ::File.directory?(current_resource.target_file)
             converge_by("delete link to dir at #{new_resource.target_file}") do

data/lib/chef/provider/mount.rb

@@ -37,7 +37,7 @@ class Chef
         self.unmount_retries = 20
       end
 
-      def action_mount
+      action :mount do
         unless current_resource.mounted
           converge_by("mount #{current_resource.device} to #{current_resource.mount_point}") do
             mount_fs
@@ -48,7 +48,7 @@ class Chef
         end
       end
 
-      def action_umount
+      action :umount do
         if current_resource.mounted
           converge_by("unmount #{current_resource.device}") do
             umount_fs
@@ -59,7 +59,7 @@ class Chef
         end
       end
 
-      def action_remount
+      action :remount do
         if current_resource.mounted
           if new_resource.supports[:remount]
             converge_by("remount #{current_resource.device}") do
@@ -82,7 +82,7 @@ class Chef
         end
       end
 
-      def action_enable
+      action :enable do
         unless current_resource.enabled && mount_options_unchanged? && device_unchanged?
           converge_by("enable #{current_resource.device}") do
             enable_fs
@@ -93,7 +93,7 @@ class Chef
         end
       end
 
-      def action_disable
+      action :disable do
         if current_resource.enabled
           converge_by("disable #{current_resource.device}") do
             disable_fs

data/lib/chef/provider/osx_profile.rb

@@ -21,6 +21,7 @@ require_relative "../provider"
 require_relative "../resource"
 require_relative "../resource/file"
 require "uuidtools"
+require "plist"
 
 class Chef
   class Provider
@@ -33,6 +34,7 @@ class Chef
         current_resource.profile_name(new_resource.profile_name)
 
         all_profiles = get_installed_profiles
+        # FIXME: stop mutating the desired state
         new_resource.profile(
           new_resource.profile ||
           new_resource.profile_name
@@ -95,7 +97,7 @@ class Chef
         end
       end
 
-      def action_install
+      action :install do
         unless profile_installed?
           converge_by("install profile #{@new_profile_identifier}") do
             profile_path = write_profile_to_disk
@@ -105,7 +107,7 @@ class Chef
         end
       end
 
-      def action_remove
+      action :remove do
         # Clean up profile after removing it
         if profile_installed?
           converge_by("remove profile #{@new_profile_identifier}") do
@@ -149,6 +151,7 @@ class Chef
             ::File.dirname(cookbook_file)
           )
         )
+        # FIXME: should use a real cookbook file, or document what this craziness is
         remote_file = Chef::Resource::CookbookFile.new(
           ::File.join(
             get_cache_dir,
@@ -180,6 +183,7 @@ class Chef
       end
 
       def write_profile_to_disk
+        # FIXME: use a real chef file resource and stop hacking up tempfiles directly
         new_resource.path(Chef::FileCache.create_cache_path("profiles"))
         tempfile = Chef::FileContentManagement::Tempfile.new(new_resource).tempfile
         tempfile.write(@new_profile_hash.to_plist)
@@ -229,7 +233,7 @@ class Chef
       end
 
       def read_plist(xml_file)
-        Plist.parse_xml(xml_file)
+        ::Plist.parse_xml(xml_file)
       end
 
       def profile_installed?

data/lib/chef/provider/package.rb

@@ -189,7 +189,7 @@ class Chef
         end
       end
 
-      def action_lock
+      action :lock do
         packages_locked = if respond_to?(:packages_all_locked?, true)
                             packages_all_locked?(Array(new_resource.package_name), Array(new_resource.version))
                           else
@@ -208,7 +208,7 @@ class Chef
         end
       end
 
-      def action_unlock
+      action :unlock do
         packages_unlocked = if respond_to?(:packages_all_unlocked?, true)
                               packages_all_unlocked?(Array(new_resource.package_name), Array(new_resource.version))
                             else

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

@@ -21,6 +21,7 @@ require_relative "../../resource/cab_package"
 require_relative "../../mixin/shell_out"
 require_relative "../../mixin/uris"
 require_relative "../../mixin/checksum"
+require "cgi" unless defined?(CGI)
 
 class Chef
   class Provider
@@ -45,13 +46,11 @@ class Chef
         end
 
         def download_source_file
-          source_resource.run_action(:create)
-          logger.trace("#{new_resource} fetched source file to #{source_resource.path}")
           source_resource.path
         end
 
         def source_resource
-          @source_resource ||= declare_resource(:remote_file, new_resource.name) do
+          declare_resource(:remote_file, new_resource.name) do
             path default_download_cache_path
             source new_resource.source
             backup false
@@ -60,7 +59,7 @@ class Chef
 
         def default_download_cache_path
           uri = ::URI.parse(new_resource.source)
-          filename = ::File.basename(::URI.unescape(uri.path))
+          filename = ::File.basename(::CGI.unescape(uri.path))
           file_cache_dir = Chef::FileCache.create_cache_path("package/")
           Chef::Util::PathHelper.cleanpath("#{file_cache_dir}/#{filename}")
         end
@@ -75,7 +74,7 @@ class Chef
 
         def dism_command(command)
           with_os_architecture(nil) do
-            result = shell_out("dism.exe /Online /English #{command} /NoRestart", { timeout: new_resource.timeout })
+            result = shell_out("dism.exe /Online /English #{command} /NoRestart", timeout: new_resource.timeout)
             if result.exitstatus == -2146498530
               raise Chef::Exceptions::Package, "The specified package is not applicable to this image." if result.stdout.include?("0x800f081e")
 
@@ -94,7 +93,7 @@ class Chef
             split_package_identity(p["package_identity"])
           end
           found_packages = existing_package_identities.select do |existing_package_ident|
-            existing_package_ident["name"] == package["name"]
+            existing_package_ident["version"] == package["version"].chomp && existing_package_ident["name"] == package["name"]
           end
           if found_packages.empty?
             nil

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

@@ -17,14 +17,12 @@
 
 require_relative "../package"
 require_relative "../../resource/chocolatey_package"
-require_relative "../../mixin/powershell_out"
 require_relative "../../win32/api/command_line_helper" if ChefUtils.windows?
 
 class Chef
   class Provider
     class Package
       class Chocolatey < Chef::Provider::Package
-        include Chef::Mixin::PowershellOut
         include Chef::ReservedNames::Win32::API::CommandLineHelper if ChefUtils.windows?
 
         provides :chocolatey_package
@@ -251,7 +249,7 @@ class Chef
         end
 
         # Helper to convert choco.exe list output to a Hash
-        # (names are downcased for case-insenstive matching)
+        # (names are downcased for case-insensitive matching)
         #
         # @param cmd [String] command to run
         # @return [Hash] list output converted to ruby Hash

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

@@ -118,23 +118,79 @@ class Chef
           flushcache
         end
 
+        # NB: the dnf_package provider manages individual single packages, please do not submit issues or PRs to try to add wildcard
+        # support to lock / unlock.  The best solution is to write an execute resource which does a not_if `dnf versionlock | grep '^pattern`` kind of approach
+        def lock_package(names, versions)
+          dnf("-d0", "-e0", "-y", options, "versionlock", "add", resolved_package_lock_names(names))
+        end
+
+        # NB: the dnf_package provider manages individual single packages, please do not submit issues or PRs to try to add wildcard
+        # support to lock / unlock.  The best solution is to write an execute resource which does a only_if `dnf versionlock | grep '^pattern`` kind of approach
+        def unlock_package(names, versions)
+          # dnf versionlock delete on rhel6 needs the glob nonsense in the following command
+          dnf("-d0", "-e0", "-y", options, "versionlock", "delete", resolved_package_lock_names(names).map { |n| "*:#{n}-*" })
+        end
+
         private
 
-        def resolve_source_to_version_obj
-          shell_out!("rpm -qp --queryformat '%{NAME} %{EPOCH} %{VERSION} %{RELEASE} %{ARCH}\n' #{new_resource.source}").stdout.each_line do |line|
-            # this is another case of committing the sin of doing some lightweight mangling of RPM versions in ruby -- but the output of the rpm command
-            # does not match what the dnf library accepts.
-            case line
-            when /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)$/
-              return Version.new($1, "#{$2 == "(none)" ? "0" : $2}:#{$3}-#{$4}", $5)
+        # this will resolve things like `/usr/bin/perl` or virtual packages like `mysql` -- it will not work (well? at all?) with globs that match multiple packages
+        def resolved_package_lock_names(names)
+          names.each_with_index.map do |name, i|
+            unless name.nil?
+              if installed_version(i).version.nil?
+                available_version(i).name
+              else
+                installed_version(i).name
+              end
             end
           end
         end
 
+        def locked_packages
+          @locked_packages ||=
+            begin
+              locked = dnf("versionlock", "list")
+              locked.stdout.each_line.map do |line|
+                line.sub(/-[^-]*-[^-]*$/, "").split(":").last.strip
+              end
+            end
+        end
+
+        def packages_all_locked?(names, versions)
+          resolved_package_lock_names(names).all? { |n| locked_packages.include? n }
+        end
+
+        def packages_all_unlocked?(names, versions)
+          !resolved_package_lock_names(names).any? { |n| locked_packages.include? n }
+        end
+
+        def version_gt?(v1, v2)
+          return false if v1.nil? || v2.nil?
+
+          python_helper.compare_versions(v1, v2) == 1
+        end
+
+        def version_equals?(v1, v2)
+          return false if v1.nil? || v2.nil?
+
+          python_helper.compare_versions(v1, v2) == 0
+        end
+
         def version_compare(v1, v2)
           python_helper.compare_versions(v1, v2)
         end
 
+        def resolve_source_to_version_obj
+          shell_out!("rpm -qp --queryformat '%{NAME} %{EPOCH} %{VERSION} %{RELEASE} %{ARCH}\n' #{new_resource.source}").stdout.each_line do |line|
+            # this is another case of committing the sin of doing some lightweight mangling of RPM versions in ruby -- but the output of the rpm command
+            # does not match what the yum library accepts.
+            case line
+              when /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)$/
+                return Version.new($1, "#{$2 == "(none)" ? "0" : $2}:#{$3}-#{$4}", $5)
+            end
+          end
+        end
+
         # @return Array<Version>
         def available_version(index)
           @available_version ||= []
@@ -142,7 +198,7 @@ class Chef
           @available_version[index] ||= if new_resource.source
                                           resolve_source_to_version_obj
                                         else
-                                          python_helper.query(:whatavailable, package_name_array[index], safe_version_array[index], safe_arch_array[index])
+                                          python_helper.package_query(:whatavailable, package_name_array[index], version: safe_version_array[index], arch: safe_arch_array[index], options: options)
                                         end
 
           @available_version[index]
@@ -152,9 +208,9 @@ class Chef
         def installed_version(index)
           @installed_version ||= []
           @installed_version[index] ||= if new_resource.source
-                                          python_helper.query(:whatinstalled, available_version(index).name, safe_version_array[index], safe_arch_array[index])
+                                          python_helper.package_query(:whatinstalled, available_version(index).name, arch: safe_arch_array[index], options: options)
                                         else
-                                          python_helper.query(:whatinstalled, package_name_array[index], safe_version_array[index], safe_arch_array[index])
+                                          python_helper.package_query(:whatinstalled, package_name_array[index], arch: safe_arch_array[index], options: options)
                                         end
           @installed_version[index]
         end