chef-powershell 1.0.13 → 2.18.6

data/lib/chef-powershell/powershell.rb

@@ -64,11 +64,44 @@ class ChefPowerShell
     end
 
     module PowerMod
+      class << self
+        attr_accessor :result_string, :retry_count, :exception, :result, :errors, :verbose, :hashed_outcome
+      end
+
       extend FFI::Library
+      # 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"
       @@ps_command = ""
       @@ps_timeout = -1
 
+      StoreResultCallback = FFI::Function.new(:bool, [:pointer, :size_t]) do |data, size|
+        # try parsing the result *first* before returning from the function, and if it fails,
+        # return false so that the function can be retried from the C++ side.
+        begin
+          @result_string = data.get_bytes(0, size).force_encoding("UTF-16LE").encode("UTF-8")
+          @hashed_outcome = FFI_Yajl::Parser.parse(@result_string)
+          @result = FFI_Yajl::Parser.parse(@hashed_outcome["result"])
+          @errors = @hashed_outcome["errors"]
+          @verbose = @hashed_outcome["verbose"]
+          true
+        rescue NoMethodError, FFI_Yajl::ParseError => e
+          @retry_count += 1
+          # capture exception so that it can be raised later, since otherwise
+          # we will be raising back to C++.
+          @exception = e
+          return true if @retry_count > 3
+          puts "Retrying PowerShell command execution #{@retry_count}"
+          sleep 1
+          false
+        rescue => e
+          # no retry for other exceptions
+          @exception = e
+          true
+        end
+      end
+
       def self.set_ps_dll(value)
         @@powershell_dll = value
       end
@@ -82,9 +115,12 @@ class ChefPowerShell
       end
 
       def self.do_work
+        @exception = nil
+        @retry_count = 0
         ffi_lib @@powershell_dll
-        attach_function :execute_powershell, :ExecuteScript, %i{string int}, :pointer
-        execute_powershell(@@ps_command, @@ps_timeout)
+        attach_function :execute_powershell, :ExecuteScript, %i{string int pointer}, :pointer
+
+        execute_powershell(@@ps_command, @@ps_timeout, StoreResultCallback)
       end
     end
 
@@ -92,15 +128,18 @@ class ChefPowerShell
 
     def exec(script, timeout: -1)
       timeout = -1 if timeout == 0 || timeout.nil?
+
+      # Set it every time because the test suite actually switches
+      # the DLL pointed to.
       PowerMod.set_ps_dll(@powershell_dll)
       PowerMod.set_ps_timeout(timeout)
+
       PowerMod.set_ps_command(script)
       execution = PowerMod.do_work
-      output = execution.read_utf16string
-      hashed_outcome = FFI_Yajl::Parser.parse(output)
-      @result = FFI_Yajl::Parser.parse(hashed_outcome["result"])
-      @errors = hashed_outcome["errors"]
-      @verbose = hashed_outcome["verbose"]
+      raise PowerMod.exception if PowerMod.exception
+      @result = PowerMod.result
+      @errors = PowerMod.errors
+      @verbose = PowerMod.verbose
     end
   end
 end

data/lib/chef-powershell/version.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: true
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
@@ -16,5 +16,5 @@
 
 module ChefPowerShellModule
   CHEFPOWERSHELL_ROOT = File.expand_path("..", __dir__)
-  VERSION = "1.0.13"
+  VERSION = "2.18.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-powershell
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 2.18.6
 platform: ruby
 authors:
 - Chef Software, Inc
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-description:
+description: 
 email:
 - oss@chef.io
 executables: []
@@ -329,7 +329,7 @@ files:
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mi.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/miutils.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordaccore.dll
-- bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordaccore_amd64_amd64_5.0.521.16609.dll
+- bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordaccore_amd64_amd64_5.0.1522.11506.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordbi.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscorlib.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscorrc.dll
@@ -674,7 +674,7 @@ metadata:
   documentation_uri: https://github.com/chef/chef-powershell-shim/chef-powershell/README.md
   homepage_uri: https://github.com/chef/chef/tree/main/chef-powershell
   source_code_uri: https://github.com/chef/chef-powershell-shim/chef-powershell
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -690,9 +690,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.3
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: External Chef module for accessing and utilizing PowerShell
 test_files: []