chef 16.4.35 → 16.4.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd173a8bc2e595b0c39776bd219be73951547e20a8ea7ca42e10ab9f4caf301
-  data.tar.gz: 8868bce6fe0f624417e2b431bdd0bd160b7747f1801ce93a2ab73b9225c210dc
+  metadata.gz: f26a1b5c8c9974e5242efbb36f6f73d87f50656a56bc3dc9e85cf79b1a71cf7b
+  data.tar.gz: d395068039c3313536214113f21515679de33f64dfe263e7d5d1bc11d3ad700d
 SHA512:
-  metadata.gz: 2880171bce3ce18571abc3142417189f5a31f768adfa4654a1d7b3bf7acdee3483032bd0b5da61e895cb3c1613cccbf95edd76788a44bc2290fe0e4c6823534b
-  data.tar.gz: c1d9c41879c5db64c0d104cc41ceb8c3c97a7188d6d2f11333ef33b06ec4574833e586a507c5f1dbbf3c0da43f6df97e462c1c54983cccabdba98075437425f5
+  metadata.gz: 4fc235fc393aecb19c94b09ba0efe6ca409cb2e724db5387fb799148d4e99931042c9134af7fcf8eb09697ec3b0c56696a9308b60e444a6f50e2c843e818e1b2
+  data.tar.gz: 5d7aaaf1cf736bdc67d785c75525ff0b77c816c0b1bffee38c9ad026dfed7027dc2f2aac2a701f8dbdbf90c08a3357d6a4dea17e538abbb13371a6d962c4186d

data/lib/chef/api_client/registration.rb

@@ -157,12 +157,12 @@ class Chef
       end
 
       def http_api
-        options = {}
-        options[:api_version] = "0"
-        options[:client_name] = Chef::Config[:validation_client_name]
-        options[:raw_key] = Chef::Config[:validation_key_contents]
-        options[:signing_key_filename] = Chef::Config[:validation_key] unless options[:raw_key]
-        @http_api ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url], options)
+        @http_api ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url],
+          {
+            api_version: "0",
+            client_name: Chef::Config[:validation_client_name],
+            signing_key_filename: Chef::Config[:validation_key],
+          })
       end
 
       # Whether or not to generate keys locally and post the public key to the

data/lib/chef/application.rb

@@ -19,7 +19,6 @@
 require "pp" unless defined?(PP)
 require "socket" unless defined?(Socket)
 require_relative "config"
-require "chef-config/mixin/chef_cloud"
 require_relative "exceptions"
 require_relative "local_mode"
 require_relative "log"
@@ -137,10 +136,6 @@ class Chef
 
       if config[:config_file].nil?
         logger.warn("No config file found or specified on command line. Using command line options instead.")
-      elsif ChefConfig::Mixin::ChefCloud.cloud_config?
-        logger.warn("*****************************************")
-        logger.warn("Found Chef Cloud configuration. Overriding local values from cloud.")
-        logger.warn("*****************************************")
       elsif config_fetcher.config_missing?
         logger.warn("*****************************************")
         logger.warn("Did not find config file: #{config[:config_file]}. Using command line options instead.")

data/lib/chef/application/base.rb

@@ -22,7 +22,6 @@ require_relative "../mixin/shell_out"
 require_relative "../config_fetcher"
 require_relative "../dist"
 require_relative "../daemon"
-require "chef-config/mixin/chef_cloud"
 require "chef-config/mixin/dot_d"
 require "license_acceptance/cli_flags/mixlib_cli"
 require "mixlib/archive" unless defined?(Mixlib::Archive)
@@ -40,7 +39,6 @@ require "mixlib/archive" unless defined?(Mixlib::Archive)
 #
 class Chef::Application::Base < Chef::Application
   include Chef::Mixin::ShellOut
-  include ChefConfig::Mixin::ChefCloud
   include ChefConfig::Mixin::DotD
   include LicenseAcceptance::CLIFlags::MixlibCLI
 

data/lib/chef/application/client.rb

@@ -156,9 +156,6 @@ class Chef::Application::Client < Chef::Application::Base
 
     # Load all config files in client.d
     load_dot_d(Chef::Config[:client_d_dir]) if Chef::Config[:client_d_dir]
-
-    # Load cloud config if present
-    load_cloud_config
   end
 
   def configure_logging

data/lib/chef/resource/osx_profile.rb

@@ -80,8 +80,8 @@ class Chef
         end
 
         def check_resource_semantics!
-          if mac? && node["platform_version"] =~ "> 10.15"
-            raise "The osx_profile resource is not available on macOS Bug Sur or above due to the removal of apple support for CLI installation of profiles"
+          if mac? && node["platform_version"] =~ ">= 11.0"
+            raise "The osx_profile resource is not available on macOS Big Sur or above due to Apple's removal of support for CLI profile installation"
           end
 
           if action == :remove
@@ -253,7 +253,7 @@ class Chef
 
         def query_installed_profiles
           Tempfile.open("allprofiles.plist") do |tempfile|
-            shell_out!( "/usr/bin/profiles", "-P", "-o", tempfile.path )
+            shell_out( "/usr/bin/profiles", "-P", "-o", tempfile.path )
             ::Plist.parse_xml(tempfile)
           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("16.4.35")
+  VERSION = Chef::VersionString.new("16.4.38")
 end
 
 #

data/spec/unit/data_collector_spec.rb

@@ -39,6 +39,12 @@ describe Chef::DataCollector do
   let(:new_resource) do
     new_resource = Chef::Resource::File.new("/tmp/a-file.txt")
     new_resource.checksum nil
+    # This next line is a hack to work around the fact that the name property will not have been autovivified yet
+    # in these unit tests which breaks some assumptions.  Really the Formatters::ErrorMapper.resource_failed and
+    # related APIs need to properly walk and get properties on the resource rather than walking through instance
+    # variables, but the ErrorMappers probably pre-date the conversion to properties.  But this next line is necesary
+    # to populate the name_property instance variable (which will happen naturally during the course of running the
+    # provider, so I don't think this is a user-visibile bug).
     new_resource.path
     new_resource
   end

data/spec/unit/resource/osx_profile_spec.rb

@@ -155,7 +155,7 @@ describe Chef::Resource::OsxProfile do
       resource.profile_name profile_name
       allow(provider).to receive(:get_installed_profiles).and_call_original
       allow(provider).to receive(:read_plist).and_return(all_profiles)
-      expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-P", "-o", kind_of(String))
+      expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-P", "-o", kind_of(String))
       provider.load_current_resource
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 16.4.35
+  version: 16.4.38
 platform: ruby
 authors:
 - Adam Jacob
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.4.35
+        version: 16.4.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.4.35
+        version: 16.4.38
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.4.35
+        version: 16.4.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.4.35
+        version: 16.4.38
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement