Merge pull request #1808 from chef/jfm/chef17_backport_ohai_pr1758

[backport] PR1758
chef · Sep 12, 2023 · 4785b37 · 4785b37
2 parents 7655aea + 9911b5e
commit 4785b37
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 71 deletions.
diff --git a/lib/ohai/common/dmi.rb b/lib/ohai/common/dmi.rb
@@ -25,57 +25,59 @@ module DMI
       # 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 @@ def id_lookup(id)
         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

diff --git a/lib/ohai/mixin/network_helper.rb b/lib/ohai/mixin/network_helper.rb
@@ -23,10 +23,12 @@
 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'

diff --git a/lib/ohai/plugins/rpm.rb b/lib/ohai/plugins/rpm.rb
@@ -22,16 +22,18 @@
   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")

diff --git a/lib/ohai/util/ip_helper.rb b/lib/ohai/util/ip_helper.rb
@@ -21,8 +21,8 @@ module IpHelper
       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)