chef 18.0.169 → 18.0.185

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a87965b9d23cae217ee13ee9c4944a7558d55bfb6124eed4b09852305a4dc1c2
-  data.tar.gz: dfb528c686c6e0d708e2ce1610ed6e51f2a1b7e078548c472873bb15c942127d
+  metadata.gz: 5e26d247c5f5a3d647c5fab3090148d07e5714d73f5b51e79ac836ef4abfb8cb
+  data.tar.gz: f31e1d3a651490f209276bf1583310940eaa67391d6879c50704504bdfdfe928
 SHA512:
-  metadata.gz: 66df75dfd9ed14186747c2f4f4f89abe73b1cd00d798a1e68ad4219a6694ac1aad5d05228c85d9af75b86bd14b30c5222342be69a6503ff44453192e0970e722
-  data.tar.gz: dcda678decee792fc8b144f846b3eb268c4e0aa619afbebd2b67c2ad3a71bb72ea3c0032f349060b461042cacc50eb1e27e5de00722f37e43274e1f89e627246
+  metadata.gz: 860f0b162f5ebbd6d8e40383aeb682df596dc0ac09207d5bb5be807ff5de0359e50f22f603a94e385b95b1c03cf87286c056dfc160a523ced7e6902960ae5b7c
+  data.tar.gz: 8e3c3dc548d6cabd651adb17a150a91dec76c09d1d93a2b3e9561d0ff3abf69ad9301b4368901a1dc2015241cec589da5861a3642e70ce05f0356bd045e10c86

data/chef.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
-  s.add_dependency "train-core", "~> 3.10", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
+  s.add_dependency "train-core", "~> 3.10" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
   s.add_dependency "train-winrm", ">= 0.2.5"
   s.add_dependency "train-rest", ">= 0.4.1" # target mode with rest APIs
 
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "ffi", ">= 1.15.5"
   s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0" # remote_file resource
+  s.add_dependency "net-sftp", ">= 2.1.2", "< 5.0" # remote_file resource
   s.add_dependency "net-ftp" # remote_file resource
   s.add_dependency "erubis", "~> 2.7" # template resource / cookbook syntax check
   s.add_dependency "diff-lcs", ">= 1.2.4", "!= 1.4.0", "< 1.6.0" # 1.4 breaks output. Used in lib/chef/util/diff

data/lib/chef/mixin/checksum.rb

@@ -31,6 +31,12 @@ class Chef
 
         checksum.slice(0, 6)
       end
+
+      def checksum_match?(ref_checksum, diff_checksum)
+        return false if ref_checksum.nil? || diff_checksum.nil?
+
+        ref_checksum.casecmp?(diff_checksum)
+      end
     end
   end
 end

data/lib/chef/provider/cron.rb

@@ -88,7 +88,11 @@ class Chef
 
       def cron_different?
         CRON_ATTRIBUTES.any? do |cron_var|
-          new_resource.send(cron_var) != current_resource.send(cron_var)
+          if new_resource.send(cron_var).class == current_resource.send(cron_var).class
+            new_resource.send(cron_var) != current_resource.send(cron_var)
+          else
+            new_resource.send(cron_var).to_s != current_resource.send(cron_var).to_s
+          end
         end
       end
 

data/lib/chef/provider/file.rb

@@ -336,7 +336,7 @@ class Chef
       end
 
       def do_validate_content
-        if new_resource.checksum && tempfile && ( new_resource.checksum != tempfile_checksum )
+        if new_resource.checksum && tempfile && !checksum_match?(new_resource.checksum, tempfile_checksum)
           raise Chef::Exceptions::ChecksumMismatch.new(short_cksum(new_resource.checksum), short_cksum(tempfile_checksum))
         end
 
@@ -450,7 +450,7 @@ class Chef
 
       def contents_changed?
         logger.trace "calculating checksum of #{tempfile.path} to compare with #{current_resource.checksum}"
-        tempfile_checksum != current_resource.checksum
+        !checksum_match?(tempfile_checksum, current_resource.checksum)
       end
 
       def tempfile

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

@@ -66,7 +66,7 @@ class Chef
           if new_resource.source
             install_snap_from_source(names, new_resource.source)
           else
-            install_snaps(names)
+            install_snaps(names, versions)
           end
         end
 

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

@@ -38,7 +38,7 @@ class Chef
         def define_resource_requirements
           if new_resource.checksum
             requirements.assert(:install) do |a|
-              a.assertion { new_resource.checksum == checksum(source_location) }
+              a.assertion { checksum_match?(new_resource.checksum, checksum(source_location)) }
               a.failure_message Chef::Exceptions::Package, "Checksum on resource (#{short_cksum(new_resource.checksum)}) does not match checksum on content (#{short_cksum(source_location)})"
             end
           end

data/lib/chef/resource/apt_package.rb

@@ -56,6 +56,8 @@ class Chef
 
       description "Use the **apt_package** resource to manage packages on Debian, Ubuntu, and other platforms that use the APT package system."
 
+      allowed_actions :install, :upgrade, :remove, :purge, :reconfig, :lock, :unlock
+
       property :default_release, String,
         description: "The default release. For example: `stable`.",
         desired_state: false

data/lib/chef/resource/chef_client_config.rb

@@ -255,7 +255,7 @@ class Chef
       action :create, description: "Create a client.rb config file and folders for configuring #{ChefUtils::Dist::Infra::PRODUCT}." do
         [
           new_resource.config_directory,
-          (::File.dirname(new_resource.log_location) unless new_resource.log_location.nil?),
+          (::File.dirname(new_resource.log_location) if new_resource.log_location.is_a?(String) && !%w{STDOUT STDERR}.include?(new_resource.log_location) && !new_resource.log_location.empty?),
           new_resource.file_backup_path,
           new_resource.file_cache_path,
           ::File.join(new_resource.config_directory, "client.d"),
@@ -265,7 +265,7 @@ class Chef
           directory dir_path do
             user new_resource.user unless new_resource.user.nil?
             group new_resource.group unless new_resource.group.nil?
-            mode dir_path == ::File.dirname(new_resource.log_location) ? "0755" : "0750"
+            mode dir_path == ::File.dirname(new_resource.log_location.to_s) ? "0755" : "0750"
             recursive true
           end
         end

data/lib/chef/resource/dmg_package.rb

@@ -57,6 +57,8 @@ class Chef
         ```
       DOC
 
+      allowed_actions :install
+
       property :app, String,
         description: "The name of the application as it appears in the `/Volumes` directory if it differs from the resource block's name.",
         name_property: true

data/lib/chef/resource/freebsd_package.rb

@@ -30,6 +30,8 @@ class Chef
 
       description "Use the **freebsd_package** resource to manage packages for the FreeBSD platform."
 
+      allowed_actions :install, :remove
+
       # make sure we assign the appropriate underlying providers based on what
       # package managers exist on this FreeBSD system or the source of the package
       #

data/lib/chef/resource/gem_package.rb

@@ -59,6 +59,8 @@ class Chef
         ```
       EXAMPLES
 
+      allowed_actions :install, :upgrade, :remove, :purge
+
       property :package_name, String,
         description: "An optional property to set the package name if it differs from the resource block's name.",
         identity: true

data/lib/chef/resource/homebrew_package.rb

@@ -60,6 +60,8 @@ class Chef
       ```
       DOC
 
+      allowed_actions :install, :upgrade, :remove, :purge
+
       property :homebrew_user, [ String, Integer ],
         description: "The name or uid of the Homebrew owner to be used by #{ChefUtils::Dist::Infra::PRODUCT} when executing a command.\n\n#{ChefUtils::Dist::Infra::PRODUCT}, by default, will attempt to execute a Homebrew command as the owner of the `/usr/local/bin/brew` executable. If that executable does not exist, #{ChefUtils::Dist::Infra::PRODUCT} will attempt to find the user by executing `which brew`. If that executable cannot be found, #{ChefUtils::Dist::Infra::PRODUCT} will print an error message: `Could not find the 'brew' executable in /usr/local/bin or anywhere on the path.`.\n\nSet this property to specify the Homebrew owner for situations where Chef Infra Client cannot automatically detect the correct owner.'"
 

data/lib/chef/resource/macports_package.rb

@@ -25,6 +25,8 @@ class Chef
 
       description "Use the **macports_package** resource to manage packages for the macOS platform using the MacPorts package management system."
 
+      allowed_actions :install, :upgrade, :remove, :purge
+
       property :package_name, String,
         description: "An optional property to set the package name if it differs from the resource block's name.",
         identity: true

data/lib/chef/resource/openbsd_package.rb

@@ -48,6 +48,8 @@ class Chef
         ```
       DOC
 
+      allowed_actions :install, :remove
+
       property :package_name, String,
         description: "An optional property to set the package name if it differs from the resource block's name.",
         identity: true

data/lib/chef/resource/pacman_package.rb

@@ -24,6 +24,8 @@ class Chef
 
       provides :pacman_package
 
+      allowed_actions :install, :upgrade, :remove, :purge
+
       description "Use the **pacman_package** resource to manage packages (using pacman) on the Arch Linux platform."
     end
   end

data/lib/chef/resource/portage_package.rb

@@ -26,6 +26,8 @@ class Chef
 
       description "Use the **portage_package** resource to manage packages for the Gentoo platform."
 
+      allowed_actions :install, :upgrade, :remove, :purge
+
       property :package_name, String,
         description: "An optional property to set the package name if it differs from the resource block's name.",
         identity: true

data/lib/chef/resource/rpm_package.rb

@@ -24,6 +24,8 @@ class Chef
 
       provides :rpm_package
 
+      allowed_actions :install, :upgrade, :remove
+
       description "Use the **rpm_package** resource to manage packages using the RPM Package Manager."
 
       property :allow_downgrade, [ TrueClass, FalseClass ],

data/lib/chef/resource/smartos_package.rb

@@ -27,6 +27,8 @@ class Chef
 
       description "Use the **smartos_package** resource to manage packages for the SmartOS platform."
 
+      allowed_actions :install, :upgrade, :remove
+
       property :package_name, String,
         description: "An optional property to set the package name if it differs from the resource block's name.",
         identity: true

data/lib/chef/resource/snap_package.rb

@@ -27,6 +27,8 @@ class Chef
       description "Use the **snap_package** resource to manage snap packages on Debian and Ubuntu platforms."
       introduced "15.0"
 
+      allowed_actions :install, :upgrade, :remove, :purge
+
       property :channel, String,
         description: "The default channel. For example: stable.",
         default: "stable",

data/lib/chef/resource/solaris_package.rb

@@ -27,6 +27,8 @@ class Chef
 
       description "Use the **solaris_package** resource to manage packages on the Solaris platform."
 
+      allowed_actions :install, :upgrade, :remove
+
       property :package_name, String,
         description: "An optional property to set the package name if it differs from the resource block's name.",
         identity: true

data/lib/chef/resource/windows_package.rb

@@ -78,7 +78,7 @@ class Chef
       ```ruby
       windows_package '7zip' do
         source 'http://www.7-zip.org/a/7z938-x64.msi'
-        checksum '7c8e873991c82ad9cfc123415254ea6101e9a645e12977dcd518979e50fdedf3'
+        checksum '7c8e873991c82ad9cfcdbdf45254ea6101e9a645e12977dcd518979e50fdedf3'
       end
       ```
 
@@ -91,7 +91,7 @@ class Chef
         source 'http://www.7-zip.org/a/7z938-x64.msi'
         remote_file_attributes ({
           :path => 'C:\\7zip.msi',
-          :checksum => '7c8e873991c82ad9cfc123415254ea6101e9a645e12977dcd518979e50fdedf3'
+          :checksum => '7c8e873991c82ad9cfcdbdf45254ea6101e9a645e12977dcd518979e50fdedf3'
         })
       end
       ```
@@ -100,7 +100,7 @@ class Chef
 
       ```ruby
       windows_package 'Mercurial 3.6.1 (64-bit)' do
-        source 'http://mercurial.selenic.com/release/windows/Mercurial-3.6.1-x64.exe'
+        source 'https://www.mercurial-scm.org/release/windows/Mercurial-3.6.1-x64.exe'
         checksum 'febd29578cb6736163d232708b834a2ddd119aa40abc536b2c313fc5e1b5831d'
       end
       ```

data/lib/chef/resource/yum_package.rb

@@ -109,6 +109,8 @@ class Chef
         ```
       DOC
 
+      allowed_actions :install, :upgrade, :remove, :purge, :lock, :unlock
+
       # XXX: the coercions here are due to the provider promiscuously updating the properties on the
       # new_resource which causes immutable modification exceptions when passed an immutable node array.
       #

data/lib/chef/resource/zypper_package.rb

@@ -53,6 +53,8 @@ class Chef
         ```
       DOC
 
+      allowed_actions :install, :upgrade, :remove, :purge, :lock, :unlock
+
       property :gpg_check, [ TrueClass, FalseClass ],
         description: "Verify the package's GPG signature. Can also be controlled site-wide using the `zypper_check_gpg` config option.",
         default: lazy { Chef::Config[:zypper_check_gpg] }, default_description: "true"

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("18.0.169")
+  VERSION = Chef::VersionString.new("18.0.185")
 end
 
 #

data/spec/unit/mixin/checksum_spec.rb

@@ -51,4 +51,32 @@ describe Chef::Mixin::Checksum do
     end
   end
 
+  describe "checksum_match?" do
+    context "when checksum cases match" do
+      it "returns true" do
+        expect(@checksum_user.checksum_match?("u7ghbxikk3i9blsimmy2y2ionmxx", "u7ghbxikk3i9blsimmy2y2ionmxx")).to be true
+      end
+    end
+
+    context "when one checksum is uppercase and other is lowercase" do
+      it "returns true" do
+        expect(@checksum_user.checksum_match?("U7GHBXIKK3I9BLSIMMY2Y2IONMXX", "u7ghbxikk3i9blsimmy2y2ionmxx")).to be true
+      end
+    end
+
+    context "when checksums do not match" do
+      it "returns false" do
+        expect(@checksum_user.checksum_match?("u7ghbxikk3i9blsimmy2y2ionmxx", "09ee9c8cc70501763563bcf9c218")).to be false
+      end
+    end
+
+    context "when checksum is nil" do
+      it "returns false" do
+        expect(@checksum_user.checksum_match?("u7ghbxikk3i9blsimmy2y2ionmxx", nil)).to be false
+        expect(@checksum_user.checksum_match?(nil, "09ee9c8cc70501763563bcf9c218")).to be false
+        expect(@checksum_user.checksum_match?(nil, nil)).to be false
+      end
+    end
+  end
+
 end

data/spec/unit/provider/cron_spec.rb

@@ -769,6 +769,42 @@ describe Chef::Provider::Cron do
         end
       end
 
+      context "when integers are provided to the resource to express time values" do
+        it "should not report any difference" do
+          @new_resource.minute(1)
+          @new_resource.hour(1)
+          @new_resource.day(1)
+          @new_resource.month(1)
+          @new_resource.weekday(1)
+          allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+            # Chef Name: cronhole some stuff
+            1 1 1 1 1 /bin/true
+
+          CRONTAB
+
+          @provider.run_action(:create)
+          expect(@new_resource).not_to be_updated_by_last_action
+        end
+      end
+
+      context "when strings are provided to the resource to express time values" do
+        it "should not report any difference" do
+          @new_resource.minute("1")
+          @new_resource.hour("1")
+          @new_resource.day("1")
+          @new_resource.month("1")
+          @new_resource.weekday("1")
+          allow(@provider).to receive(:read_crontab).and_return(<<~CRONTAB)
+            # Chef Name: cronhole some stuff
+            1 1 1 1 1 /bin/true
+
+          CRONTAB
+
+          @provider.run_action(:create)
+          expect(@new_resource).not_to be_updated_by_last_action
+        end
+      end
+
       context "when environment variable is used" do
         before :each do
           @provider.cron_exists = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 18.0.169
+  version: 18.0.185
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.0.169
+        version: 18.0.185
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.0.169
+        version: 18.0.185
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.0.169
+        version: 18.0.185
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.0.169
+        version: 18.0.185
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -45,9 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,9 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.28
 - !ruby/object:Gem::Dependency
   name: train-winrm
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +265,7 @@ dependencies:
         version: 2.1.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -281,7 +275,7 @@ dependencies:
         version: 2.1.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: net-ftp
   requirement: !ruby/object:Gem::Requirement