Merge pull request #12919 from chef/jfm/adhoc_unit_tests

5 files changed, 35 insertions, 22 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 68e2a4bd26..9d35ac6eb6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,6 +73,7 @@ PATH
       train-core (~> 3.2, >= 3.2.28)
       train-rest (>= 0.4.1)
       train-winrm (>= 0.2.5)
+      unf_ext (< 0.0.8.1)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
     chef (18.0.100-universal-mingw32)
@@ -108,9 +109,10 @@ PATH
       train-core (~> 3.2, >= 3.2.28)
       train-rest (>= 0.4.1)
       train-winrm (>= 0.2.5)
+      unf_ext (< 0.0.8.1)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-      win32-api (~> 1.5)
+      win32-api (~> 1.5.3)
       win32-certstore (~> 0.6.10)
       win32-event (~> 0.6.1)
       win32-eventlog (= 0.6.3)
@@ -154,7 +156,7 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.591.0)
+    aws-partitions (1.592.0)
     aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -167,7 +169,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.61.0)
+    aws-sdk-secretsmanager (1.62.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.0)
@@ -243,7 +245,7 @@ GEM
     hashdiff (1.0.1)
     hashie (4.1.0)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     iniparse (1.5.0)
@@ -403,7 +405,7 @@ GEM
     thor (1.2.1)
     time (0.2.0)
       date
-    timeout (0.2.0)
+    timeout (0.3.0)
     tomlrb (1.3.0)
     train-core (3.9.2)
       addressable (~> 2.5)
@@ -439,9 +441,9 @@ GEM
       tty-screen (~> 0.8)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
-    unf_ext (0.0.8.1-x64-mingw32)
-    unf_ext (0.0.8.1-x86-mingw32)
+    unf_ext (0.0.8)
+    unf_ext (0.0.8-x64-mingw32)
+    unf_ext (0.0.8-x86-mingw32)
     unicode-display_width (2.1.0)
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
@@ -452,7 +454,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.7.0)
-    win32-api (1.10.1-universal-mingw32)
+    win32-api (1.5.3-universal-mingw32)
     win32-certstore (0.6.15)
       chef-powershell (>= 1.0.12)
       ffi
@@ -499,7 +501,6 @@ PLATFORMS
   ruby
   x64-mingw32
   x86-mingw32
-  x86_64-darwin-19
 
 DEPENDENCIES
   appbundler
@@ -525,4 +526,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.5
+   2.3.14
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index 08664bd3cb..5e3c71c553 100644
--- a/chef-universal-mingw32.gemspec
+++ b/chef-universal-mingw32.gemspec
@@ -2,7 +2,7 @@ gemspec = eval(IO.read(File.expand_path("chef.gemspec", __dir__)))
 
 gemspec.platform = Gem::Platform.new(%w{universal mingw32})
 
-gemspec.add_dependency "win32-api", "~> 1.5"
+gemspec.add_dependency "win32-api", "~> 1.5.3"
 gemspec.add_dependency "win32-event", "~> 0.6.1"
 # TODO: Relax this pin and make the necessary updaets. The issue originally
 # leading to this pin has been fixed in 0.6.5.
diff --git a/chef.gemspec b/chef.gemspec
index 4a3092168f..e6ccf91744 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
   s.add_dependency "addressable"
   s.add_dependency "syslog-logger", "~> 1.6"
   s.add_dependency "uuidtools", ">= 2.1.5", "< 3.0" # osx_profile resource
+  s.add_dependency "unf_ext", "< 0.0.8.1" # temporary until it loads properly on Windows
   s.add_dependency "corefoundation", "~> 0.3.4" # macos_userdefaults resource
 
   s.add_dependency "proxifier", "~> 1.0"
diff --git a/lib/chef/win32/version.rb b/lib/chef/win32/version.rb
index 65cf2fc5f0..a4a196ed4a 100644
--- a/lib/chef/win32/version.rb
+++ b/lib/chef/win32/version.rb
@@ -51,7 +51,8 @@ class Chef
       WIN_VERSIONS = {
         "Windows Server 2022" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number >= 20348 } },
         "Windows Server 2019" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number >= 17763 && build_number < 20348 } },
-        "Windows 10" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION } },
+        "Windows 11" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION && build_number >= 22000 } },
+        "Windows 10" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION && build_number >= 19044 && build_number < 22000 } },
         "Windows Server 2016" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number <= 14393 } },
         "Windows 8.1" => { major: 6, minor: 3, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION } },
         "Windows Server 2012 R2" => { major: 6, minor: 3, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION } },
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 0886df82ad..9774eabff8 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 36f49ec7dff16c5bf5d60e106ae709dcf1f824b1
+  revision: 29ebd6cc3f9c3e4e96b9cfbdc426514d60c10aaf
   branch: main
   specs:
     omnibus-software (4.0.0)
@@ -8,10 +8,10 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: 63be4f1663fe28c35e762697500dab7dd88c4dbf
+  revision: 78ad41dcb79f0153c7f8efb963ea4d80fe055340
   branch: main
   specs:
-    omnibus (9.0.0)
+    omnibus (9.0.2)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
       chef-utils (>= 15.4)
@@ -20,6 +20,7 @@ GIT
       license_scout (~> 1.0)
       mixlib-shellout (>= 2.0, < 4.0)
       mixlib-versioning
+      nokogiri (~> 1)
       ohai (>= 15, < 18)
       pedump
       ruby-progressbar (~> 1.7)
@@ -33,7 +34,7 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.590.0)
+    aws-partitions (1.592.0)
     aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -46,7 +47,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.61.0)
+    aws-sdk-secretsmanager (1.62.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.0)
@@ -142,7 +143,7 @@ GEM
       win32-service (>= 2.1.5, < 3.0)
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
-    chef-cleanroom (1.0.4)
+    chef-cleanroom (1.0.5)
     chef-config (17.10.0)
       addressable
       chef-utils (= 17.10.0)
@@ -246,15 +247,16 @@ GEM
       tomlrb (>= 1.2, < 3.0)
       tty-box (~> 0.6)
       tty-prompt (~> 0.20)
-    license_scout (1.2.16)
+    license_scout (1.3.0)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
     little-plugger (1.1.4)
-    logging (2.3.0)
+    logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     method_source (1.0.0)
+    mini_portile2 (2.8.0)
     minitar (0.9)
     mixlib-archive (1.1.7)
       mixlib-log
@@ -287,6 +289,13 @@ GEM
     net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    nokogiri (1.13.6-x64-mingw32)
+      racc (~> 1.4)
+    nokogiri (1.13.6-x86-mingw32)
+      racc (~> 1.4)
     nori (2.6.0)
     octokit (4.22.0)
       faraday (>= 0.9)
@@ -320,6 +329,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.7)
+    racc (1.6.0)
     rack (2.2.3)
     rainbow (3.1.1)
     retryable (3.0.5)
@@ -472,4 +482,4 @@ DEPENDENCIES
   winrm-fs (~> 1.0)
 
 BUNDLED WITH
-   2.3.5
+   2.3.14