ohai 18.2.7 → 19.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4124cfc978827ab3b466501f06996a182e94c217c9e5bbb0edf77103cb8f1c
-  data.tar.gz: 3ae478f5e047780d6d9dff9859e84a94bd776ef6e0de2b190b1b647ef1d7421b
+  metadata.gz: 6339d53754721217929ead82d4a232ace638f648d5e7ba2469221dfd22da54a0
+  data.tar.gz: 28eda66502f23a2bacf4c96407fb89193023fe76cd5f30f0ab839096def6e044
 SHA512:
-  metadata.gz: cb4420bce8dd0ce5226b75fcedc44ecd8341e8a2597e57e755c3b472879eb9428cf5eca8aca09c57f7f5f57d7ff26bbc195fb816433612a41c118afd5ee97db2
-  data.tar.gz: 33b15548b40a5f556aa76db1da0b40ad89ee9e9d122dccbc6b1f133a9ce1c2d2ddd758a00345d50ff4e1a8e08221c13c58dbee20e868cd2ef3f2293ea4dd8c10
+  metadata.gz: c33166e19c09e55f3b28d9ee437a350666b7241b949e0b45bc1e4cc27118bc86130f2c6520c7a136de879d3e72fde0254cadbe3d562646abc7298cbb8b437731
+  data.tar.gz: ffd0515bda588dee888dcd1deed4a8d1275b35ddbb55d7b8913b5e87203781628820f0417df55847da3e27a2cec85b2df2e7a2cb7dcb632b9f1181d2f0575e03

data/Gemfile

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
 
-# pull these gems from main of chef/chef so that we're testing against what we will release
-gem "chef-config", git: "https://github.com/chef/chef", branch: "chef-18", glob: "chef-config/chef-config.gemspec"
-gem "chef-utils", git: "https://github.com/chef/chef", branch: "chef-18", glob: "chef-utils/chef-utils.gemspec"
-
+# pull these gems from main of chef/chef so that we"re testing against what we will release
+gem "appbundler"
+gem "chef-config", git: "https://github.com/chef/chef", branch: "main", glob: "chef-config/chef-config.gemspec"
+gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "chef-utils/chef-utils.gemspec"
+gem "ffi", "~> 1.17", force_ruby_platform: true
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
   gem "cookstyle", ">= 7.32.8"
@@ -16,8 +18,6 @@ group :development do
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop-performance", "1.18.0"
-  gem "rubocop-rspec"
 end
 
 group :debug do

data/lib/ohai/loader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Claire McQuin (<claire@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -97,10 +98,10 @@ module Ohai
     # @return [Object] class object for the ohai plugin defined in the file
     def load_plugin_class(plugin_path)
       # Read the contents of the plugin to understand if it's a V6 or V7 plugin.
-      contents = ""
+      contents = nil
       begin
         logger.trace("Loading plugin at #{plugin_path}")
-        contents << File.read(plugin_path)
+        contents = File.read(plugin_path)
       rescue IOError, Errno::ENOENT
         logger.warn("Unable to open or read plugin at #{plugin_path}")
         return nil

data/lib/ohai/mixin/oci_metadata.rb

@@ -28,6 +28,39 @@ module Ohai
       OCI_METADATA_URL = "/opc/v2"
       CHASSIS_ASSET_TAG_FILE = "/sys/devices/virtual/dmi/id/chassis_asset_tag"
 
+      # Get the chassis asset tag from DMI information
+      # On Linux: reads from sysfs
+      # On Windows: queries WMI Win32_SystemEnclosure
+      def chassis_asset_tag
+        if RUBY_PLATFORM =~ /mswin|mingw|windows/
+          get_chassis_asset_tag_windows
+        else
+          get_chassis_asset_tag_linux
+        end
+      end
+
+      # Read chassis asset tag from Linux sysfs
+      def get_chassis_asset_tag_linux
+        return unless ::File.exist?(CHASSIS_ASSET_TAG_FILE)
+
+        ::File.read(CHASSIS_ASSET_TAG_FILE).strip
+      rescue => e
+        logger.debug("Mixin OciMetadata: Failed to read chassis asset tag from #{CHASSIS_ASSET_TAG_FILE}: #{e}")
+        nil
+      end
+
+      # Read chassis asset tag from Windows WMI
+      def get_chassis_asset_tag_windows
+        require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+
+        wmi = WmiLite::Wmi.new
+        enclosure = wmi.first_of("Win32_SystemEnclosure")
+        enclosure&.[]("SMBIOSAssetTag")
+      rescue => e
+        logger.debug("Mixin OciMetadata: Failed to read chassis asset tag from WMI: #{e}")
+        nil
+      end
+
       # fetch the meta content with a timeout and the required header
       def http_get(uri)
         conn = Net::HTTP.start(OCI_METADATA_ADDR)
@@ -51,7 +84,7 @@ module Ohai
           end
           json_data
         else
-          logger.warn("Mixin OciMetadata: Received response code #{response.code} requesting metadata")
+          logger.debug("Mixin OciMetadata: Received response code #{response.code} requesting #{metadata}")
           nil
         end
       end

data/lib/ohai/plugins/alibaba.rb

@@ -54,7 +54,7 @@ Ohai.plugin(:Alibaba) do
   # a single check that combines all the various detection methods for Alibaba
   # @return [Boolean] Does the system appear to be on Alibaba
   def looks_like_alibaba?
-    true if hint?("alibaba") || has_ali_dmi?
+    hint?("alibaba") || has_ali_dmi?
   end
 
   collect_data do

data/lib/ohai/plugins/ec2.rb

@@ -108,7 +108,11 @@ Ohai.plugin(:EC2) do
   end
 
   collect_data do
-    require "base64" unless defined?(Base64)
+    begin
+      require "base64" unless defined?(Base64)
+    rescue LoadError
+      logger.warn("Plugin EC2: base64 gem not found. Binary userdata will not be properly encoded.")
+    end
 
     if looks_like_ec2?
       logger.trace("Plugin EC2: looks_like_ec2? == true")

data/lib/ohai/plugins/eucalyptus.rb

@@ -29,7 +29,7 @@ Ohai.plugin(:Eucalyptus) do
   provides "eucalyptus"
   depends "network/interfaces"
 
-  MAC_MATCH = /^[dD]0:0[dD]:/.freeze unless defined?(MAC_MATCH)
+  MAC_MATCH = /^[dD]0:0[dD]:/ unless defined?(MAC_MATCH)
 
   # returns the mac address from the collection of all address types
   def get_mac_address(addresses)

data/lib/ohai/plugins/filesystem.rb

@@ -744,10 +744,6 @@ Ohai.plugin(:Filesystem) do
     fs_data["by_mountpoint"] = by_mountpoint
     fs_data["by_pair"] = by_pair
 
-    # Chef 16 added 'filesystem2'
-    # In Chef 17 we made 'filesystem' and 'filesystem2' match (both new-style)
-    # In Chef 18 we will drop 'filesystem2'
     filesystem fs_data
-    filesystem2 fs_data
   end
 end

data/lib/ohai/plugins/freebsd/network.rb

@@ -43,7 +43,7 @@ Ohai.plugin(:Network) do
     so = shell_out("#{Ohai.abs_path( "/sbin/ifconfig" )} -a")
     cint = nil
     so.stdout.lines do |line|
-      if line =~ /^([0-9a-zA-Z\.]+):\s+/
+      if line =~ /^([0-9a-zA-Z\._]+):\s+/
         cint = $1
         iface[cint] = Mash.new
         if cint =~ /^(\w+)(\d+.*)/
@@ -80,10 +80,13 @@ Ohai.plugin(:Network) do
         flags = $1.split(",")
         iface[cint][:flags] = flags if flags.length > 0
       end
-      if line =~ /metric: (\d+) mtu: (\d+)/
+      if line =~ /metric (\d+) mtu (\d+)/
         iface[cint][:metric] = $1
         iface[cint][:mtu] = $2
       end
+      if line =~ /media: (\w+)/
+        iface[cint][:encapsulation] = $1
+      end
     end
 
     so = shell_out("arp -an")
@@ -104,22 +107,44 @@ Ohai.plugin(:Network) do
     # which have been auto-configured (interfaces statically configured
     # into a system, but not located at boot time are not shown).
     so = shell_out("netstat -ibdn")
-    so.stdout.lines do |line|
+    head = so.stdout.lines[0]
+    have_drop = false
+    if head =~ /Idrop/
+      have_drop = true
+      # Name     Mtu Network                  Address                                   Ipkts Ierrs Idrop     Ibytes    Opkts Oerrs     Obytes  Coll  Drop
+      # vtnet0  1500 <Link#1>                 fa:16:3e:ba:3e:25                           579     0     0      46746      210     0      26242     0     0
+      # $1                                    $2                                           $3    $4    $5         $6       $7    $8         $9   $10   $11
+      regex = /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w\d:]*)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+    else
       # Name    Mtu Network       Address              Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
       # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905
       # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
-      if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+      regex = /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w\d:]*)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+    end
+    so.stdout.lines do |line|
+      if line =~ regex
         net_counters[$1] ||= Mash.new
         net_counters[$1]["rx"] ||= Mash.new
         net_counters[$1]["tx"] ||= Mash.new
         net_counters[$1]["rx"]["packets"] = $3
         net_counters[$1]["rx"]["errors"] = $4
-        net_counters[$1]["rx"]["bytes"] = $5
-        net_counters[$1]["tx"]["packets"] = $6
-        net_counters[$1]["tx"]["errors"] = $7
-        net_counters[$1]["tx"]["bytes"] = $8
-        net_counters[$1]["tx"]["collisions"] = $9
-        net_counters[$1]["tx"]["dropped"] = $10
+        if have_drop
+          net_counters[$1]["rx"]["dropped"] = $5
+          net_counters[$1]["rx"]["bytes"] = $6
+          net_counters[$1]["tx"]["packets"] = $7
+          net_counters[$1]["tx"]["errors"] = $8
+          net_counters[$1]["tx"]["bytes"] = $9
+          net_counters[$1]["tx"]["collisions"] = $10
+          net_counters[$1]["tx"]["dropped"] = $11
+        else
+          net_counters[$1]["rx"]["bytes"] = $5
+          net_counters[$1]["tx"]["packets"] = $6
+          net_counters[$1]["tx"]["errors"] = $7
+          net_counters[$1]["tx"]["bytes"] = $8
+          net_counters[$1]["tx"]["collisions"] = $9
+          net_counters[$1]["tx"]["dropped"] = $10
+        end
+
       end
     end
 

data/lib/ohai/plugins/gce.rb

@@ -72,7 +72,7 @@ Ohai.plugin(:GCE) do
     return true if hint?("gce")
 
     if has_gce_dmi? || has_gce_system_info?
-      true if can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80)
+      can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80)
     end
   end
 

data/lib/ohai/plugins/linux/network.rb

@@ -578,6 +578,8 @@ Ohai.plugin(:Network) do
 
   # returns the macaddress for interface from a hash of interfaces (iface elsewhere in this file)
   def get_mac_for_interface(interfaces, interface)
+    return "00:00:00:00:00:00" if interfaces[interface][:flags].include?("LOOPBACK")
+
     interfaces[interface][:addresses].find { |k, v| v["family"] == "lladdr" }.first unless interfaces[interface][:addresses].nil? || interfaces[interface][:flags].include?("NOARP")
   end
 
@@ -700,7 +702,7 @@ Ohai.plugin(:Network) do
     # Match the lead line for an interface from iproute2
     # 3: eth0.11@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP
     # The '@eth0:' portion doesn't exist on primary interfaces and thus is optional in the regex
-    IPROUTE_INT_REGEX ||= /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z\-_]+|):\s/.freeze
+    IPROUTE_INT_REGEX ||= /^(\d+): ([0-9a-zA-Z@:;\.\-_]*?)(@[0-9a-zA-Z\-_]+|):\s/
 
     if which("ip")
       # families to get default routes from

data/lib/ohai/plugins/oci.rb

@@ -44,24 +44,22 @@ Ohai.plugin(:Oci) do
   end
 
   def oci_chassis_asset_tag?
-    has_oci_chassis_asset_tag = false
-    if file_exist?(Ohai::Mixin::OCIMetadata::CHASSIS_ASSET_TAG_FILE)
-      file_open(Ohai::Mixin::OCIMetadata::CHASSIS_ASSET_TAG_FILE).each do |line|
-        next unless /OracleCloud.com/.match?(line)
-
-        logger.trace("Plugin oci: Found OracleCloud.com chassis_asset_tag used by oci.")
-        has_oci_chassis_asset_tag = true
-        break
-      end
+    asset_tag = chassis_asset_tag
+    return false if asset_tag.nil? || asset_tag.empty?
+
+    if /OracleCloud.com/.match?(asset_tag)
+      logger.trace("Plugin oci: Found OracleCloud.com chassis_asset_tag used by oci.")
+      true
+    else
+      false
     end
-    has_oci_chassis_asset_tag
   end
 
   def parse_metadata
-    return nil unless can_socket_connect?(Ohai::Mixin::OCIMetadata::OCI_METADATA_ADDR, 80)
+    return unless can_socket_connect?(Ohai::Mixin::OCIMetadata::OCI_METADATA_ADDR, 80)
 
     instance_data = fetch_metadata("instance")
-    return nil if instance_data.nil?
+    return if instance_data.nil?
 
     metadata = Mash.new
     metadata["compute"] = Mash.new
@@ -80,12 +78,14 @@ Ohai.plugin(:Oci) do
       end
     end
 
-    volume_attachments_data = fetch_metadata("volumeAttachments")
+    volume_attachments_data = fetch_metadata("allVolumeAttachments")
 
     unless volume_attachments_data.nil?
       metadata["volumes"] = Mash.new
-      volume_attachments_data.each do |k, v|
-        metadata["volumes"][k] = v
+      volume_attachments_data.each do |v|
+        if v.is_a?(Hash) && v["id"]
+          metadata["volumes"][v["id"]] = v
+        end
       end
     end
 

data/lib/ohai/plugins/rpm.rb

@@ -22,7 +22,7 @@ Ohai.plugin(:Rpm) do
   provides "rpm"
   optional "true"
 
-  MACROS_MARKER = /========================/.freeze unless defined?(MACROS_MARKER)
+  MACROS_MARKER = /========================/ unless defined?(MACROS_MARKER)
 
   unless defined?(DO_NOT_SPLIT)
     DO_NOT_SPLIT = %w{

data/lib/ohai/plugins/windows/dmi.rb

@@ -37,7 +37,7 @@ Ohai.plugin(:DMI) do
   #
   # This cannot handle some property names, eg SMBIOSBIOSVersion.
   # https://rubular.com/r/FBNtXod4wkZGAG
-  SPLIT_REGEX ||= /[A-Z][a-z0-9]+|[A-Z]{2,}(?=[A-Z][a-z0-9])|[A-Z]{2,}/.freeze
+  SPLIT_REGEX ||= /[A-Z][a-z0-9]+|[A-Z]{2,}(?=[A-Z][a-z0-9])|[A-Z]{2,}/
 
   WINDOWS_TO_UNIX_KEYS ||= [
     %w{vendor manufacturer},

data/lib/ohai/plugins/windows/network.rb

@@ -41,7 +41,7 @@ Ohai.plugin(:Network) do
       # If we are running on windows nano or another operating system from the future
       # that does not populate the deprecated win32_* WMI classes, then we should
       # grab data from the newer MSFT_* classes
-      return msft_adapter_data if data[:addresses].count == 0
+      return msft_adapter_data if data[:addresses].none?
 
       data[:adapters] = wmi.instances_of("Win32_NetworkAdapter")
       data

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "18.2.7"
+  VERSION = "19.1.16"
 end

data/ohai.gemspec

@@ -12,17 +12,18 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://github.com/chef/ohai/"
 
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.1"
 
-  s.add_dependency "chef-config", ">= 14.12", "< 19"
-  s.add_dependency "chef-utils", ">= 16.0", "< 19"
-  s.add_dependency "ffi", "~> 1.9", "<= 1.17.0"
+  s.add_dependency "base64" # For encoding binary data in Ruby 3.4+
+  s.add_dependency "chef-config", ">= 14.12", "< 20"
+  s.add_dependency "chef-utils", ">= 16.0", "< 20"
+  s.add_dependency "ffi", ">= 1.15.5"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "ipaddress"
   s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options
   s.add_dependency "mixlib-config", ">= 2.0", "< 4.0"
   s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
-  s.add_dependency "mixlib-shellout", "~> 3.2", ">= 3.2.5"
+  s.add_dependency "mixlib-shellout", "~> 3.3.6"
   s.add_dependency "plist", "~> 3.1"
   s.add_dependency "train-core"
   s.add_dependency "wmi-lite", "~> 1.0"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 18.2.7
+  version: 19.1.16
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-07-29 00:00:00.000000000 Z
+date: 2025-12-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef-config
   requirement: !ruby/object:Gem::Requirement
@@ -19,7 +33,7 @@ dependencies:
         version: '14.12'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '19'
+        version: '20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +43,7 @@ dependencies:
         version: '14.12'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '19'
+        version: '20'
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
         version: '16.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '19'
+        version: '20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,27 +63,21 @@ dependencies:
         version: '16.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '19'
+        version: '20'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.15.5
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -158,20 +166,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.3.6
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
@@ -400,7 +402,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="