ohai 17.9.1 → 17.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49537c9f0a1551c3e5e1b635c6a54445ee8236c2c66c0999746abc33435e3214
-  data.tar.gz: 694e91edf4f6557102863738ce899f755afb54bf6f04c7f1a581b062d5f1e0dc
+  metadata.gz: 1f1c149d4e95abb73e9d2ec15f6318c5b6b588ff2369b68ca1b8a3d26cd69826
+  data.tar.gz: 52dd3e1df41fd3709051a85fe5cba9775ebc739998de03079f9afc8dee9fa652
 SHA512:
-  metadata.gz: 9c8ec65795b008c9f7b3117f76ffeb7216d2ba31a8e75a2d03d292d07d43844e488562cceef350550fef70a1be5c6b2e3ce9830d250642544d777b1509f2b8a0
-  data.tar.gz: 91e845ae052b1d5967720a1f2bfbf7c241cf19c26207121c14f37ae54bd56208b5665c9925128a37f8aec12768e20309a57a499ee6c7b5169db661de10665db3
+  metadata.gz: f6aa99445c427e776d6ce7eed4077a9f887997b5fe2a3f17f2c9cc4f19bf6fe542afc5e48b780c6b552f9a777040d751ac571d0f3751b0932c574ac86c844831
+  data.tar.gz: 1b43dc4b727518ec92627e4833897aec7f05f2000f11bdb4595fd6a06e0fe9cca3a25c7b41bc6914988fd1e29f7bc26f101e98703b385e82a341fd02c02424aa

data/Gemfile

@@ -3,9 +3,9 @@ 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: "main", glob: "chef-config/chef-config.gemspec"
-gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "chef-utils/chef-utils.gemspec"
+# pull these gems from chef-17 of chef/chef so that we're testing against what we will release
+gem "chef-config", git: "https://github.com/chef/chef", branch: "chef-17", glob: "chef-config/chef-config.gemspec"
+gem "chef-utils", git: "https://github.com/chef/chef", branch: "chef-17", glob: "chef-utils/chef-utils.gemspec"
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
@@ -16,7 +16,7 @@ group :development do
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop-performance", "1.13.0"
+  gem "rubocop-performance", "1.12.0"
   gem "rubocop-rspec"
 end
 

data/lib/ohai/common/dmi.rb

@@ -25,57 +25,59 @@ module Ohai
       # all-lowercase, all non-alphanumeric converted to '_'
       # 128-255 are 'oem_data_[id]'
       # Everything else is 'unknown'
-      ID_TO_DESCRIPTION = {
-        0 => "bios",
-        1 => "system",
-        2 => "base_board",
-        3 => "chassis",
-        4 => "processor",
-        5 => "memory_controller",
-        6 => "memory_module",
-        7 => "cache",
-        8 => "port_connector",
-        9 => "system_slots",
-        10 => "on_board_devices",
-        11 => "oem_strings",
-        12 => "system_configuration_options",
-        13 => "bios_language",
-        14 => "group_associations",
-        15 => "system_event_log",
-        16 => "physical_memory_array",
-        17 => "memory_device",
-        18 => "32_bit_memory_error",
-        19 => "memory_array_mapped_address",
-        20 => "memory_device_mapped_address",
-        21 => "built_in_pointing_device",
-        22 => "portable_battery",
-        23 => "system_reset",
-        24 => "hardware_security",
-        25 => "system_power_controls",
-        26 => "voltage_probe",
-        27 => "cooling_device",
-        28 => "temperature_probe",
-        29 => "electrical_current_probe",
-        30 => "out_of_band_remote_access",
-        31 => "boot_integrity_services",
-        32 => "system_boot",
-        33 => "64_bit_memory_error",
-        34 => "management_device",
-        35 => "management_device_component",
-        36 => "management_device_threshold_data",
-        37 => "memory_channel",
-        38 => "ipmi_device",
-        39 => "power_supply",
-        40 => "additional_information",
-        41 => "onboard_devices_extended_information",
-        42 => "management_controller_host_interfaces",
-        126 => "disabled_entries",
-        127 => "end_of_table_marker",
-      }.freeze
+      unless defined?(ID_TO_DESCRIPTION)
+        ID_TO_DESCRIPTION = {
+          0 => "bios",
+          1 => "system",
+          2 => "base_board",
+          3 => "chassis",
+          4 => "processor",
+          5 => "memory_controller",
+          6 => "memory_module",
+          7 => "cache",
+          8 => "port_connector",
+          9 => "system_slots",
+          10 => "on_board_devices",
+          11 => "oem_strings",
+          12 => "system_configuration_options",
+          13 => "bios_language",
+          14 => "group_associations",
+          15 => "system_event_log",
+          16 => "physical_memory_array",
+          17 => "memory_device",
+          18 => "32_bit_memory_error",
+          19 => "memory_array_mapped_address",
+          20 => "memory_device_mapped_address",
+          21 => "built_in_pointing_device",
+          22 => "portable_battery",
+          23 => "system_reset",
+          24 => "hardware_security",
+          25 => "system_power_controls",
+          26 => "voltage_probe",
+          27 => "cooling_device",
+          28 => "temperature_probe",
+          29 => "electrical_current_probe",
+          30 => "out_of_band_remote_access",
+          31 => "boot_integrity_services",
+          32 => "system_boot",
+          33 => "64_bit_memory_error",
+          34 => "management_device",
+          35 => "management_device_component",
+          36 => "management_device_threshold_data",
+          37 => "memory_channel",
+          38 => "ipmi_device",
+          39 => "power_supply",
+          40 => "additional_information",
+          41 => "onboard_devices_extended_information",
+          42 => "management_controller_host_interfaces",
+          126 => "disabled_entries",
+          127 => "end_of_table_marker",
+        }.freeze
+      end
 
       # list of IDs to collect from config or default to a sane list that prunes
       # away some of the less useful IDs
-      ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ].freeze
+      ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ].freeze unless defined?(ID_TO_CAPTURE)
 
       # the allowlisted DMI IDs. This is combination of the defaults + any additional
       # IDs defined in the :additional_dmi_ids config
@@ -116,14 +118,16 @@ module Ohai
         id
       end
 
-      SKIPPED_CONVENIENCE_KEYS = %w{
-        application_identifier
-        caption
-        creation_class_name
-        size
-        system_creation_class_name
-        record_id
-      }.freeze
+      unless defined?(SKIPPED_CONVENIENCE_KEYS)
+        SKIPPED_CONVENIENCE_KEYS = %w{
+          application_identifier
+          caption
+          creation_class_name
+          size
+          system_creation_class_name
+          record_id
+        }.freeze
+      end
 
       # create simplified convenience access keys for each record type
       # for single occurrences of one type, copy to top level all fields and values

data/lib/ohai/mixin/alibaba_metadata.rb

@@ -38,22 +38,27 @@ module Ohai
         conn.get("/2016-01-01/#{uri}", { "User-Agent" => "chef-ohai/#{Ohai::VERSION}" })
       end
 
-      def fetch_metadata(id = "")
+      def fetch_metadata(id = "", is_directory = true)
         response = http_get(id)
         return nil unless response.code == "200"
 
-        if json?(response.body)
-          data = String(response.body)
-          parser = FFI_Yajl::Parser.new
-          parser.parse(data)
-        elsif response.body.include?("\n")
+        if !is_directory
+          if json?(response.body)
+            data = String(response.body)
+            parser = FFI_Yajl::Parser.new
+            parser.parse(data)
+          else
+            response.body
+          end
+        elsif is_directory
           temp = {}
           response.body.split("\n").each do |sub_attr|
-            temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}/#{sub_attr}")
+            if "#{id}/#{sub_attr}" != "/user-data"
+              uri = id == "" ? "#{id}#{sub_attr}/" : "#{id}#{sub_attr}"
+              temp[sanitize_key(sub_attr).gsub(/_$/, "")] = fetch_metadata(uri, has_trailing_slash?(uri))
+            end
           end
           temp
-        else
-          response.body
         end
       end
 
@@ -75,7 +80,7 @@ module Ohai
       #
       # @return [Boolean] is there a trailing /?
       def has_trailing_slash?(data)
-        !!( data =~ %r{/$} )
+        !!(data =~ %r{/$})
       end
 
       def sanitize_key(key)

data/lib/ohai/mixin/network_helper.rb

@@ -23,10 +23,12 @@ require "socket" unless defined?(Socket)
 module Ohai
   module Mixin
     module NetworkHelper
-      FAMILIES = {
-        "inet" => "default",
-        "inet6" => "default_inet6",
-      }.freeze
+      unless defined?(FAMILIES)
+        FAMILIES = {
+          "inet" => "default",
+          "inet6" => "default_inet6",
+        }.freeze
+      end
 
       def hex_to_dec_netmask(netmask)
         # example 'ffff0000' -> '255.255.0.0'

data/lib/ohai/plugins/rpm.rb

@@ -22,16 +22,18 @@ Ohai.plugin(:Rpm) do
   provides "rpm"
   optional "true"
 
-  MACROS_MARKER = /========================/.freeze
+  MACROS_MARKER = /========================/.freeze unless defined?(MACROS_MARKER)
 
-  DO_NOT_SPLIT = %w{
-    build_arch
-    build_os
-    install_arch
-    install_os
-    archcolor
-    optflags
-  }.freeze
+  unless defined?(DO_NOT_SPLIT)
+    DO_NOT_SPLIT = %w{
+      build_arch
+      build_os
+      install_arch
+      install_os
+      archcolor
+      optflags
+    }.freeze
+  end
 
   collect_data(:aix, :darwin, :dragonflybsd, :freebsd, :linux, :netbsd, :openbsd, :solaris2) do
     rpm_path = which("rpm")

data/lib/ohai/util/ip_helper.rb

@@ -21,8 +21,8 @@ module Ohai
       require "ipaddress" unless defined?(IPAddress)
 
       # Corresponding to RFC 4192 + RFC 4193
-      IPV6_LINK_LOCAL_UNICAST_BLOCK = IPAddress("fe80::/10")
-      IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress("fc00::/7")
+      IPV6_LINK_LOCAL_UNICAST_BLOCK = IPAddress("fe80::/10") unless defined?(IPV6_LINK_LOCAL_UNICAST_BLOCK)
+      IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress("fc00::/7") unless defined?(IPV6_PRIVATE_ADDRESS_BLOCK)
 
       def private_address?(addr)
         ip = IPAddress(addr)

data/lib/ohai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 17.9.1
+  version: 17.9.4
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config