chef 17.9.26 → 17.9.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36dbce2fafed93ea8c76e98161ac43fd4e11dfece0cfaffb37de8ccc0e6d3635
-  data.tar.gz: 0bf1c93e247430baf36b78eb3b942ba1037f9c23429efc5f05fa9e5ff3ed4bfa
+  metadata.gz: 81905931cf4ca87528c65bb2be19f6656fcbf6754612da872f3c74e9c0e8753f
+  data.tar.gz: 75e630d0ac718daabb1854788c2428b765ea05229a25a21974812b5e4063a30a
 SHA512:
-  metadata.gz: d8054644c9e4cf9ead5fc960de3f4561d78afd86cb5b43cfb9893cfc772726a4a6c262dfd9bcff44bfea6a047515f93b78dec98d52afa7d0d764beee2fa68380
-  data.tar.gz: 7e57743c2142e7d979a679593d035916c46fb85290c49f059f49830d075dbd343c122dd0b8546912482b6f4ef7108cd780a36836c1b6005cca9f269351318917
+  metadata.gz: db10283eb9a37f5b8dfd7223583eba74dc536277de8c5d424872c66b36102b505b07de211e9cd6022aa03d371339ebbc97846f5d3e534bbdf10896bde43fcb7a
+  data.tar.gz: 5bcaf6a2182e345138d53e67967a5b956c4bcdfd700f8c8b35994a15d71a0e5ed87a8327ccc6a7cb690b52c8c4043db1df65f16509b6268d7bc2a8169ef76875

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "chef", path: "."
 
-gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main"
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "17-stable"
 
 gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__))
 gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__))
@@ -15,7 +15,7 @@ else
   gem "chef-bin" # rubocop:disable Bundler/DuplicatedGem
 end
 
-gem "cheffish", ">= 17"
+gem "cheffish", "~> 17.0"
 
 group(:omnibus_package) do
   gem "appbundler"

data/README.md

@@ -1,6 +1,6 @@
 # Chef Infra
 [![Code Climate](https://codeclimate.com/github/chef/chef.svg)](https://codeclimate.com/github/chef/chef)
-[![Build Status](https://badge.buildkite.com/c82093430ceec7d27af05febb9dcafe3aa331fff9d74c0ab9d.svg?branch=master)](https://buildkite.com/chef-oss/chef-chef-master-verify)
+[![Build Status](https://badge.buildkite.com/c82093430ceec7d27af05febb9dcafe3aa331fff9d74c0ab9d.svg?branch=chef-17)](https://buildkite.com/chef-oss/chef-chef-chef-17-verify)
 [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef)
 [![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef/blob/master/docs/dev/design_documents/client_release_cadence.md)
 

data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb

@@ -38,7 +38,7 @@ class Chef
 
           def read
             tmpfile = rest.streaming_request(file[:url])
-            File.open(tmpfile, "rb", &:read)
+            File.binread(tmpfile)
           rescue Timeout::Error => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e, "Timeout reading #{file[:url]}: #{e}")
           rescue Net::HTTPClientException => e

data/lib/chef/chef_fs/file_system/repository/base_file.rb

@@ -123,7 +123,7 @@ class Chef
             if is_ruby_file?
               data_handler.from_ruby(file_path).to_json
             else
-              File.open(file_path, "rb", &:read)
+              File.binread(file_path)
             end
           rescue Errno::ENOENT
             raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)

data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb

@@ -126,7 +126,7 @@ class Chef
           end
 
           def read
-            File.open(file_path, "rb", &:read)
+            File.binread(file_path)
           rescue Errno::ENOENT
             raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
           end

data/lib/chef/compliance/input_collection.rb

@@ -57,7 +57,7 @@ class Chef
       # @return [Array<Input>] inspec inputs which are enabled in a form suitable to pass to inspec
       #
       def inspec_data
-        select(&:enabled?).each_with_object({}) { |input, hash| hash.merge(input.inspec_data) }
+        select(&:enabled?).each_with_object({}) { |input, hash| hash.merge!(input.inspec_data) }
       end
 
       # DSL method to enable input files.  This matches on the filename of the input file.

data/lib/chef/compliance/waiver_collection.rb

@@ -57,7 +57,7 @@ class Chef
       # @return [Array<Waiver>] inspec waivers which are enabled in a form suitable to pass to inspec
       #
       def inspec_data
-        select(&:enabled?).each_with_object({}) { |waiver, hash| hash.merge(waiver.inspec_data) }
+        select(&:enabled?).each_with_object({}) { |waiver, hash| hash.merge!(waiver.inspec_data) }
       end
 
       # DSL method to enable waiver files.  This matches on the filename of the waiver file.

data/lib/chef/cookbook_uploader.rb

@@ -119,7 +119,7 @@ class Chef
         # but we need the base64 encoding for the content-md5
         # header
         checksum64 = Base64.encode64([checksum].pack("H*")).strip
-        file_contents = File.open(file, "rb", &:read)
+        file_contents = File.binread(file)
 
         # Custom headers. 'content-type' disables JSON serialization of the request body.
         headers = { "content-type" => "application/x-binary", "content-md5" => checksum64, "accept" => "application/json" }

data/lib/chef/resource/lwrp_base.rb

@@ -54,7 +54,7 @@ class Chef
           resource_class.run_context = run_context
           resource_class.class_from_file(filename)
 
-          if !resource_class.unified_mode && !deprecated_class(resource_class)
+          if !resource_class.unified_mode && !deprecated_class(resource_class) && cookbook_name.to_s != "chef_client_updater"
             Chef.deprecated :unified_mode, "The #{resource_class.resource_name} resource in the #{cookbook_name} cookbook should declare `unified_mode true`", filename
           end
 

data/lib/chef/util/dsc/configuration_generator.rb

@@ -175,7 +175,7 @@ class Chef::Util::DSC
     end
 
     def get_configuration_document(document_path)
-      ::File.open(document_path, "rb", &:read)
+      ::File.binread(document_path)
     end
   end
 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("17.9.26")
+  VERSION = Chef::VersionString.new("17.9.42")
 end
 
 #

data/spec/functional/resource/cookbook_file_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Resource::CookbookFile do
   let(:source) { "java.response" }
   let(:cookbook_name) { "java" }
   let(:expected_content) do
-    content = File.open(File.join(CHEF_SPEC_DATA, "cookbooks", "java", "files", "default", "java.response"), "rb", &:read)
+    content = File.binread(File.join(CHEF_SPEC_DATA, "cookbooks", "java", "files", "default", "java.response"))
     content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
     content
   end

data/spec/functional/resource/dsc_script_spec.rb

@@ -345,7 +345,7 @@ describe Chef::Resource::DscScript, :windows_powershell_dsc_only, :ruby64_only d
     let(:config_param_section) { config_params }
     let(:config_flags) { { "#{dsc_user_prefix_param_name}": (dsc_user_prefix).to_s, "#{dsc_user_suffix_param_name}": (dsc_user_suffix).to_s } }
     it "does not directly contain the user name" do
-      configuration_script_content = ::File.open(dsc_test_resource.command, &:read)
+      configuration_script_content = ::File.read(dsc_test_resource.command)
       expect(configuration_script_content.include?(dsc_user)).to be(false)
     end
     it_behaves_like "a dsc_script with configuration data"
@@ -355,7 +355,7 @@ describe Chef::Resource::DscScript, :windows_powershell_dsc_only, :ruby64_only d
     let(:dsc_user_code) { dsc_user_env_code }
 
     it "does not directly contain the user name" do
-      configuration_script_content = ::File.open(dsc_test_resource.command, &:read)
+      configuration_script_content = ::File.read(dsc_test_resource.command)
       expect(configuration_script_content.include?(dsc_user)).to be(false)
     end
     it_behaves_like "a dsc_script with configuration data"

data/spec/functional/resource/template_spec.rb

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Chef::Resource::Template do
 
   def binread(file)
-    File.open(file, "rb", &:read)
+    File.binread(file)
   end
 
   include_context Chef::Resource::File

data/spec/integration/client/client_spec.rb

@@ -22,7 +22,7 @@ describe "chef-client" do
     # just a normal file
     # (expected_content should be uncompressed)
     @api.get("/recipes.tgz", 200) do
-      File.open(recipes_filename, "rb", &:read)
+      File.binread(recipes_filename)
     end
   end
 

data/spec/support/shared/functional/file_resource.rb

@@ -391,7 +391,7 @@ shared_examples_for "a configured file resource" do
   end
 
   def binread(file)
-    content = File.open(file, "rb", &:read)
+    content = File.binread(file)
     content.force_encoding(Encoding::BINARY) if "".respond_to?(:force_encoding)
     content
   end

data/spec/support/shared/functional/http.rb

@@ -30,7 +30,7 @@ module ChefHTTPShared
   end
 
   def binread(file)
-    content = File.open(file, "rb", &:read)
+    content = File.binread(file)
     content.force_encoding(Encoding::BINARY) if "".respond_to?(:force_encoding)
     content
   end
@@ -51,19 +51,19 @@ module ChefHTTPShared
     # just a normal file
     # (expected_content should be uncompressed)
     @api.get("/nyan_cat.png", 200) do
-      File.open(nyan_uncompressed_filename, "rb", &:read)
+      File.binread(nyan_uncompressed_filename)
     end
 
     # this ends in .gz, we do not uncompress it and drop it on the filesystem as a .gz file (the internet often lies)
     # (expected_content should be compressed)
     @api.get("/nyan_cat.png.gz", 200, nil, { "Content-Type" => "application/gzip", "Content-Encoding" => "gzip" } ) do
-      File.open(nyan_compressed_filename, "rb", &:read)
+      File.binread(nyan_compressed_filename)
     end
 
     # this is an uncompressed file that was compressed by some mod_gzip-ish webserver thingy, so we will expand it
     # (expected_content should be uncompressed)
     @api.get("/nyan_cat_compressed.png", 200, nil, { "Content-Type" => "application/gzip", "Content-Encoding" => "gzip" } ) do
-      File.open(nyan_compressed_filename, "rb", &:read)
+      File.binread(nyan_compressed_filename)
     end
 
     #
@@ -75,7 +75,7 @@ module ChefHTTPShared
       {
         "Content-Length" => nyan_uncompressed_size.to_s,
       }) do
-        File.open(nyan_uncompressed_filename, "rb", &:read)
+        File.binread(nyan_uncompressed_filename)
       end
 
     # (expected_content should be uncompressed)
@@ -85,7 +85,7 @@ module ChefHTTPShared
         "Content-Type" => "application/gzip",
         "Content-Encoding" => "gzip",
       }) do
-        File.open(nyan_compressed_filename, "rb", &:read)
+        File.binread(nyan_compressed_filename)
       end
 
     #
@@ -97,7 +97,7 @@ module ChefHTTPShared
       {
         "Content-Length" => (nyan_uncompressed_size + 1).to_s,
       }) do
-        File.open(nyan_uncompressed_filename, "rb", &:read)
+        File.binread(nyan_uncompressed_filename)
       end
 
     # (expected_content should be uncompressed)
@@ -107,7 +107,7 @@ module ChefHTTPShared
         "Content-Type" => "application/gzip",
         "Content-Encoding" => "gzip",
       }) do
-        File.open(nyan_compressed_filename, "rb", &:read)
+        File.binread(nyan_compressed_filename)
       end
 
     #
@@ -120,7 +120,7 @@ module ChefHTTPShared
         "Content-Length" => (nyan_uncompressed_size + 1).to_s,
         "Transfer-Encoding" => "anything",
       }) do
-        File.open(nyan_uncompressed_filename, "rb", &:read)
+        File.binread(nyan_uncompressed_filename)
       end
 
     #

data/spec/unit/provider/user/solaris_spec.rb

@@ -74,7 +74,7 @@ describe Chef::Provider::User::Solaris do
       allow(Tempfile).to receive(:new).with("shadow", "/etc").and_return(temp_file)
       new_resource.password "verysecurepassword"
       provider.manage_user
-      expect(::File.open(password_file.path, "r").read).to match(/adam:verysecurepassword:/)
+      expect(::File.read(password_file.path)).to match(/adam:verysecurepassword:/)
       password_file.unlink
     end
   end

metadata

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