train-core 3.12.7 → 3.12.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec52fd6612726e12c5f2cabae1a8f45eea7602c87dc2e7d230f579d16f0ac5d
-  data.tar.gz: e19c22f689bfb0cc0d4ded96f808cc68976866bf934b53d8bca293036532a192
+  metadata.gz: 73cef55a9f03d277375cc9a8595106dfed5b137d37b59b423a877f20b3517781
+  data.tar.gz: 82d70967052893b197de306d02a809b09ff5bb15288c9c26139c6feafe7cc739
 SHA512:
-  metadata.gz: b2ee00b9ab8590acb2a1c87bbbbc653141f276a2b8be5a306f7ba497b15f5010d297f9f06fadd62d5573e01de70eb967800aa529b6507d5755ce86df82ed0e8b
-  data.tar.gz: 26dbb3b68b1ec9697d20b129b64fa0eab4421b7a717b21ac234bc4d32756783f60a085221a5b70e11281d5671a15359c70c4e903a72e26118ff69805c75949e5
+  metadata.gz: 131639aca4c3b17c3da436bf0fefea1becb37f79cc778cd127f7864bf0cf9260e6d63254a00279e9b35d6df371e4673a5604a7b22951f3f54235328b7c629412
+  data.tar.gz: cb562de67060c842a4e3fa86609ddf4f1fc45f50000024f8feab3a7050cc7bebc0b5ad7d0768a34eaa2572beec4f95a97d71c2d4e37b7782c5d26bc71c8f5608

data/lib/train/platforms/detect/helpers/os_windows.rb

@@ -25,6 +25,9 @@ module Train::Platforms::Detect::Helpers
         @platform[:name] = "Windows #{@platform[:release]}"
       end
 
+      # `Get-CimInstance` is a PowerShell-specific command and is not available in Command Prompt.
+      # Since the logic has always relied on `read_wmic` at this point, we are skipping the conditional check for `wmic_available?`
+      # and directly invoking `read_wmic` to maintain the existing behavior.
       read_wmic
       true
     end
@@ -42,7 +45,9 @@ module Train::Platforms::Detect::Helpers
         @platform[:release] = payload["Version"]
         @platform[:name] = payload["Caption"]
 
-        read_wmic
+        # Prefer retrieving the OS details via `wmic` if available on the system to retain existing behavior.
+        # If `wmic` is not available, fall back to using CIM as an alternative method.
+        wmic_available? ? read_wmic : read_cim_os
         true
       rescue
         false
@@ -108,7 +113,7 @@ module Train::Platforms::Detect::Helpers
     def windows_uuid
       uuid = windows_uuid_from_chef
       uuid = windows_uuid_from_machine_file if uuid.nil?
-      uuid = windows_uuid_from_wmic if uuid.nil?
+      uuid = windows_uuid_from_wmic_or_cim if uuid.nil?
       uuid = windows_uuid_from_registry if uuid.nil?
       raise Train::TransportError, "Cannot find a UUID for your node." if uuid.nil?
 
@@ -134,11 +139,51 @@ module Train::Platforms::Detect::Helpers
       json["node_uuid"]
     end
 
+    def windows_uuid_from_wmic_or_cim
+      # Retrieve the Windows UUID using `wmic` if it is available and not marked as deprecated, maintaining compatibility with older systems.
+      # If `wmic` is unavailable or deprecated, use the `Get-CimInstance` command, which is the modern and recommended approach by Microsoft.
+      wmic_available? ? windows_uuid_from_wmic : windows_uuid_from_cim
+    end
+
     def windows_uuid_from_wmic
-      result = @backend.run_command("wmic csproduct get UUID")
+      # Switched from `wmic csproduct get UUID` to `wmic csproduct get UUID /value`
+      # to make the parsing of the UUID more reliable and consistent.
+      #
+      # When using the original `wmic csproduct get UUID` command, the output includes
+      # a header line and spacing that can vary depending on the system, making it harder
+      # to reliably extract the UUID. In some cases, splitting by line and taking the last
+      # element returns an empty string, even when exit_status is 0.
+      #
+      # Example:
+      #
+      # (byebug) result = @backend.run_command("wmic csproduct get UUID")
+      # #<struct Train::Extras::CommandResult stdout="UUID                                  \r\r\nEC20EBD7-8E03-06A8-645F-2D22E5A3BA4B  \r\r\n\r\r\n", stderr="", exit_status=0>
+      # (byebug) result.stdout
+      # "UUID                                  \r\r\nEC20EBD7-8E03-06A8-645F-2D22E5A3BA4B  \r\r\n\r\r\n"
+      # (byebug) result.exit_status
+      # 0
+      # (byebug) result.stdout.split("\r\n")[-1].strip
+      # ""
+      #
+      # In contrast, `wmic csproduct get UUID /value` returns a consistent `UUID=<value>` format,
+      # which is more suitable for regex matching.
+      #
+      # Example:
+      #
+      # byebug) result = @backend.run_command("wmic csproduct get UUID /value")
+      # #<struct Train::Extras::CommandResult stdout="\r\r\n\r\r\nUUID=EC20EBD7-8E03-06A8-645F-2D22E5A3BA4B\r\r\n\r\r\n\r\r\n\r\r\n", stderr="", exit_status=0>
+      # (byebug) result.stdout
+      # "\r\r\n\r\r\nUUID=EC20EBD7-8E03-06A8-645F-2D22E5A3BA4B\r\r\n\r\r\n\r\r\n\r\r\n"
+      # (byebug) result.stdout&.match(/UUID=([A-F0-9\-]+)/i)&.captures&.first
+      # "EC20EBD7-8E03-06A8-645F-2D22E5A3BA4B"
+      #
+      # This change improves parsing reliability and handles edge cases where the previous
+      # approach would return `nil` or raise errors on empty output lines.
+
+      result = @backend.run_command("wmic csproduct get UUID /value")
       return unless result.exit_status == 0
 
-      result.stdout.split("\r\n")[-1].strip
+      result.stdout&.match(/UUID=([A-F0-9\-]+)/i)&.captures&.first
     end
 
     def windows_uuid_from_registry
@@ -148,5 +193,63 @@ module Train::Platforms::Detect::Helpers
 
       result.stdout.chomp
     end
+
+    # Checks if `wmic` is available and not deprecated
+    def wmic_available?
+      # Return memoized value if already checked
+      return @wmic_available unless @wmic_available.nil?
+
+      # Runs the `wmic /?`` command, which provides help information for the WMIC (Windows Management Instrumentation Command-line) tool.
+      # It displays a list of available global switches and aliases, as well as details about their usage.
+      # The output also includes information about deprecated status for the 'wmic' tool.
+      result = @backend.run_command("wmic /?")
+
+      # Check if command ran successfully and output does not contain 'wmic is deprecated'
+      @wmic_available = result.exit_status == 0 && !(result.stdout.downcase.include?("wmic is deprecated"))
+    end
+
+    def read_cim_os
+      cmd = 'powershell -Command "Get-CimInstance Win32_OperatingSystem | Select-Object Caption, Version, BuildNumber | ConvertTo-Json"'
+      res = @backend.run_command(cmd)
+      return unless res.exit_status == 0
+
+      begin
+        sys_info = JSON.parse(res.stdout)
+        @platform[:release] = sys_info["Version"]
+        @platform[:build] = sys_info["BuildNumber"]
+        @platform[:name] = sys_info["Caption"]
+        @platform[:name] = @platform[:name].gsub("Microsoft", "").strip unless @platform[:name].empty?
+        @platform[:arch] = read_cim_cpu
+      rescue
+        nil
+      end
+    end
+
+    def read_cim_cpu
+      cmd = 'powershell -Command "(Get-CimInstance Win32_Processor).Architecture"'
+      res = @backend.run_command(cmd)
+      return unless res.exit_status == 0
+
+      arch_map = {
+        0 => "i386",
+        1 => "mips",
+        2 => "alpha",
+        3 => "powerpc",
+        5 => "arm",
+        6 => "ia64",
+        9 => "x86_64",
+      }
+
+      arch_map[res.stdout.strip.to_i]
+    end
+
+    def windows_uuid_from_cim
+      cmd = 'powershell -Command "(Get-CimInstance -Class Win32_ComputerSystemProduct).UUID"'
+      res = @backend.run_command(cmd)
+      return unless res.exit_status == 0
+
+      res.stdout.strip
+    end
+
   end
 end

data/lib/train/version.rb

@@ -2,5 +2,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = "3.12.7".freeze
+  VERSION = "3.12.13".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.12.7
+  version: 3.12.13
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2025-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Transport interface to talk to a selected set of backends.