Maintain separate gemspec for windows, update lock file to include ucrt block as this is the only way bundle install can pull windows gems, add lock file knife for the same reason

Signed-off-by: Neha Pansare <neha.pansare@progress.com>

5 files changed, 121 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index 0bb2f93da8..91ab9d6c77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,7 +81,7 @@ chef-utils/pkg
 
 # knife
 knife/.bundle
-knife/Gemfile.lock
+#knife/Gemfile.lock We need this lockfile (for now) so that chef gets installed with windows gemspec under knife on windows platforms.
 knife/pkg
 knife/spec/data/test-dir
 knife/spec/data/nodes
diff --git a/Gemfile.lock b/Gemfile.lock
index 18487630b5..03313e1747 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,9 +82,55 @@ PATH
       train-core (~> 3.10, >= 3.2.28)
       train-rest (>= 0.4.1)
       train-winrm (>= 0.2.5)
-      unf_ext (< 0.0.8.1)
+      unf_ext (>= 0.0.8.2)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
+    chef (18.0.149-x64-mingw-ucrt)
+      addressable
+      aws-sdk-s3 (~> 1.91)
+      aws-sdk-secretsmanager (~> 1.46)
+      chef-config (= 18.0.149)
+      chef-powershell (~> 1.0.12)
+      chef-utils (= 18.0.149)
+      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-libarchive (~> 1.0, >= 1.0.3)
+      ffi-yajl (~> 2.2)
+      iniparse (~> 1.4)
+      inspec-core (~> 4.23)
+      iso8601 (>= 0.12.1, < 0.14)
+      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, < 4.0)
+      ohai (~> 18.0)
+      plist (~> 3.2)
+      proxifier (~> 1.0)
+      syslog-logger (~> 1.6)
+      train-core (~> 3.2, >= 3.2.28)
+      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.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
@@ -382,7 +428,7 @@ GEM
       tty-screen (~> 0.8)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (>= 0.0.8.2)
     unicode-display_width (2.2.0)
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
@@ -393,8 +439,28 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.7.0)
+    win32-api (1.10.1)
+    win32-certstore (0.6.15)
+      chef-powershell (>= 1.0.12)
+      ffi
+    win32-event (0.6.3)
+      win32-ipc (>= 0.6.0)
+    win32-eventlog (0.6.3)
+      ffi
+    win32-ipc (0.7.0)
+      ffi
+    win32-mmap (0.4.2)
+      ffi
+    win32-mutex (0.4.3)
+      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)
diff --git a/chef-universal-mingw-ucrt.gemspec b/chef-universal-mingw-ucrt.gemspec
index 8e472ccdda..2edfd751f9 100644
--- a/chef-universal-mingw-ucrt.gemspec
+++ b/chef-universal-mingw-ucrt.gemspec
@@ -2,22 +2,22 @@ gemspec = instance_eval(File.read(File.expand_path("chef.gemspec", __dir__)))
 
 gemspec.platform = Gem::Platform.new(%w{x64-mingw-ucrt})
 
-# gemspec.add_dependency "win32-api", "~> 1.10.0"
-# gemspec.add_dependency "win32-event", "~> 0.6.1"
+gemspec.add_dependency "win32-api", "~> 1.10.0"
+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.
-# gemspec.add_dependency "win32-eventlog", "0.6.3"
-# gemspec.add_dependency "win32-mmap", "~> 0.4.1"
-# gemspec.add_dependency "win32-mutex", "~> 0.4.2"
-# gemspec.add_dependency "win32-process", "~> 0.9"
-# gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
-# gemspec.add_dependency "wmi-lite", "~> 1.0"
-# gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
-# gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
-# gemspec.add_dependency "win32-certstore", "~> 0.6.15" # 0.5+ required for specifying user vs. system store
-# gemspec.add_dependency "chef-powershell", "~> 1.0.12" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo.
+gemspec.add_dependency "win32-eventlog", "0.6.3"
+gemspec.add_dependency "win32-mmap", "~> 0.4.1"
+gemspec.add_dependency "win32-mutex", "~> 0.4.2"
+gemspec.add_dependency "win32-process", "~> 0.9"
+gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
+gemspec.add_dependency "wmi-lite", "~> 1.0"
+gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
+gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
+gemspec.add_dependency "win32-certstore", "~> 0.6.15" # 0.5+ required for specifying user vs. system store
+gemspec.add_dependency "chef-powershell", "~> 1.0.12" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo.
+
 gemspec.extensions << "ext/win32-eventlog/Rakefile"
 gemspec.files += Dir.glob("{distro,ext}/**/*")
-gemspec.required_ruby_version = ">= 3.1.2"
 
-gemspec
+gemspec
\ No newline at end of file
diff --git a/chef.gemspec b/chef.gemspec
index fa9d620938..d745b1f5fe 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -24,23 +24,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 3.1.0"
 
-  # Adding Windows support in here
-  if RUBY_PLATFORM == "x64-mingw-ucrt"
-    s.add_dependency "win32-mmap", "~> 0.4.1"
-    s.add_dependency "win32-mutex", "~> 0.4.2"
-    s.add_dependency "chef-powershell", "~> 1.0.12"
-    s.add_dependency "win32-api", "~> 1.10.0"
-    s.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
-    s.add_dependency "win32-event", "~> 0.6.1"
-    s.add_dependency "win32-taskscheduler", "~> 2.0"
-    s.add_dependency "win32-eventlog", "0.6.3"
-    s.add_dependency "win32-process", "~> 0.10"
-    s.add_dependency "wmi-lite", "~> 1.0"
-    s.add_dependency "iso8601", ">= 0.12.1", "< 0.14"
-    s.add_dependency "win32-certstore", "~> 0.6.15"
-    s.extensions << "ext/win32-eventlog/Rakefile"
-  end
-
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
   s.add_dependency "train-core", "~> 3.10", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
@@ -71,7 +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 "unf_ext", ">= 0.0.8.2" # This is ruby31 compatible ucrt gem version
   s.add_dependency "corefoundation", "~> 0.3.4" # macos_userdefaults resource
 
   s.add_dependency "proxifier", "~> 1.0"
diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock
new file mode 100644
index 0000000000..5a2596bdd9
--- /dev/null
+++ b/knife/Gemfile.lock
@@ -0,0 +1,37 @@
+PATH
+  remote: ..
+  specs:
+    chef (18.0.149)
+    chef (18.0.149-x64-mingw-ucrt)
+
+PLATFORMS
+  ruby
+  x64-mingw-ucrt
+
+DEPENDENCIES
+  appbundler
+  chef!
+  chef-bin!
+  chef-config!
+  chef-utils!
+  chef-vault
+  cheffish (>= 17)
+  chefstyle
+  ed25519 (~> 1.2)
+  fauxhai-ng
+  ffi (>= 1.15.5)
+  inspec-core-bin (>= 5)
+  ohai!
+  proxifier!
+  pry (= 0.13.0)
+  pry-byebug
+  pry-stack_explorer
+  rake
+  rb-readline
+  rest-client!
+  rspec
+  ruby-shadow!
+  webmock
+
+BUNDLED WITH
+   2.3.18
\ No newline at end of file