chef 16.16.13-universal-mingw32 → 16.17.4-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9564024385d182e88f1a211b59bccbc795f6644f8f06607cc082f5d68b98ab79
-  data.tar.gz: abfbb09eb5cd24e27ad226cfb4fe1be8419f4f9525e86e26b5a8fa2655ae25b1
+  metadata.gz: 89904622cc4db2281cdad6b5c8927c622fdc1997f73d232cd5c9e10f8ad68ba9
+  data.tar.gz: d9ded46dc296fc32c9478e74636d5241a31735923be4c73b29bb668c56312c48
 SHA512:
-  metadata.gz: 769cb57fa36c434a5cffaa6bed4ab64eba0bc2bde9eab12742053c5c009794d6b68970e3384fe273b39709deee4e5d990d9485b5b93e7a8b20aaf92baefcee24
-  data.tar.gz: 8f2688afa9eba9f46e1ffa0a01bdfd5335add44db8227e12e7e41a9b555278efb7294dc461a90170afa3fb58e7dd4501386ea769ec89c24cdbfe7965d90ecc7b
+  metadata.gz: ba2d1c45cd1a2a121b23b04a8cd1e0b252567fe89c59eacbe60e7ceb0e89dc9690985b1a40662ec6db09124fec28f4ec65464f328c3605cd063ba3864518ba7f
+  data.tar.gz: 7d449a3247ca722cdf295c3c097933e7412942a5ded946ac3d1f8907d2703685f1439c75537655b280d4911a9dd1b4cdbb824f4a03428e2b68884d96e6b02960

data/lib/chef/action_collection.rb

@@ -128,7 +128,7 @@ class Chef
     #
     def cookbook_compilation_start(run_context)
       run_context.action_collection = self
-      # fire the action_colleciton_registration hook after cookbook_compilation_start -- last chance for consumers to register
+      # fire the action_collection_registration hook after cookbook_compilation_start -- last chance for consumers to register
       run_context.events.enqueue(:action_collection_registration, self)
       @run_context = run_context
     end

data/lib/chef/application.rb

@@ -310,7 +310,7 @@ class Chef
       logger.info "Forking #{ChefUtils::Dist::Infra::PRODUCT} instance to converge..."
       pid = fork do
         # Want to allow forked processes to finish converging when
-        # TERM singal is received (exit gracefully)
+        # TERM signal is received (exit gracefully)
         trap("TERM") do
           logger.debug("SIGTERM received during converge," +
             " finishing converge to exit normally (send SIGINT to terminate immediately)")

data/lib/chef/data_collector/run_end_message.rb

@@ -128,7 +128,7 @@ class Chef
 
           if new_resource.cookbook_name
             hash["cookbook_name"]    = new_resource.cookbook_name
-            hash["cookbook_version"] = new_resource.cookbook_version.version
+            hash["cookbook_version"] = new_resource.cookbook_version&.version
             hash["recipe_name"]      = new_resource.recipe_name
           end
 

data/lib/chef/resource/chef_client_trusted_certificate.rb

@@ -75,6 +75,7 @@ class Chef
         file cert_path do
           content new_resource.certificate
           mode "0640"
+          sensitive new_resource.sensitive
         end
       end
 

data/lib/chef/resource.rb

@@ -1513,7 +1513,7 @@ class Chef
     # @return Chef::CookbookVersion The cookbook in which this Resource was defined.
     #
     def cookbook_version
-      if cookbook_name
+      if cookbook_name && cookbook_name != "@recipe_files"
         run_context.cookbook_collection[cookbook_name]
       end
     end

data/lib/chef/resource_reporter.rb

@@ -41,7 +41,7 @@ class Chef
       as_hash["result"] = action_record.action.to_s
       if new_resource.cookbook_name
         as_hash["cookbook_name"] = new_resource.cookbook_name
-        as_hash["cookbook_version"] = new_resource.cookbook_version.version
+        as_hash["cookbook_version"] = new_resource.cookbook_version&.version
       end
 
       as_hash

data/lib/chef/shell/ext.rb

@@ -198,9 +198,9 @@ module Shell
           prints a detailed explanation of the command if available, or the
           description if no explanation is available.
       E
-      def help(commmand = nil)
-        if commmand
-          explain_command(commmand)
+      def help(command = nil)
+        if command
+          explain_command(command)
         else
           puts help_banner
         end

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("16.16.13")
+  VERSION = Chef::VersionString.new("16.17.4")
 end
 
 #

data/spec/integration/knife/delete_spec.rb

@@ -992,7 +992,7 @@ describe "knife delete", :workstation do
     end
 
     it "knife delete /policies/x-1.2.3.json succeeds" do
-      knife("raw /policies/x/revisions/1.2.3").should_succeed "{\n  \"name\": \"x\",\n  \"revision_id\": \"1.2.3\",\n  \"run_list\": [\n\n  ],\n  \"cookbook_locks\": {\n\n  }\n}\n"
+      knife("raw /policies/x/revisions/1.2.3").should_succeed "{\n  \"policy_group_list\": [\n    \"x\"\n  ],\n  \"name\": \"x\",\n  \"revision_id\": \"1.2.3\",\n  \"run_list\": [\n\n  ],\n  \"cookbook_locks\": {\n\n  }\n}\n"
       knife("delete /policies/x-1.2.3.json").should_succeed "Deleted /policies/x-1.2.3.json\n"
       knife("raw /policies/x/revisions/1.2.3").should_fail(/404/)
     end

data/spec/integration/knife/download_spec.rb

@@ -1276,8 +1276,8 @@ describe "knife download", :workstation do
             file "members.json", [ "bar" ]
             file "nodes/x.json", { "normal" => { "tags" => [] } }
             file "org.json", { "full_name" => "Something" }
-            file "policies/x-1.0.0.json", {}
-            file "policies/blah-1.0.0.json", {}
+            file "policies/x-1.0.0.json", { "policy_group_list" => [ "x" ] }
+            file "policies/blah-1.0.0.json", { "policy_group_list" => [ "x" ] }
             file "policy_groups/x.json", { "policies" => { "x" => { "revision_id" => "1.0.0" }, "blah" => { "revision_id" => "1.0.0" } } }
             file "roles/x.json", {}
           end

data/spec/integration/knife/upload_spec.rb

@@ -1383,8 +1383,8 @@ describe "knife upload", :workstation do
           file "members.json", [ "bar" ]
           file "org.json", { "full_name" => "wootles" }
           file "nodes/x.json", { "normal" => { "tags" => [] } }
-          file "policies/x-1.0.0.json", {}
-          file "policies/blah-1.0.0.json", {}
+          file "policies/x-1.0.0.json", { "policy_group_list" => [ "x" ] }
+          file "policies/blah-1.0.0.json", { "policy_group_list" => [ "x" ] }
           file "policy_groups/x.json", { "policies" => { "x" => { "revision_id" => "1.0.0" }, "blah" => { "revision_id" => "1.0.0" } } }
           file "roles/x.json", {}
         end
@@ -1484,12 +1484,11 @@ describe "knife upload", :workstation do
             environment "x", { "description" => "foo" }
             group "x", { "groups" => [ "admin" ] }
             node "x", { "run_list" => [ "blah" ] }
-            policy "x", "1.0.0", {}
-            policy "x", "1.0.1", {}
-            policy "y", "1.0.0", {}
+            policy "x", "1.0.0", { "policy_group_list" => [ "x" ] }
+            policy "y", "1.0.0", { "policy_group_list" => [ "x" ] }
             policy_group "x", {
               "policies" => {
-                "x" => { "revision_id" => "1.0.1" },
+                "x" => { "revision_id" => "1.0.0" },
                 "y" => { "revision_id" => "1.0.0" },
               },
             }

data/spec/unit/data_collector_spec.rb

@@ -164,7 +164,7 @@ describe Chef::DataCollector do
       "after" => after_resource&.state_for_resource_reporter || {},
       "before" => before_resource&.state_for_resource_reporter || {},
       "cookbook_name" => cookbook_name,
-      "cookbook_version" => cookbook_version.version,
+      "cookbook_version" => cookbook_version&.version,
       "delta" => resource_has_diff(new_resource, status) ? new_resource.diff : "",
       "duration" => duration,
       "id" => new_resource.identity,
@@ -567,6 +567,29 @@ describe Chef::DataCollector do
         it_behaves_like "sends a converge message"
       end
 
+      context "when the run contains a file resource that is up-to-date from a @recipe_files, returns nil for the version" do
+        let(:total_resource_count) { 1 }
+        let(:updated_resource_count) { 0 }
+        let(:cookbook_name) { "@recipe_files" }
+        let(:resource_record) { [ resource_record_for(new_resource, current_resource, after_resource, :create, "up-to-date", "1234") ] }
+        let(:status) { "success" }
+        let(:cookbook_version) { nil }
+
+        before do
+          allow(new_resource).to receive(:cookbook_version).and_call_original
+          events.resource_action_start(new_resource, :create)
+          events.resource_current_state_loaded(new_resource, :create, current_resource)
+          events.resource_up_to_date(new_resource, :create)
+          events.resource_after_state_loaded(new_resource, :create, after_resource)
+          new_resource.instance_variable_set(:@elapsed_time, 1.2345)
+          events.resource_completed(new_resource)
+          events.converge_complete
+          run_status.stop_clock
+        end
+
+        it_behaves_like "sends a converge message"
+      end
+
       context "when the run contains a file resource that is updated" do
         let(:total_resource_count) { 1 }
         let(:updated_resource_count) { 1 }

data/spec/unit/resource/chef_client_trusted_certificate_spec.rb

@@ -51,4 +51,18 @@ describe Chef::Resource::ChefClientTrustedCertificate do
       expect(provider.cert_path).to match(%r{trusted_certs/something.pem$})
     end
   end
+
+  describe "sensitive attribute" do
+    context "should be insensitive by default" do
+      it { expect(resource.sensitive).to(be_falsey) }
+    end
+
+    context "when set" do
+      before { resource.sensitive(true) }
+
+      it "should be set on the resource" do
+        expect(resource.sensitive).to(be_truthy)
+      end
+    end
+  end
 end

data/spec/unit/resource_spec.rb

@@ -348,6 +348,11 @@ describe Chef::Resource do
     it "should recognize dynamically defined resources" do
       expect(resource.defined_at).to eq("dynamically defined")
     end
+
+    it "should return nil for the cookbook_version when the cookbook_name is @recipe_files" do
+      resource.cookbook_name = "@recipe_files"
+      expect(resource.cookbook_version).to be nil
+    end
   end
 
   describe "to_s" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 16.16.13
+  version: 16.17.4
 platform: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.16.13
+        version: 16.17.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.16.13
+        version: 16.17.4
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.16.13
+        version: 16.17.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.16.13
+        version: 16.17.4
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement