Merge branch 'main' of github.com:chef/chef into sean-simmons-progress/bugfix/build-docker-image syncing main

11 files changed, 34 insertions, 32 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff38f55b5e..5a8c4de56b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,19 @@
 <!-- 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.2.1 -->
-## [v18.2.1](https://github.com/chef/chef/tree/v18.2.1) (2023-03-27)
+<!-- latest_release 18.2.3 -->
+## [v18.2.3](https://github.com/chef/chef/tree/v18.2.3) (2023-03-30)
 
 #### Merged Pull Requests
-- Fix issues in habitat/test pipeline [#13649](https://github.com/chef/chef/pull/13649) ([neha-p6](https://github.com/neha-p6))
+- Update ssl cert used in kitchen tests [#13658](https://github.com/chef/chef/pull/13658) ([neha-p6](https://github.com/neha-p6))
 <!-- latest_release -->
 
 <!-- release_rollup since=18.1.0 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Update ssl cert used in kitchen tests [#13658](https://github.com/chef/chef/pull/13658) ([neha-p6](https://github.com/neha-p6)) <!-- 18.2.3 -->
+- Updating cert code to adjust user vs localmachine keys [#13651](https://github.com/chef/chef/pull/13651) ([johnmccrae](https://github.com/johnmccrae)) <!-- 18.2.2 -->
 - Fix issues in habitat/test pipeline [#13649](https://github.com/chef/chef/pull/13649) ([neha-p6](https://github.com/neha-p6)) <!-- 18.2.1 -->
 - Update bundled dependencies for both chef and chef/omnibus [#13643](https://github.com/chef/chef/pull/13643) ([neha-p6](https://github.com/neha-p6)) <!-- 18.2.0 -->
 - Sean simmons progress/bugfix/precommand [#13646](https://github.com/chef/chef/pull/13646) ([sean-simmons-progress](https://github.com/sean-simmons-progress)) <!-- 18.1.36 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c51d65a914..a6f7ffcc18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,12 +44,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (18.2.1)
+    chef (18.2.3)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.2.1)
-      chef-utils (= 18.2.1)
+      chef-config (= 18.2.3)
+      chef-utils (= 18.2.3)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -78,13 +78,13 @@ PATH
       unf_ext (>= 0.0.8.2)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (18.2.1-x64-mingw-ucrt)
+    chef (18.2.3-x64-mingw-ucrt)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.2.1)
+      chef-config (= 18.2.3)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 18.2.1)
+      chef-utils (= 18.2.3)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -128,15 +128,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (18.2.1)
-      chef (= 18.2.1)
+    chef-bin (18.2.3)
+      chef (= 18.2.3)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (18.2.1)
+    chef-config (18.2.3)
       addressable
-      chef-utils (= 18.2.1)
+      chef-utils (= 18.2.3)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -145,7 +145,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (18.2.1)
+    chef-utils (18.2.3)
       concurrent-ruby
 
 GEM
diff --git a/VERSION b/VERSION
index 745b490654..d2dc1a569c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.2.1
\ No newline at end of file
+18.2.3
\ 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 405d90d439..c9f66e9403 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.2.1".freeze
+  VERSION = "18.2.3".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 82d9855b56..b8b03abdb9 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.2.1".freeze
+  VERSION = "18.2.3".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 49230785be..bcda5d1271 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.2.1"
+  VERSION = "18.2.3"
 end
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb
index 813b92d37b..617f480a44 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb
@@ -1,10 +1,10 @@
 chef_client_trusted_certificate "self-signed.badssl.com" do
   certificate <<~CERT
 -----BEGIN CERTIFICATE-----
-MIIDeTCCAmGgAwIBAgIJAKAyAEjwDBuPMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV
+MIIDeTCCAmGgAwIBAgIJAK31pnMwlr+TMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
 c2NvMQ8wDQYDVQQKDAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTAeFw0y
-MzAxMjIxNzM2NTVaFw0yNTAxMjExNzM2NTVaMGIxCzAJBgNVBAYTAlVTMRMwEQYD
+MzAzMjgyMjExMjlaFw0yNTAzMjcyMjExMjlaMGIxCzAJBgNVBAYTAlVTMRMwEQYD
 VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQK
 DAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBAMIE7PiM7gTCs9hQ1XBYzJMY61yoaEmwIrX5lZ6xKyx2
@@ -14,12 +14,12 @@ xPxTuW1CrbV8/q71FdIzSOciccfCFHpsKOo3St/qbLVytH5aohbcabFXRNsKEqve
 ww9HdFxBIuGa+RuT5q0iBikusbpJHAwnnqP7i/dAcgCskgjZjFeEU4EFy+b+a1SY
 QCeFxxC7c3DvaRhBB0VVfPlkPz0sw6l865MaTIbRyoUCAwEAAaMyMDAwCQYDVR0T
 BAIwADAjBgNVHREEHDAaggwqLmJhZHNzbC5jb22CCmJhZHNzbC5jb20wDQYJKoZI
-hvcNAQELBQADggEBAJs0hWIxX/T64bNZTJ5sTNJVzfxjUVNM0+X0eAi5e1HM9B4p
-/YtnKz11OCiH6E5jDGyYL4mH2CmA5AuznfnupOJK+OQaoJmgy1DOrm0fXLnswYRJ
-k6uuaJhB585gzWUqhoVxJusTZPItKLGfBH6i1C5o/LPr0PKagddIrzs5woArmtbc
-FK0EQxrk4aWHGQbVccu1K1SAWW3PmYNo/gn3tiCSYcV+4BCOmNhtkd0C4r2VqYuA
-8ynhAuRdoznncGjYvaXibb7hMFTas/OiETCWn1V4nY1VxGUqPzG2OunOOF8G16mm
-icTHkmckrm2kiDUkB+Uy/m88mElTpeuGWOX7BrU=
+hvcNAQELBQADggEBAB0wBgQ+U7ULnZd0JOxTUDUPtnUYQhKLx02yhCBuvSBfM+t0
+NYBk00hgzrzdJrr2mpn35y7hfKBzYztaADPqiE/n52D1D/aYbUv+VFJYPYJbsokT
+0ECaNk0uiW5cPm/ylW+oAA+o15ninMQUJJn/93ZhlkNj8ISP2awHXN9dSUfXBAbh
+jA+0SBJ7szXha0sElaPEFkieLhETR+CzSt311U8h1sGVMdkGqamwuj/TqlHhW8Np
+8F1Nk4DGHmJVoYDzHr+dgdpSUMfrvfWyegr1IOYZQBSxNnVjWvsS8EK5i1/EAqIt
+tSaKKu926MPPIQT/EX9tB8epAtTbyqgBABmAU6Y=
 -----END CERTIFICATE-----
   CERT
 end
diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock
index 7b3398592e..1bea566602 100644
--- a/knife/Gemfile.lock
+++ b/knife/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    chef (18.2.1)
-    chef (18.2.1-x64-mingw-ucrt)
+    chef (18.2.3)
+    chef (18.2.3-x64-mingw-ucrt)
 
 PLATFORMS
   ruby
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 97054c5556..fb587f20a7 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.2.1".freeze
+    VERSION = "18.2.3".freeze
   end
 end
 
diff --git a/lib/chef/http/authenticator.rb b/lib/chef/http/authenticator.rb
index 10d85db4e6..9a8d1d2b59 100644
--- a/lib/chef/http/authenticator.rb
+++ b/lib/chef/http/authenticator.rb
@@ -124,11 +124,11 @@ class Chef
       end
 
       def self.get_cert_user
-        Chef::Config[:auth_key_registry_type] == "user" ? store = "CurrentUser" : store = "LocalMachine"
+        Chef::Config[:auth_key_registry_type] == "user" ? "CurrentUser" : "LocalMachine"
       end
 
       def self.get_registry_user
-        Chef::Config[:auth_key_registry_type] == "user" ? store = "HKEY_CURRENT_USER" : store = "HKEY_LOCAL_MACHINE"
+        Chef::Config[:auth_key_registry_type] == "user" ? "HKEY_CURRENT_USER" : "HKEY_LOCAL_MACHINE"
       end
 
       def self.check_certstore_for_key(client_name)
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b42d1967c5..56c916bd75 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.2.1")
+  VERSION = Chef::VersionString.new("18.2.3")
 end
 
 #