Merge branch 'chef:main' into patch-1

9 files changed, 23 insertions, 21 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f308f321fa..1679b05ba8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,18 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
 This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/).
 
-<!-- latest_release 18.0.135 -->
-## [v18.0.135](https://github.com/chef/chef/tree/v18.0.135) (2022-07-22)
+<!-- latest_release 18.0.136 -->
+## [v18.0.136](https://github.com/chef/chef/tree/v18.0.136) (2022-07-26)
 
 #### Merged Pull Requests
-- Bump omnibus-software from `a9b13a0` to `1d540dc` in /omnibus [#13089](https://github.com/chef/chef/pull/13089) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Require etc library [#13068](https://github.com/chef/chef/pull/13068) ([curzonj](https://github.com/curzonj))
 <!-- latest_release -->
 
 <!-- release_rollup since=17.9.26 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Require etc library [#13068](https://github.com/chef/chef/pull/13068) ([curzonj](https://github.com/curzonj)) <!-- 18.0.136 -->
 - Bump omnibus-software from `a9b13a0` to `1d540dc` in /omnibus [#13089](https://github.com/chef/chef/pull/13089) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 18.0.135 -->
 - Re add: Use new msys2 based devkit for windows&quot;&quot; [#13097](https://github.com/chef/chef/pull/13097) ([neha-p6](https://github.com/neha-p6)) <!-- 18.0.134 -->
 - Skip tests on FreeBSD-13 [#13079](https://github.com/chef/chef/pull/13079) ([poorndm](https://github.com/poorndm)) <!-- 18.0.133 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 46a6092e66..cd1e8ffee6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,12 +42,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (18.0.135)
+    chef (18.0.136)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.0.135)
-      chef-utils (= 18.0.135)
+      chef-config (= 18.0.136)
+      chef-utils (= 18.0.136)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -76,13 +76,13 @@ PATH
       unf_ext (< 0.0.8.1)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (18.0.135-universal-mingw32)
+    chef (18.0.136-universal-mingw32)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.0.135)
+      chef-config (= 18.0.136)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 18.0.135)
+      chef-utils (= 18.0.136)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -126,15 +126,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (18.0.135)
-      chef (= 18.0.135)
+    chef-bin (18.0.136)
+      chef (= 18.0.136)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (18.0.135)
+    chef-config (18.0.136)
       addressable
-      chef-utils (= 18.0.135)
+      chef-utils (= 18.0.136)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -143,7 +143,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (18.0.135)
+    chef-utils (18.0.136)
       concurrent-ruby
 
 GEM
@@ -156,7 +156,7 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.609.0)
+    aws-partitions (1.610.0)
     aws-sdk-core (3.131.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
diff --git a/VERSION b/VERSION
index 751512b60a..75cfdf3d8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.135
\ No newline at end of file
+18.0.136
\ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 4969fce44f..7ceb31e306 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
 
 module ChefBin
   CHEFBIN_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.0.135".freeze
+  VERSION = "18.0.136".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6f4b5d1a13..a62c860485 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.0.135".freeze
+  VERSION = "18.0.136".freeze
 end
diff --git a/chef-config/lib/chef-config/workstation_config_loader.rb b/chef-config/lib/chef-config/workstation_config_loader.rb
index ea42211120..a77670ddb2 100644
--- a/chef-config/lib/chef-config/workstation_config_loader.rb
+++ b/chef-config/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"
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 15dd917a1d..0c380ec18f 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -16,5 +16,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.0.135"
+  VERSION = "18.0.136"
 end
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 95ae68cdad..19ae0078a4 100644
--- a/knife/lib/chef/knife/version.rb
+++ b/knife/lib/chef/knife/version.rb
@@ -17,7 +17,7 @@
 class Chef
   class Knife
     KNIFE_ROOT = File.expand_path("../..", __dir__)
-    VERSION = "18.0.135".freeze
+    VERSION = "18.0.136".freeze
   end
 end
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 724b801442..83891d81be 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("18.0.135")
+  VERSION = Chef::VersionString.new("18.0.136")
 end
 
 #