Merge pull request #13391 from chef/jfm/chef18_version

Updating Gem versions - specifically updating Chef for omnibus

2 files changed, 102 insertions, 54 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index f44bb16034..e4bb55e630 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,20 +165,20 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.658.0)
-    aws-sdk-core (3.166.0)
+    aws-partitions (1.668.0)
+    aws-sdk-core (3.168.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.59.0)
+    aws-sdk-kms (1.60.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.117.1)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.67.0)
+    aws-sdk-secretsmanager (1.68.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.2)
@@ -286,7 +286,7 @@ GEM
       inspec-core (= 5.18.14)
     ipaddress (0.8.3)
     iso8601 (0.13.0)
-    jmespath (1.6.1)
+    jmespath (1.6.2)
     json (2.6.2)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
@@ -331,7 +331,7 @@ GEM
     netrc (0.11.0)
     nori (2.6.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     parslet (1.8.2)
     pastel (0.8.0)
@@ -351,7 +351,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     rb-readline (0.5.5)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -518,4 +518,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.18
+   2.3.17
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 79f720cbec..e47e296bc6 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,18 +1,18 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 46eb85278c88c508a3b2b370bd2e46b9fa10748f
+  revision: 57fbed5c2d998f9f2e0f28d5ca9f0718f1247e11
   branch: main
   specs:
-    omnibus-software (22.11.249)
+    omnibus-software (22.11.251)
       omnibus (>= 9.0.0)
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: d1fe3bbba0bf8c6cbc0e9d75bfcc8216e4345078
+  revision: 52b6d2e08bc2c90592b99da41a1728fb1629f673
   branch: main
   specs:
-    omnibus (9.0.8)
-      aws-sdk-s3 (~> 1)
+    omnibus (9.0.12)
+      aws-sdk-s3 (~> 1.116.0)
       chef-cleanroom (~> 1.0)
       chef-utils (>= 15.4)
       contracts (>= 0.16.0, < 0.17.0)
@@ -20,7 +20,7 @@ GIT
       license_scout (~> 1.0)
       mixlib-shellout (>= 2.0, < 4.0)
       mixlib-versioning
-      ohai (>= 15, < 18)
+      ohai (>= 16, < 19)
       pedump
       rexml (~> 3.2)
       ruby-progressbar (~> 1.7)
@@ -34,26 +34,26 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.648.0)
-    aws-sdk-core (3.162.0)
+    aws-partitions (1.666.0)
+    aws-sdk-core (3.168.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.59.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.115.0)
+    aws-sdk-s3 (1.116.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.64.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-secretsmanager (1.68.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt_pbkdf (1.1.0)
-    berkshelf (8.0.2)
+    berkshelf (8.0.5)
       chef (>= 15.7.32)
       chef-config
       cleanroom (~> 1.0)
@@ -67,54 +67,57 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (17.10.0)
+    chef (18.0.185)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.10.0)
-      chef-utils (= 17.10.0)
+      chef-config (= 18.0.185)
+      chef-utils (= 18.0.185)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
       diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
       erubis (~> 2.7)
-      ffi (>= 1.5.0)
+      ffi (>= 1.15.5)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
-      inspec-core (~> 4.23)
+      inspec-core (>= 5)
       license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 3.1.1, < 4.0)
+      net-ftp
       net-sftp (>= 2.1.2, < 5.0)
-      ohai (~> 17.0)
+      ohai (~> 18.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
       train-core (~> 3.10)
+      train-rest (>= 0.4.1)
       train-winrm (>= 0.2.5)
+      unf_ext (>= 0.0.8.2)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (17.10.0-universal-mingw32)
+    chef (18.0.185-x64-mingw-ucrt)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.10.0)
+      chef-config (= 18.0.185)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 17.10.0)
+      chef-utils (= 18.0.185)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
       diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
       erubis (~> 2.7)
-      ffi (>= 1.5.0)
+      ffi (>= 1.15.5)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
-      inspec-core (~> 4.23)
+      inspec-core (>= 5)
       iso8601 (>= 0.12.1, < 0.14)
       license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
@@ -122,17 +125,20 @@ GEM
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 3.1.1, < 4.0)
+      net-ftp
       net-sftp (>= 2.1.2, < 5.0)
-      ohai (~> 17.0)
+      ohai (~> 18.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
       train-core (~> 3.10)
+      train-rest (>= 0.4.1)
       train-winrm (>= 0.2.5)
+      unf_ext (>= 0.0.8.2)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-      win32-api (~> 1.5.3)
-      win32-certstore (~> 0.6.2)
+      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)
@@ -142,9 +148,9 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.5)
-    chef-config (17.10.0)
+    chef-config (18.0.185)
       addressable
-      chef-utils (= 17.10.0)
+      chef-utils (= 18.0.185)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -155,7 +161,7 @@ GEM
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (17.10.0)
+    chef-utils (18.0.185)
       concurrent-ruby
     chef-vault (4.1.10)
     chef-zero (15.0.11)
@@ -172,9 +178,12 @@ GEM
     contracts (0.16.1)
     corefoundation (0.3.13)
       ffi (>= 1.15.0)
+    date (3.2.2)
     diff-lcs (1.5.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.3.0)
-    erubi (1.10.0)
+    erubi (1.11.0)
     erubis (2.7.0)
     faraday (1.4.3)
       faraday-em_http (~> 1.0)
@@ -208,9 +217,12 @@ GEM
       builder (>= 2.1.2)
       rexml (~> 3.0)
     hashie (4.1.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (4.56.20)
+    inspec-core (5.18.14)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -230,13 +242,13 @@ GEM
       sslshake (~> 1.2)
       thor (>= 0.20, < 2.0)
       tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.0)
+      train-core (~> 3.10)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
     iostruct (0.0.4)
     ipaddress (0.8.3)
     iso8601 (0.13.0)
-    jmespath (1.6.1)
+    jmespath (1.6.2)
     json (2.6.2)
     kitchen-vagrant (1.12.1)
       test-kitchen (>= 1.4, < 4)
@@ -255,6 +267,9 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     method_source (1.0.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
     minitar (0.9)
     mixlib-archive (1.1.7)
       mixlib-log
@@ -264,7 +279,7 @@ GEM
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
-    mixlib-install (3.12.19)
+    mixlib-install (3.12.24)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -285,6 +300,11 @@ GEM
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.2.3)
+    net-ftp (0.2.0)
+      net-protocol
+      time
+    net-protocol (0.1.3)
+      timeout
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0)
@@ -292,13 +312,14 @@ GEM
     net-ssh (7.0.1)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
+    netrc (0.11.0)
     nori (2.6.0)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    ohai (17.9.0)
-      chef-config (>= 14.12, < 18)
-      chef-utils (>= 16.0, < 18)
+    ohai (18.0.26)
+      chef-config (>= 14.12, < 19)
+      chef-utils (>= 16.0, < 19)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -327,6 +348,23 @@ GEM
     public_suffix (5.0.0)
     rack (2.2.4)
     rainbow (3.1.1)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rest-client (2.1.0-x64-mingw32)
+      ffi (~> 1.9)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rest-client (2.1.0-x86-mingw32)
+      ffi (~> 1.9)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     retryable (3.0.5)
     rexml (3.2.5)
     rspec (3.11.0)
@@ -335,16 +373,16 @@ GEM
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.11.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
@@ -379,6 +417,9 @@ GEM
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
     thor (1.2.1)
+    time (0.2.0)
+      date
+    timeout (0.3.0)
     toml-rb (2.2.0)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
@@ -389,6 +430,10 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 5.0)
       net-ssh (>= 2.9, < 8.0)
+    train-rest (0.5.0)
+      aws-sigv4 (~> 1.5)
+      rest-client (~> 2.1)
+      train-core (~> 3.0)
     train-winrm (0.2.13)
       winrm (>= 2.3.6, < 3.0)
       winrm-elevated (~> 1.2.2)
@@ -411,13 +456,16 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    unicode-display_width (2.2.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.3.0)
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
     vault (0.17.0)
       aws-sigv4
     webrick (1.7.0)
-    win32-api (1.5.3-universal-mingw32)
+    win32-api (1.10.1)
     win32-certstore (0.6.15)
       chef-powershell (>= 1.0.12)
       ffi