chef-config 17.10.68 → 18.0.169

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66557f3b39cf90517075c686f936727006a39a8e5f847f21c9d9a501d87a5740
-  data.tar.gz: d4f88b3d497db20f38dcaea8762ee5bc1e57c49dbfadf2df325112b5d12cfab7
+  metadata.gz: 27aab681164d3a6645b624ea332ae7423316b5355399b7138848cbe67d9544d0
+  data.tar.gz: 3499a3691092cca906ef6e27d2579864a9e12260ef886fc931a869db5f2686c8
 SHA512:
-  metadata.gz: 99f280daf85877627d735f5f3fbe3c5b9bc0c3fd22e489e6eb25998d0d4cc60cae99e3fde077cbeb14b6c444f55727ae7e0c64562bca677690a15c140f8f1afd
-  data.tar.gz: e63f929a3e62a11390aaa30b9e6caf7c23cbaa2e30591d71fb3f23adfbcf89cd40e6ee683582abaf37d31ef57d36b33645a5a06a5a34ff6980bf8fb7b243e529
+  metadata.gz: c5fbf76ba6b0b1fa37a4fde60d40e31df6c183da7cf71af7406cd5d5b5f8a934ea2d4d85f3f3da849d2d3c44f3b9d2e81cf1a8ef49a0f4451c3cff022c235a82
+  data.tar.gz: 363bd8668a8177ae2fea55a72c8f538abb28753589e46b0773c4731e0e2f252e4a9dae6f35b8b6bb52840aa6ec16b1e56fd5987726ed433eac364adfd1f4f89d

data/chef-config.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/chef/chef"
   spec.license       = "Apache-2.0"
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 2.6"
 
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",

data/lib/chef-config/config.rb

@@ -84,8 +84,11 @@ module ChefConfig
     # @return [String] the platform-specific path
     #
     def self.etc_chef_dir(windows: ChefUtils.windows?)
-      path = windows ? c_chef_dir : PathHelper.join("/etc", ChefUtils::Dist::Infra::DIR_SUFFIX, windows: windows)
-      PathHelper.cleanpath(path, windows: windows)
+      @etc_chef_dir ||= {}
+      @etc_chef_dir[windows] ||= begin
+        path = windows ? c_chef_dir : PathHelper.join("/etc", ChefUtils::Dist::Infra::DIR_SUFFIX, windows: windows)
+        PathHelper.cleanpath(path, windows: windows)
+      end
     end
 
     # On *nix, /var/chef, on Windows C:\chef
@@ -171,7 +174,7 @@ module ChefConfig
 
           # Call to_sym because Chef::Config expects only symbol keys. Also
           # runs a simple parse on the string for some common types.
-          memo[key.to_sym] = YAML.safe_load(value)
+          memo[key.to_sym] = YAML.safe_load(value, permitted_classes: [Date])
           memo
         end
         set_extra_config_options(extra_parsed_options)
@@ -770,6 +773,11 @@ module ChefConfig
     # We'll use this preferentially.
     default :client_key_contents, nil
 
+    # We want to get all certificates OFF disk and into secure storage. This flag
+    # removes the client.pem from disk and a replacement is put into Keychain or the Certstore
+    # Then the public key from the new cert is pushed to Chef Server for authentication
+    default :migrate_key_to_keystore, false
+
     # When registering the client, should we allow the client key location to
     # be a symlink?  eg: /etc/chef/client.pem -> /etc/chef/prod-client.pem
     # If the path of the key goes through a directory like /tmp this should
@@ -986,7 +994,7 @@ module ChefConfig
     # applying in "compile" mode, with no "converge" mode. False is backwards compatible
     # setting for Chef 11-15 behavior.  This will break forward notifications.
     #
-    default :resource_unified_mode_default, false
+    default :resource_unified_mode_default, true
 
     # At the beginning of the Chef Client run, the cookbook manifests are downloaded which
     # contain URLs for every file in every relevant cookbook.  Most of the files

data/lib/chef-config/version.rb

@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
-  VERSION = "17.10.68".freeze
+  VERSION = "18.0.169".freeze
 end

data/lib/chef-config/workstation_config_loader.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef-utils" unless defined?(ChefUtils::CANARY)
+require "etc" unless defined?(Etc)
 require_relative "config"
 require_relative "exceptions"
 require_relative "logger"

data/spec/unit/config_spec.rb

@@ -19,6 +19,7 @@
 
 require "spec_helper"
 require "chef-config/config"
+require "date" unless defined?(Date)
 
 RSpec.describe ChefConfig::Config do
   before(:each) do
@@ -282,6 +283,14 @@ RSpec.describe ChefConfig::Config do
         expect(ChefConfig::Config.etc_chef_dir(windows: true)).to eql("C:\\#{dirname}")
       end
     end
+
+    context "when calling etc_chef_dir multiple times" do
+      it "should not recalculate path for every call" do
+        expect(ChefConfig::Config.etc_chef_dir(windows: false)).to eql("/etc/#{dirname}")
+        expect(ChefConfig::PathHelper).not_to receive(:cleanpath)
+        expect(ChefConfig::Config.etc_chef_dir(windows: false)).to eql("/etc/#{dirname}")
+      end
+    end
   end
 
   [ false, true ].each do |is_windows|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 17.10.68
+  version: 18.0.169
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 17.10.68
+        version: 18.0.169
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 17.10.68
+        version: 18.0.169
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="