chef-powershell 18.1.0 → 18.6.3

data/chef-powershell.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/chef/chef-powershell-shim"
   spec.license       = "Apache-2.0"
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.add_runtime_dependency "ffi", "~> 1.15"
   spec.add_runtime_dependency "ffi-yajl", "~> 2.4"
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",
     "changelog_uri" => "https://github.com/chef/chef-powershell-shim/CHANGELOG.md",
     "documentation_uri" => "https://github.com/chef/chef-powershell-shim/chef-powershell/README.md",
-    "homepage_uri" => "https://github.com/chef/chef/tree/main/chef-powershell",
+    "homepage_uri" => "https://github.com/chef/chef/tree/18-Stable/chef-powershell",
     "source_code_uri" => "https://github.com/chef/chef-powershell-shim/chef-powershell",
   }
 

data/lib/chef-powershell/powershell.rb

@@ -27,6 +27,40 @@ class ChefPowerShell
     attr_reader :errors
     attr_reader :verbose
 
+    def self.resolve_wrapper_dll
+      arch = ENV["PROCESSOR_ARCHITECTURE"] || "AMD64"
+      searched = []
+
+      # Gem path
+      if Gem.loaded_specs["chef-powershell"]
+        base = Gem.loaded_specs["chef-powershell"].full_gem_path
+        gem_path = File.join(base, "bin", "ruby_bin_folder", arch, "Chef.PowerShell.Wrapper.dll")
+        searched << gem_path
+        return gem_path if File.exist?(gem_path)
+      end
+
+      # CHEF_POWERSHELL_BIN override
+      if ENV["CHEF_POWERSHELL_BIN"]&.length.to_i > 0
+        override = File.join(ENV["CHEF_POWERSHELL_BIN"], "Chef.PowerShell.Wrapper.dll")
+        searched << override
+        return override if File.exist?(override)
+      end
+
+      # Habitat package fallback (hab installed scenario)
+      begin
+        hab_path = `hab pkg path chef/chef-powershell-shim 2>NUL`.strip
+        if hab_path != "" && File.directory?(hab_path)
+          hab_dll = File.join(hab_path, "bin", "Chef.PowerShell.Wrapper.dll")
+          searched << hab_dll
+          return hab_dll if File.exist?(hab_dll)
+        end
+      rescue => e
+        # ignore any hab errors, just proceed
+      end
+
+      raise LoadError, "Chef.PowerShell wrapper DLL not found. Searched: #{searched.join(', ')}. Populate binaries via 'rake update_chef_powershell_dlls' or set CHEF_POWERSHELL_BIN."
+    end
+
     # Run a command under PowerShell via FFI
     # This implementation requires the managed dll and native wrapper to be in the library search
     # path on Windows (i.e. c:\windows\system32 or in the same location as ruby.exe).
@@ -41,7 +75,8 @@ class ChefPowerShell
       # Every merge into that repo triggers a Habitat build and verification process.
       # There is no mechanism to build a Windows gem file. It has to be done manually running manual_gem_release.ps1
       # Bundle install ensures that the correct architecture binaries are installed into the path.
-      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/Chef.PowerShell.Wrapper.dll"
+      # @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/Chef.PowerShell.Wrapper.dll"
+      @powershell_dll = self.class.resolve_wrapper_dll
       exec(script, timeout: timeout)
     end
 
@@ -72,7 +107,11 @@ class ChefPowerShell
       # FFI requires attaching to modules, not classes, so we need to
       # have a module here. The module level variables *could* be refactored
       # out here, but still 100% of the work still goes through the module.
-      @@powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/Chef.PowerShell.Wrapper.dll"
+      # @@powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/Chef.PowerShell.Wrapper.dll"
+      # NOTE: Previously this line called self.resolve_wrapper_dll at class definition time,
+      # but no such method exists inside this module (it's defined on the outer PowerShell class),
+      # leading to NoMethodError during require. We now lazy-resolve through a delegator.
+      @@powershell_dll = nil
       @@ps_command = ""
       @@ps_timeout = -1
 
@@ -105,6 +144,11 @@ class ChefPowerShell
         @@powershell_dll = value
       end
 
+      # Resolve DLL via outer class method; cache the result
+      def self.ensure_ps_dll
+        @@powershell_dll ||= ChefPowerShell::PowerShell.resolve_wrapper_dll
+      end
+
       def self.set_ps_command(value)
         @@ps_command = value
       end
@@ -116,6 +160,7 @@ class ChefPowerShell
       def self.do_work
         @exception = nil
         @retry_count = 0
+        ensure_ps_dll unless @@powershell_dll
         ffi_lib @@powershell_dll
         attach_function :execute_powershell, :ExecuteScript, %i{string int pointer}, :pointer
 
@@ -130,7 +175,7 @@ class ChefPowerShell
 
       # Set it every time because the test suite actually switches
       # the DLL pointed to.
-      PowerMod.set_ps_dll(@powershell_dll)
+  PowerMod.set_ps_dll(@powershell_dll)
       PowerMod.set_ps_timeout(timeout)
 
       PowerMod.set_ps_command(script)

data/lib/chef-powershell/powershell_exec.rb

@@ -100,8 +100,23 @@ class ChefPowerShell
     module PowerShellExec
       # The Chef.PowerShell.Wrapper.dll file looks in the same folder as ruby.exe OR in the folder specified by the environment variable CHEF_POWERSHELL_BIN for other chef powershell dll's
       # We don't want to move files around so we're setting the variable here to keep everything tidy.
-      file_path = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/"
-      ENV["CHEF_POWERSHELL_BIN"] = file_path
+      # file_path = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/"
+      # ENV["CHEF_POWERSHELL_BIN"] = file_path
+      file_path = File.join(Gem.loaded_specs["chef-powershell"].full_gem_path, "bin", "ruby_bin_folder", ENV["PROCESSOR_ARCHITECTURE"] || "AMD64")
+      if File.directory?(file_path)
+        ENV["CHEF_POWERSHELL_BIN"] = file_path
+      else
+        # Habitat fallback: try locating the built package and use its bin directory
+        begin
+          hab_path = `hab pkg path chef/chef-powershell-shim 2>NUL`.strip
+          if hab_path != "" && File.directory?(hab_path)
+            candidate = File.join(hab_path, "bin")
+            ENV["CHEF_POWERSHELL_BIN"] = candidate if File.directory?(candidate)
+          end
+        rescue
+          # ignore habitat lookup failures
+        end
+      end
       # Run a command under PowerShell via a managed (.NET) API.
       #
       # Requires: .NET Framework 4.0 or higher on the target machine.

data/lib/chef-powershell/pwsh.rb

@@ -17,6 +17,20 @@
 
 class ChefPowerShell
   class Pwsh < ChefPowerShell::PowerShell
+
+    def self.resolve_core_wrapper_dll
+      base = Gem.loaded_specs["chef-powershell"].full_gem_path
+      arch = ENV["PROCESSOR_ARCHITECTURE"] || "AMD64"
+      dll_path = File.join(base, "bin", "ruby_bin_folder", arch, "shared", "Microsoft.NETCore.App", "8.0.0", "Chef.PowerShell.Wrapper.Core.dll")
+      return dll_path if File.exist?(dll_path)
+
+      override = ENV["CHEF_POWERSHELL_BIN"]
+      candidate = override && File.join(override, "shared", "Microsoft.NETCore.App", "8.0.0", "Chef.PowerShell.Wrapper.Core.dll")
+      return candidate if candidate && File.exist?(candidate)
+
+      raise LoadError, "Pwsh Core wrapper DLL not found at #{dll_path}. Populate binaries via rake update_chef_powershell_dlls"
+    end
+    
     # Run a command under pwsh (powershell core) via FFI
     # This implementation requires the managed dll, native wrapper and a
     # published, self contained dotnet core directory tree to exist in the
@@ -46,12 +60,19 @@ class ChefPowerShell
       original_dotnet_root = ENV["DOTNET_ROOT"]
       original_dotnet_root_x86 = ENV["DOTNET_ROOT(x86)"]
 
-      ENV["DOTNET_MULTILEVEL_LOOKUP"] = "0"
-      ENV["DOTNET_ROOT"] = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/AMD64"
-      ENV["DOTNET_ROOT(x86)"] = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/x86"
+      # ENV["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+      # ENV["DOTNET_ROOT"] = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/AMD64"
+      # ENV["DOTNET_ROOT(x86)"] = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/x86"
+
+      # @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/8.0.0/Chef.PowerShell.Wrapper.Core.dll"
 
-      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll"
+      # super
+      ENV["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+      arch_root = File.join(Gem.loaded_specs["chef-powershell"].full_gem_path, "bin", "ruby_bin_folder", "AMD64")
+      ENV["DOTNET_ROOT"] = arch_root
+      ENV["DOTNET_ROOT(x86)"] = File.join(Gem.loaded_specs["chef-powershell"].full_gem_path, "bin", "ruby_bin_folder", "x86")
 
+      @powershell_dll = self.class.resolve_core_wrapper_dll
       super
     ensure
       ENV["DOTNET_MULTILEVEL_LOOKUP"] = original_dml
@@ -67,8 +88,9 @@ class ChefPowerShell
       # ensures that the correct architecture binaries are installed into the path.
       # Also note that the version of pwsh is determined by which assemblies the dll was
       # built with. To update powershell, those dependencies must be bumped.
-      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll"
-      @dll ||= @powershell_dll
+      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/8.0.0/Chef.PowerShell.Wrapper.Core.dll"
+      # @dll ||= @powershell_dll
+      @dll ||= resolve_core_wrapper_dll
     end
   end
 end

data/lib/chef-powershell/version.rb

@@ -16,5 +16,5 @@
 
 module ChefPowerShellModule
   CHEFPOWERSHELL_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.1.0"
+  VERSION = "18.6.3"
 end