Merge branch 'main' into jfm/chef18jfm/chef18

10 files changed, 33 insertions, 46 deletions

diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index 98cc101e11..35be8a9ec8 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -16,10 +16,10 @@ builder-to-testers-map:
     - aix-7.1-powerpc
     - aix-7.2-powerpc
     - aix-7.3-powerpc
-  amazon-2022-aarch64:
-    - amazon-2022-aarch64
-  amazon-2022-x86_64:
-    - amazon-2022-x86_64
+      #  amazon-2022-aarch64:
+      #    - amazon-2022-aarch64
+      #  amazon-2022-x86_64:
+      #    - amazon-2022-x86_64
   debian-9-x86_64:
     - debian-9-x86_64
     - debian-10-x86_64
@@ -87,7 +87,7 @@ builder-to-testers-map:
     - windows-2016-x86_64
     - windows-2019-x86_64
     - windows-2022-x86_64
-    - windows-8-x86_64
+      #    - windows-8-x86_64
     - windows-10-x86_64
     - windows-11-x86_64
 
diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh
index 95840cadfc..d8cc70e418 100755
--- a/.expeditor/update_version.sh
+++ b/.expeditor/update_version.sh
@@ -18,6 +18,7 @@ sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-bin/lib/ch
 sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-utils/lib/chef-utils/version.rb
 sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" knife/lib/chef/knife/version.rb
 sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"${VERSION}\")/" lib/chef/version.rb
+asdf global ruby "3.1.0"
 
 # Update the version inside Gemfile.lock
 bundle update chef chef-config chef-utils --jobs=7 --conservative
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01be44c259..96272c90f3 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.142 -->
-## [v18.0.142](https://github.com/chef/chef/tree/v18.0.142) (2022-08-30)
+<!-- latest_release 18.0.143 -->
+## [v18.0.143](https://github.com/chef/chef/tree/v18.0.143) (2022-09-08)
 
 #### Merged Pull Requests
-- Add empty pipeline for macos universal package [#13152](https://github.com/chef/chef/pull/13152) ([vkarve-chef](https://github.com/vkarve-chef))
+- The worker container for expeditor needs to use Ruby 3.1.0 [#13171](https://github.com/chef/chef/pull/13171) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit))
 <!-- latest_release -->
 
 <!-- release_rollup since=17.9.26 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- The worker container for expeditor needs to use Ruby 3.1.0 [#13171](https://github.com/chef/chef/pull/13171) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit)) <!-- 18.0.143 -->
 - Add empty pipeline for macos universal package [#13152](https://github.com/chef/chef/pull/13152) ([vkarve-chef](https://github.com/vkarve-chef)) <!-- 18.0.142 -->
 - Add newline to end of sysctl files [#13118](https://github.com/chef/chef/pull/13118) ([tmccombs](https://github.com/tmccombs)) <!-- 18.0.141 -->
 - fix chef_client_scheduled_task splay to accept 0 [#13095](https://github.com/chef/chef/pull/13095) ([Stromweld](https://github.com/Stromweld)) <!-- 18.0.140 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f2060d728c..723039fa52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,16 +41,22 @@ GIT
   specs:
     proxifier (1.0.3)
 
+GIT
+  remote: https://github.com/chef/ruby-shadow
+  revision: 3b8ea40b0e943b5de721d956741308ce805a5c3c
+  branch: lcg/ruby-3.0
+  specs:
+    ruby-shadow (2.5.0)
+
 PATH
   remote: .
   specs:
-    chef (18.0.142)
+    chef (18.0.143)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.0.142)
-      chef-powershell (~> 1.0.12)
-      chef-utils (= 18.0.142)
+      chef-config (= 18.0.143)
+      chef-utils (= 18.0.143)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -61,7 +67,6 @@ PATH
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
       inspec-core (>= 5)
-      iso8601 (>= 0.12.1, < 0.14)
       license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
@@ -80,29 +85,19 @@ PATH
       unf_ext (< 0.0.8.1)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-      win32-api (~> 1.10.0)
-      win32-certstore (~> 0.6.15)
-      win32-event (~> 0.6.1)
-      win32-eventlog (= 0.6.3)
-      win32-mmap (~> 0.4.1)
-      win32-mutex (~> 0.4.2)
-      win32-process (~> 0.10)
-      win32-service (>= 2.1.5, < 3.0)
-      win32-taskscheduler (~> 2.0)
-      wmi-lite (~> 1.0)
 
 PATH
   remote: chef-bin
   specs:
-    chef-bin (18.0.142)
-      chef (= 18.0.142)
+    chef-bin (18.0.143)
+      chef (= 18.0.143)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (18.0.142)
+    chef-config (18.0.143)
       addressable
-      chef-utils (= 18.0.142)
+      chef-utils (= 18.0.143)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -111,7 +106,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (18.0.142)
+    chef-utils (18.0.143)
       concurrent-ruby
 
 GEM
@@ -125,7 +120,7 @@ GEM
     ast (2.4.2)
     aws-eventstream (1.2.0)
     aws-partitions (1.626.0)
-    aws-sdk-core (3.140.0)
+    aws-sdk-core (3.142.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -146,9 +141,6 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     byebug (11.1.3)
-    chef-powershell (1.0.13)
-      ffi (~> 1.15)
-      ffi-yajl (~> 2.4)
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
@@ -244,7 +236,6 @@ GEM
     inspec-core-bin (5.18.14)
       inspec-core (= 5.18.14)
     ipaddress (0.8.3)
-    iso8601 (0.13.0)
     jmespath (1.6.1)
     json (2.6.2)
     libyajl2 (2.1.0)
@@ -352,7 +343,6 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    structured_warnings (0.4.0)
     syslog-logger (1.6.8)
     thor (1.2.1)
     time (0.2.0)
@@ -422,12 +412,6 @@ GEM
       win32-ipc (>= 0.6.0)
     win32-process (0.10.0)
       ffi (>= 1.0.0)
-    win32-service (2.3.2)
-      ffi
-      ffi-win32-extensions
-    win32-taskscheduler (2.0.4)
-      ffi
-      structured_warnings
     winrm (2.3.6)
       builder (>= 2.1.2)
       erubi (~> 1.8)
@@ -475,6 +459,7 @@ DEPENDENCIES
   rb-readline
   rest-client!
   rspec
+  ruby-shadow!
   webmock
 
 BUNDLED WITH
diff --git a/VERSION b/VERSION
index e756675b00..2db67b5511 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.142
\ No newline at end of file
+18.0.143
\ 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 5f1a2e3211..571777ad53 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.142".freeze
+  VERSION = "18.0.143".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 7799607e56..e7a67ebb46 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.142".freeze
+  VERSION = "18.0.143".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 8c867bd068..516dee87af 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.142"
+  VERSION = "18.0.143"
 end
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 3b53b1177e..03d37c45f2 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.142".freeze
+    VERSION = "18.0.143".freeze
   end
 end
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a95964f938..746750cdb7 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.142")
+  VERSION = Chef::VersionString.new("18.0.143")
 end
 
 #