chef-powershell 2.18.6 → 3.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f019aa6ec88c30ebe38c6a43aa2200421ba37f6d0b8205cbd58ddccec496f8e8
-  data.tar.gz: 313478b0ad0850b795de5cf0a54db8a970341b5f8fa06ca39c030cf9135dc82f
+  metadata.gz: 4d93049c98f0e42d1cf2760cf353eb4fb16d0259ff0fec3790e0d1763a835bc4
+  data.tar.gz: 2a162dc437e62342bf1fd54fdbf5d0aa82b77047320135c27c40b1672e6d97b5
 SHA512:
-  metadata.gz: 3e5be4e69ae8804a3eebabbcbf0dd1b39079e28b17d42f6085d67f6832ac0cc52285753fa87109688dd96b79bc4410b3f8b2e2e836b1659aae73a62c3d997b3c
-  data.tar.gz: 5b6952643227ac0dfa25b5818288e5dfed465e871e842d618a46636dd2702153531715fe80f86c0cbebc0d22ba2cd0dc583a537b205f8d2a845e7d91f5a59f8e
+  metadata.gz: e13dad4b1a55c8af3bcdffdc0728ccd4bea6eeaa1d75cd17d3d3f1cffb2bb5393c42fa3f8138c2c4258f54d7ef7d66187d6a5433d77f46042db880b2577f4ce4
+  data.tar.gz: 4008e7bf79b9df4de1cc06facb61a9938cdddff1903880df37b3af3ba81cf01e2a99d00d13e11e1e1f84e49231bd2bab34d3dc8c2947ae81f43592c678499268

data/chef-powershell.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.6"
 
   spec.add_runtime_dependency "ffi", "~> 1.15"
-  spec.add_runtime_dependency "ffi-yajl", "~> 2.4"
+  spec.add_runtime_dependency "ffi-yajl", "~> 3.0"
 
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",

data/lib/chef-powershell/powershell.rb

@@ -64,10 +64,6 @@ 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
@@ -76,30 +72,17 @@ class ChefPowerShell
       @@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
+      AllocateCallback = FFI::Function.new(:pointer, [:size_t]) do |size|
+        # Capture the pointer here so that Ruby knows that it is an
+        # FFI::MemoryPointer that can receive &.free. If you try to
+        # free the pointer from execute_powershell, Ruby will not have
+        # access to the type information and will core dump spectacularly.
+        @@pointer = FFI::MemoryPointer.new(:uchar, size)
+      end
+
+      def self.free_pointer
+        @@pointer&.free
+        @@pointer = nil
       end
 
       def self.set_ps_dll(value)
@@ -115,12 +98,10 @@ 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}, :pointer
 
-        execute_powershell(@@ps_command, @@ps_timeout, StoreResultCallback)
+        execute_powershell(@@ps_command, @@ps_timeout, AllocateCallback)
       end
     end
 
@@ -136,10 +117,13 @@ class ChefPowerShell
 
       PowerMod.set_ps_command(script)
       execution = PowerMod.do_work
-      raise PowerMod.exception if PowerMod.exception
-      @result = PowerMod.result
-      @errors = PowerMod.errors
-      @verbose = PowerMod.verbose
+      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"]
+    ensure
+      PowerMod.free_pointer
     end
   end
 end

data/lib/chef-powershell/version.rb

@@ -16,5 +16,5 @@
 
 module ChefPowerShellModule
   CHEFPOWERSHELL_ROOT = File.expand_path("..", __dir__)
-  VERSION = "2.18.6".freeze
+  VERSION = "3.0.30".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-powershell
 version: !ruby/object:Gem::Version
-  version: 2.18.6
+  version: 3.0.30
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 description: 
 email:
 - oss@chef.io