Merge branch 'chef:chef-16' into chef-16

17 files changed, 76 insertions, 59 deletions

diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1
index 05f8e57248..d1030b1afa 100644
--- a/.expeditor/scripts/bk_win_functional.ps1
+++ b/.expeditor/scripts/bk_win_functional.ps1
@@ -15,7 +15,8 @@ $env:PATH = "C:\Program Files (x86)\Uru;" + $env:PATH
 
 Write-Output "Register Installed Ruby Version 2.7 With Uru"
 Start-Process "C:\Program Files (x86)\Uru\uru_rt.exe" -ArgumentList 'admin add C:\ruby27\bin' -Wait
-uru 271
+# We removed patch version otherwise uru fails to activate ruby as with the latest ruby releases patch version keeps getting updated.
+uru 27
 if (-not $?) { throw "Can't Activate Ruby. Did Uru Registration Succeed?" }
 ruby -v
 if (-not $?) { throw "Can't run Ruby. Is it installed?" }
diff --git a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
index 10bfeb0fa8..716de60cf8 100644
--- a/.expeditor/scripts/ensure-minimum-viable-hab.ps1
+++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
@@ -1,7 +1,8 @@
 [Version]$hab_version = (hab --version).split(" ")[1].split("/")[0]
 if ($hab_version -lt [Version]"0.85.0" ) {
     Write-Host "--- :habicat: Installing the version of Habitat required"
-    install-habitat --version 0.85.0.20190916
+    Set-ExecutionPolicy Bypass -Scope Process -Force
+    Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1'))
     if (-not $?) { throw "Hab version is older than 0.85 and could not update it." }
 } else {
     Write-Host "--- :habicat: :thumbsup: Minimum required version of Habitat already installed"
diff --git a/.expeditor/scripts/verify-plan.ps1 b/.expeditor/scripts/verify-plan.ps1
index 614d472964..6fc0633f8c 100644
--- a/.expeditor/scripts/verify-plan.ps1
+++ b/.expeditor/scripts/verify-plan.ps1
@@ -15,6 +15,17 @@ Write-Host "--- :8ball: :windows: Verifying $Plan"
 powershell -File "./.expeditor/scripts/ensure-minimum-viable-hab.ps1"
 if (-not $?) { throw "Could not ensure the minimum hab version required is installed." }
 
+# Do this to fix 'The term "hab" is not recognized as the name of a cmdlet' errors in windows_plan under verify pipeline.
+$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+Write-Host "--- :construction: Verifying Git is Installed"
+$source = Get-Command -Name Git -Verbose
+Write-Host "Which version of Git is installed? - " $source.version
+if (-not ($source.name -match "git.exe")) {
+    choco install git -y
+    # gotta refresh the path so you can actually use Git now
+    $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+}
+
 Write-Host "--- :key: Generating fake origin key"
 hab origin key generate $env:HAB_ORIGIN
 
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 1c0afbfac8..a297acc873 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -7,7 +7,7 @@ expeditor:
       retry:
         automatic:
           limit: 1
-      timeout_in_minutes: 45
+      timeout_in_minutes: 60
 
 steps:
 
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 8dc84e2310..6a7d3f31a9 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -113,7 +113,7 @@ jobs:
       CHEF_LICENSE: accept-no-persist
     steps:
       - name: Check out code
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e515836026..fe00f98e11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,17 +2,26 @@
 
 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 16.18.8 -->
-## [v16.18.8](https://github.com/chef/chef/tree/v16.18.8) (2022-10-19)
+<!-- latest_release 16.18.17 -->
+## [v16.18.17](https://github.com/chef/chef/tree/v16.18.17) (2022-11-29)
 
 #### Merged Pull Requests
-- [Chef-16] Fix solaris build and test failures in adhoc pipeline [#13240](https://github.com/chef/chef/pull/13240) ([neha-p6](https://github.com/neha-p6))
+- [Chef-16] Fix kitchen test failure on ubuntu2204 [#13384](https://github.com/chef/chef/pull/13384) ([neha-p6](https://github.com/neha-p6))
 <!-- latest_release -->
 
 <!-- release_rollup since=16.18.0 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- [Chef-16] Fix kitchen test failure on ubuntu2204 [#13384](https://github.com/chef/chef/pull/13384) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.17 -->
+- [Chef-16] Disable caching for s3 and git to successfully build aritifacts using ruby31 [#13279](https://github.com/chef/chef/pull/13279) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.16 -->
+- [Chef-16]Update expired SSL cert for self-signed.badssl.com used in kitchen tests [#13318](https://github.com/chef/chef/pull/13318) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.15 -->
+- [chef-16] Fix windows functional test ruby activation failure under verify pipeline  [#13262](https://github.com/chef/chef/pull/13262) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.14 -->
+- [chef-16] Fix hab package failures under windows plan in verify pipeline [#13251](https://github.com/chef/chef/pull/13251) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.13 -->
+- Revert &quot;Bump train-core to 3.10.7&quot; [#13294](https://github.com/chef/chef/pull/13294) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.12 -->
+- [chef-16] Update ncurses to 6.3 to fix build failures in adhoc pipeline on FreeBSD12 [#13267](https://github.com/chef/chef/pull/13267) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.11 -->
+- Bump omnibus from `5bc091a` to `d1fe3bb` in /omnibus [#13272](https://github.com/chef/chef/pull/13272) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.10 -->
+- Bump train-core to 3.10.7 [#13269](https://github.com/chef/chef/pull/13269) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 16.18.9 -->
 - [Chef-16] Fix solaris build and test failures in adhoc pipeline [#13240](https://github.com/chef/chef/pull/13240) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.8 -->
 - [chef-16]Fix windows build failures in adhoc pipeline throwing error &#39;SignTool Error: No certificates were found that met all the given criteria&#39; by updating the msi&#39; [#13241](https://github.com/chef/chef/pull/13241) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.7 -->
 - [Chef-16] Fix OpenSUSE failures in verify pipeline [#13239](https://github.com/chef/chef/pull/13239) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.6 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7bd3f64553..0bc38552b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,12 +20,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (16.18.8)
+    chef (16.18.17)
       addressable
       bcrypt_pbkdf (~> 1.1)
       bundler (>= 1.10)
-      chef-config (= 16.18.8)
-      chef-utils (= 16.18.8)
+      chef-config (= 16.18.17)
+      chef-utils (= 16.18.17)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -57,12 +57,12 @@ PATH
       tty-screen (~> 0.6)
       tty-table (~> 0.11)
       uuidtools (>= 2.1.5, < 3.0)
-    chef (16.18.8-universal-mingw32)
+    chef (16.18.17-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.1)
       bundler (>= 1.10)
-      chef-config (= 16.18.8)
-      chef-utils (= 16.18.8)
+      chef-config (= 16.18.17)
+      chef-utils (= 16.18.17)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -109,15 +109,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (16.18.8)
-      chef (= 16.18.8)
+    chef-bin (16.18.17)
+      chef (= 16.18.17)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (16.18.8)
+    chef-config (16.18.17)
       addressable
-      chef-utils (= 16.18.8)
+      chef-utils (= 16.18.17)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -126,7 +126,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (16.18.8)
+    chef-utils (16.18.17)
 
 GEM
   remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 181bd85cee..2f99df228d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.18.8
\ No newline at end of file
+16.18.17
\ 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 fa99fcbd71..06dbfad965 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 = "16.18.8".freeze
+  VERSION = "16.18.17".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 4c9ebfda03..0157634c5a 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 = "16.18.8".freeze
+  VERSION = "16.18.17".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 96706736ea..70081ac905 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 = "16.18.8"
+  VERSION = "16.18.17"
 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 e085519c4a..663b6e83bc 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-----
-MIIDeTCCAmGgAwIBAgIJAMtEwC/G1C5xMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV
+MIIDeTCCAmGgAwIBAgIJAJWlQWpveElqMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
 c2NvMQ8wDQYDVQQKDAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTAeFw0y
-MjA4MTIxNTU5MTBaFw0yNDA4MTExNTU5MTBaMGIxCzAJBgNVBAYTAlVTMRMwEQYD
+MjEwMjcxOTA5MTBaFw0yNDEwMjYxOTA5MTBaMGIxCzAJBgNVBAYTAlVTMRMwEQYD
 VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQK
 DAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBAMIE7PiM7gTCs9hQ1XBYzJMY61yoaEmwIrX5lZ6xKyx2
@@ -14,12 +14,12 @@ xPxTuW1CrbV8/q71FdIzSOciccfCFHpsKOo3St/qbLVytH5aohbcabFXRNsKEqve
 ww9HdFxBIuGa+RuT5q0iBikusbpJHAwnnqP7i/dAcgCskgjZjFeEU4EFy+b+a1SY
 QCeFxxC7c3DvaRhBB0VVfPlkPz0sw6l865MaTIbRyoUCAwEAAaMyMDAwCQYDVR0T
 BAIwADAjBgNVHREEHDAaggwqLmJhZHNzbC5jb22CCmJhZHNzbC5jb20wDQYJKoZI
-hvcNAQELBQADggEBAKgnD+Ak7ttVfKvriYAsf4ttTYfOuyLfAr4hTTSXLN2u1ySD
-fIpqSyeOkiEwfD5Bt7C/muEXEIyG/y6/C/ozb5JBvdd8c7zicLmaHtZtZbj4+H1b
-/gqaBHuvWxiRR91bbgNaKsPMGCWiAvUt4/+y8z6xefUS+aKeFNhYjdwyFIr17j3Q
-gxGpgCbYLLIoewP+Oj6xvZgGl6vj0xW9a4144xjFo1o1vqWkj+3IZGmnZ/jyznWd
-5XzZCUaM9z6nn7NVxQZEelk885Q3oUxY96rRO+IUA8Vnk3iEtOdZPbNBaZwvgkfz
-4vhvM8gKbdeeWoOAJDLzDZiDrUpKtIkBcLuJ7Cw=
+hvcNAQELBQADggEBAHOCRfreG+y9q2jxDTYOYESH+SIOPh1a4TDKfWMGQ5shdW7Q
+qlsRHqXmENFAalhHlNqGms1n77IdkIocygP9ZNZocyGwyLCDNn7YGdxCG4AlW2Lo
+NW7Bs86GUhUrWtahHpOnmrjQ/zzDH1T9pBxUQwA72x3SdgvfFu+WuAU2Dg/X6Ely
+IQ3a4/xy5NzlWsXBRvt67+uI2Fg3PGMenpWLD6SSLQzjjtEDXwv0dfBsYIt+m3QZ
+gOHdx459vr8bpqjBz09izM2W/uYHcjixXQVpKujN9AA6a7c5hiGpfXPdhiUmaHup
+CkR+c/8O1yyxkBMbttbp7VdUIXYAmB8yJuGoqe8=
 -----END CERTIFICATE-----
   CERT
 end
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 3e280edcb6..dcaa570b95 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -14,6 +14,7 @@ provisioner:
     diff_disabled: true
     always_dump_stacktrace: true
   chef_license: "accept-no-persist"
+  clean_dokken_sandbox: false
 
 lifecycle:
   pre_converge:
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 93a903fd63..ff721dc2e8 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("16.18.8")
+  VERSION = Chef::VersionString.new("16.18.17")
 end
 
 #
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index d1b28c601a..1d48a96ff8 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: 5bc091ab3ed4ab002ef85dad3923914c25bb3dcd
+  revision: d1fe3bbba0bf8c6cbc0e9d75bfcc8216e4345078
   branch: main
   specs:
     omnibus (9.0.8)
@@ -29,32 +29,30 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.586.0)
-    aws-sdk-core (3.130.2)
+    aws-partitions (1.648.0)
+    aws-sdk-core (3.162.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.56.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
+    aws-sdk-s3 (1.115.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sdk-secretsmanager (1.60.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt_pbkdf (1.1.0)
-    bcrypt_pbkdf (1.1.0-x64-mingw32)
-    bcrypt_pbkdf (1.1.0-x86-mingw32)
     berkshelf (8.0.0)
       chef (>= 15.7.32)
       chef-config
@@ -239,7 +237,7 @@ GEM
     ipaddress (0.8.3)
     iso8601 (0.13.0)
     jmespath (1.6.1)
-    json (2.6.1)
+    json (2.6.2)
     kitchen-vagrant (1.11.0)
       test-kitchen (>= 1.4, < 4)
     libyajl2 (2.1.0)
@@ -248,7 +246,7 @@ GEM
       tomlrb (>= 1.2, < 3.0)
       tty-box (~> 0.6)
       tty-prompt (~> 0.20)
-    license_scout (1.3.1)
+    license_scout (1.3.2)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
@@ -264,7 +262,7 @@ GEM
       mixlib-log
     mixlib-authentication (3.0.10)
     mixlib-cli (2.1.8)
-    mixlib-config (3.0.9)
+    mixlib-config (3.0.27)
       tomlrb
     mixlib-install (3.12.16)
       mixlib-shellout
@@ -278,15 +276,10 @@ GEM
       ffi-win32-extensions (~> 1.0.3)
       win32-process (~> 0.9)
       wmi-lite (~> 1.0)
-    mixlib-shellout (3.2.7-x64-mingw-ucrt)
-      chef-utils
-      ffi-win32-extensions (~> 1.0.3)
-      win32-process (~> 0.9)
-      wmi-lite (~> 1.0)
     mixlib-versioning (1.2.12)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-sftp (3.0.0)
@@ -326,7 +319,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
+    public_suffix (5.0.0)
     rack (2.2.3)
     rainbow (3.1.1)
     retryable (3.0.5)
@@ -381,16 +374,16 @@ GEM
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
     thor (1.2.1)
-    toml-rb (2.1.2)
+    toml-rb (2.2.0)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.9.2)
+    train-core (3.10.7)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-      net-scp (>= 1.2, < 4.0)
-      net-ssh (>= 2.9, < 7.0)
+      net-scp (>= 1.2, < 5.0)
+      net-ssh (>= 2.9, < 8.0)
     train-winrm (0.2.13)
       winrm (>= 2.3.6, < 3.0)
       winrm-elevated (~> 1.2.2)
diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb
index 99817f7caf..e06912ad75 100644
--- a/omnibus/omnibus.rb
+++ b/omnibus/omnibus.rb
@@ -31,11 +31,12 @@ env_omnibus_windows_arch = :x86 unless %w{x86 x64}.include?(env_omnibus_windows_
 
 windows_arch env_omnibus_windows_arch
 
-use_git_caching true
+# chef16 is now built using ruby 3.1. The artifacts get built when we disable caching for git and s3.
+use_git_caching false
 
 # Enable S3 asset caching
 # ------------------------------
-use_s3_caching true
+use_s3_caching false
 s3_access_key  ENV["AWS_ACCESS_KEY_ID"]
 s3_secret_key  ENV["AWS_SECRET_ACCESS_KEY"]
 s3_bucket      "opscode-omnibus-cache"
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index f7f7837798..4f2b30aceb 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -11,7 +11,7 @@ override "libxml2", version: "2.9.10"
 override "libxslt", version: "1.1.34"
 override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
-override "ncurses", version: "5.9"
+override "ncurses", version: "6.3"
 override "nokogiri", version: "1.13.1"
 override "openssl", version: mac_os_x? ? "1.1.1m" : "1.0.2zb"
 override "pkg-config-lite", version: "0.28-1"