chef-config 18.4.2 → 18.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13c6d37a7819f356c92a27d842fc694cb907d3022502f89fb85548c577f98d91
-  data.tar.gz: 226bab3a46eca66ec03360cdeeaf54108005662d88d5edad625b330b1c911748
+  metadata.gz: ddcbcd4feef547cdfe1ea8628092044d92f0200303a6996678ac5b61d799e56f
+  data.tar.gz: 0cc8b36b0817c182995149b254772e602ed3faa4f0e1d9849226415429b79fd3
 SHA512:
-  metadata.gz: 783a3784b6956338d6906863e4d672487e0aa4a2ddd573e9866f76d86a37897c60ec45ccaa6cef1b12e73d415e0197fc4f1fde70e416b3d730ea623848fbe7ac
-  data.tar.gz: b07b2e6c888a794a41edd7492150e7a1aff58fc6a397481e5c9122b62863a82cdc6113ad37d340b9eb8b4b8e8465cb9b0cb631967677af4b5bb6de7eb74cee0b
+  metadata.gz: 5065a64b8417cae75b3014a3d76a14dc51d763177df6c2ce15dc12b515a2c093b1f4e1d560f9ffb3001868727b334071ed4335d4ae354f40d008d79f2f1377bd
+  data.tar.gz: 649833ca804c13b87a35e62e1537bfd3aa84714a187841d32044072053174f74db600f29e7ce801193ddef6037338bf958a2380ff8392482cf3d15378d518383

data/lib/chef-config/config.rb

@@ -97,8 +97,11 @@ module ChefConfig
     # @return [String] the platform-specific path
     #
     def self.var_chef_dir(windows: ChefUtils.windows?)
-      path = windows ? c_chef_dir : PathHelper.join("/var", ChefUtils::Dist::Infra::DIR_SUFFIX, windows: windows)
-      PathHelper.cleanpath(path, windows: windows)
+      @var_chef_dir ||= {}
+      @var_chef_dir[windows] ||= begin
+        path = windows ? c_chef_dir : PathHelper.join("/var", ChefUtils::Dist::Infra::DIR_SUFFIX, windows: windows)
+        PathHelper.cleanpath(path, windows: windows)
+      end
     end
 
     # On *nix, /var, on Windows C:\
@@ -107,8 +110,11 @@ module ChefConfig
     # @return [String] the platform-specific path
     #
     def self.var_root_dir(windows: ChefUtils.windows?)
-      path = windows ? "C:\\" : "/var"
-      PathHelper.cleanpath(path, windows: windows)
+      @var_root_dir ||= {}
+      @var_root_dir[windows] ||= begin
+        path = windows ? "C:\\" : "/var"
+        PathHelper.cleanpath(path, windows: windows)
+      end
     end
 
     # On windows, C:/chef/
@@ -415,7 +421,14 @@ module ChefConfig
     # If your `file_cache_path` resides on a NFS (or non-flock()-supporting
     # fs), it's recommended to set this to something like
     # '/tmp/chef-client-running.pid'
-    default(:lockfile) { PathHelper.join(file_cache_path, "#{ChefUtils::Dist::Infra::CLIENT}-running.pid") }
+    # In Target Mode, the node name will be used as a prefix to allow
+    # parallel execution of Chef against different targets
+    default(:lockfile) do
+      prefix = ""
+      prefix = "#{ChefConfig::Config.node_name}-" if ChefConfig::Config.target_mode?
+
+      PathHelper.join(file_cache_path, "#{prefix}#{ChefUtils::Dist::Infra::CLIENT}-running.pid")
+    end
 
     ## Daemonization Settings ##
     # What user should Chef run as?
@@ -1047,16 +1060,6 @@ module ChefConfig
     default :blocked_normal_attributes, nil
     default :blocked_override_attributes, nil
 
-    # deprecated config options that will be removed in Chef Infra Client 18
-    default :automatic_attribute_blacklist, nil
-    default :default_attribute_blacklist, nil
-    default :normal_attribute_blacklist, nil
-    default :override_attribute_blacklist, nil
-    default :automatic_attribute_whitelist, nil
-    default :default_attribute_whitelist, nil
-    default :normal_attribute_whitelist, nil
-    default :override_attribute_whitelist, nil
-
     # Pull down all the rubygems versions from rubygems and cache them the first time we do a gem_package or
     # chef_gem install.  This is memory-expensive and will grow without bounds, but will reduce network
     # round trips.

data/lib/chef-config/mixin/credentials.rb

@@ -54,6 +54,8 @@ module ChefConfig
       # @since 14.4
       # @return [String]
       def credentials_file_path
+        return Chef::Config[:credentials] if defined?(Chef::Config) && Chef::Config.key?(:credentials)
+
         PathHelper.home(ChefUtils::Dist::Infra::USER_CONF_DIR, "credentials").freeze
       end
 

data/lib/chef-config/path_helper.rb

@@ -59,11 +59,14 @@ module ChefConfig
       path_separator_regex = Regexp.escape(windows ? "#{File::SEPARATOR}#{BACKSLASH}" : File::SEPARATOR)
       trailing_slashes_regex = /[#{path_separator_regex}]+$/.freeze
       leading_slashes_regex = /^[#{path_separator_regex}]+/.freeze
+      separator = path_separator(windows: windows)
 
-      args.flatten.inject do |joined_path, component|
+      args.flatten!
+      args.inject do |joined_path, component|
         joined_path = joined_path.sub(trailing_slashes_regex, "")
         component = component.sub(leading_slashes_regex, "")
-        joined_path + "#{path_separator(windows: windows)}#{component}"
+        joined_path << "#{separator}#{component}"
+        joined_path
       end
     end
 
@@ -248,7 +251,7 @@ module ChefConfig
       paths << ENV[@@per_tool_home_environment] if defined?(@@per_tool_home_environment) && @@per_tool_home_environment && ENV[@@per_tool_home_environment]
       paths << ENV["CHEF_HOME"] if ENV["CHEF_HOME"]
       if windows
-        # By default, Ruby uses the the following environment variables to determine Dir.home:
+        # By default, Ruby uses the following environment variables to determine Dir.home:
         # HOME
         # HOMEDRIVE HOMEPATH
         # USERPROFILE

data/lib/chef-config/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 18.4.2
+  version: 18.5.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.4.2
+        version: 18.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.4.2
+        version: 18.5.0
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement