ohai 14.15.0 → 15.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 716bc9f09520397d1a9c23d454c87e3cd73282068c7511a48fdce153a5568b49
-  data.tar.gz: 1a270f33e5d872b1a276bacfdf293bdf1680ae1d06f955d790dc45393b1a17e6
+  metadata.gz: b2b536c237b18f6b940c6a9082745d73d0c092e45f250129d4648e1b13834d0f
+  data.tar.gz: e2efa2a548dd3270584593fc5bc056043cae6a85902c6d0dfbc6a3b27cf78934
 SHA512:
-  metadata.gz: 2c2953d87edfba4e8deb71a78a434df9fcbee133107e2b03e4f98469f973aebc43be38d316615fce69b2eeb5bce37667661643d163b0741a1499ad2cf6390689
-  data.tar.gz: 4f4723b3380734ff87fa6d03e735b7be9a215f0cb8f2fe9ab70dc127b24a20c1bb4c1212c7ce07a4c06323e6d37659df3073da155d0583bccf44338d9c373889
+  metadata.gz: '0038af185c2ba323b41cef83792e77072efb95b02ef3e506814712504ed7e90b518e576a515ace49455b604f602f9ebdf54746899ebd233a0b485d604b63d941'
+  data.tar.gz: 2f507deee0668f4f9aa0eb06b1616535e3abf1a9101097d89fb485763e804b8a61470249bc905aa95c2dd706fc7b11f0e4dbd7cf2760bb49aae3b9e3bf2c90b5

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", "=0.11.2"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
   gem "rake", ">= 10.1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"

data/lib/ohai/application.rb

@@ -101,10 +101,6 @@ class Ohai::Application
   #
   # @return void
   def run_application
-    # Always switch to a readable directory. Keeps subsequent Dir.chdir() {}
-    # from failing due to permissions when launched as a less privileged user.
-    Dir.chdir("/")
-
     config[:invoked_from_cli] = true
     config[:logger] = Ohai::Log.with_child
     ohai = Ohai::System.new(config)

data/lib/ohai/common/dmi.rb

@@ -25,49 +25,49 @@ module Ohai
       # 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",
+        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

data/lib/ohai/config.rb

@@ -39,7 +39,7 @@ module Ohai
       # causes all optional plugins to be run.
       default :run_all_plugins, false
       # optional plugins are the set of plugins that are marked optional but you wish to run.
-      default(:optional_plugins, []).writes_value { |arr| arr.map(&:to_sym) }
+      default :optional_plugins, []
       default :shellout_timeout, 30
     end
   end

data/lib/ohai/loader.rb

@@ -24,51 +24,34 @@ require "pathname"
 
 module Ohai
 
-  # Ohai plugin loader. Finds all the plugins in your
-  # `Ohai.config[:plugin_path]` (supports a single or multiple path setting
+  # Ohai plugin loader. Finds all the plugins specified in the
+  # Ohai.config :plugin_path (supports a single or multiple path setting
   # here), evaluates them and returns plugin objects.
   class Loader
-
-    # Simple struct like objects to track the path of a plugin and the root
-    # directory of plugins in which we found it. We don't care about the
-    # relative paths of v7 plugins, but in v6 plugins, dependencies are
-    # specified by calling `require_plugin` with a relative path. To manage
-    # this, we track the path and root of each file as we discover them so we
-    # can feed this into the v6 "dependency solver" as we load them.
-    PluginFile = Struct.new(:path, :plugin_root) do
-
-      # Finds all the *.rb files under the configured paths in :plugin_path
-      def self.find_all_in(plugin_dir)
-        unless Dir.exist?(plugin_dir)
-          Ohai::Log.info("The plugin path #{plugin_dir} does not exist. Skipping...")
-          return []
-        end
-
-        Ohai::Log.trace("Searching for Ohai plugins in #{plugin_dir}")
-
-        escaped = ChefConfig::PathHelper.escape_glob_dir(plugin_dir)
-        Dir[File.join(escaped, "**", "*.rb")].map do |file|
-          new(file, plugin_dir)
-        end
-      end
-    end
-
     attr_reader :logger
+
     def initialize(controller)
       @controller = controller
       @logger = controller.logger.with_child(subsystem: "loader")
       @v7_plugin_classes = []
     end
 
-    # Searches all plugin paths and returns an Array of PluginFile objects
-    # representing each plugin file.
+    # Searches all plugin paths and returns an Array of file paths to plugins
     #
     # @param dir [Array, String] directory/directories to load plugins from
-    # @return [Array<Ohai::Loader::PluginFile>]
-    def plugin_files_by_dir(dir = Ohai.config[:plugin_path])
-      Array(dir).inject([]) do |plugin_files, plugin_path|
-        plugin_files + PluginFile.find_all_in(plugin_path)
-      end
+    # @return [Array<String>]
+    def plugin_files_by_dir(plugin_dir = Ohai.config[:plugin_path])
+      Array(plugin_dir).map do |path|
+        if Dir.exist?(path)
+          Ohai::Log.trace("Searching for Ohai plugins in #{path}")
+
+          escaped = ChefConfig::PathHelper.escape_glob_dir(path)
+          Dir[File.join(escaped, "**", "*.rb")]
+        else
+          Ohai::Log.debug("The plugin path #{path} does not exist. Skipping...")
+          []
+        end
+      end.flatten
     end
 
     # loads all plugin classes
@@ -76,7 +59,7 @@ module Ohai
     # @return [Array<String>]
     def load_all
       plugin_files_by_dir.each do |plugin_file|
-        load_plugin_class(plugin_file.path, plugin_file.plugin_root)
+        load_plugin_class(plugin_file)
       end
 
       collect_v7_plugins
@@ -88,19 +71,18 @@ module Ohai
       from = [ Ohai.config[:plugin_path], from].flatten
       plugin_files_by_dir(from).collect do |plugin_file|
         logger.trace "Loading additional plugin: #{plugin_file}"
-        plugin = load_plugin_class(plugin_file.path, plugin_file.plugin_root)
+        plugin = load_plugin_class(plugin_file)
         load_v7_plugin(plugin)
       end
     end
 
     # Load a specified file as an ohai plugin and creates an instance of it.
-    # Not used by ohai itself, but can be used to load a plugin for testing
-    # purposes.
+    # Not used by ohai itself, but is used in the specs to load plugins for testing
     #
+    # @private
     # @param plugin_path [String]
-    # @param plugin_dir_path [String]
-    def load_plugin(plugin_path, plugin_dir_path = nil)
-      plugin_class = load_plugin_class(plugin_path, plugin_dir_path)
+    def load_plugin(plugin_path)
+      plugin_class = load_plugin_class(plugin_path)
       return nil unless plugin_class.kind_of?(Class)
       if plugin_class < Ohai::DSL::Plugin::VersionVII
         load_v7_plugin(plugin_class)
@@ -109,13 +91,11 @@ module Ohai
       end
     end
 
-    # Reads the file specified by `plugin_path` and returns a class object for
-    # the ohai plugin defined therein.
+    # load an ohai plugin object class from file
+    # @param plugin_path String the path to the ohai plugin
     #
-    # If `plugin_dir_path` is given, and the file at `plugin_path` is a v6
-    # plugin, the 'relative path' of the plugin (used by `require_plugin()`) is
-    # computed by finding the relative path from `plugin_dir_path` to `plugin_path`
-    def load_plugin_class(plugin_path, plugin_dir_path = nil)
+    # @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 = ""
       begin
@@ -150,6 +130,11 @@ module Ohai
       end
     end
 
+    # load an Ohai v7 plugin class from a string of the object
+    # @param contents [String] text of the plugin object
+    # @param plugin_path [String] the path to the plugin file where the contents came from
+    #
+    # @return [Ohai::DSL::Plugin::VersionVII] Ohai plugin object
     def load_v7_plugin_class(contents, plugin_path)
       plugin_class = eval(contents, TOPLEVEL_BINDING, plugin_path) # rubocop: disable Security/Eval
       unless plugin_class.kind_of?(Class) && plugin_class < Ohai::DSL::Plugin

data/lib/ohai/mixin/dmi_decode.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tim Smith <tsmith@chef.io>
-# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,37 +17,34 @@
 
 # http://www.dmo.ca/blog/detecting-virtualization-on-linux
 module ::Ohai::Mixin::DmiDecode
-  def guest_from_dmi(dmi_data)
-    dmi_data.each_line do |line|
-      case line
-      when /Manufacturer: Microsoft/
-        if dmi_data =~ /Product.*: Virtual Machine/
-          if dmi_data =~ /Version: (7.0|Hyper-V)/
-            return "hyperv"
-          elsif dmi_data =~ /Version: (VS2005R2|6.0)/
-            return "virtualpc"
-          elsif dmi_data =~ /Version: 5.0/
-            return "virtualserver"
-          end
-        end
-      when /Manufacturer: VMware/
-        return "vmware"
-      when /Manufacturer: Xen/
-        return "xen"
-      when /Product.*: VirtualBox/
-        return "vbox"
-      when /Product.*: OpenStack/
-        return "openstack"
-      when /Manufacturer: QEMU|Product Name: (KVM|RHEV)/
-        return "kvm"
-      when /Product.*: BHYVE/
-        return "bhyve"
-      when /Manufacturer: Veertu/
-        return "veertu"
-      when /Manufacturer: Amazon EC2/
-        return "amazonec2"
-      end
+  def guest_from_dmi_data(manufacturer, product, version)
+    case manufacturer
+    when /Xen/
+      return "xen"
+    when /VMware/
+      return "vmware"
+    when /Microsoft/
+      return "hyperv" if product =~ /Virtual Machine/
+    when /Amazon EC2/
+      return "amazonec2"
+    when /QEMU/
+      return "kvm"
+    when /Veertu/
+      return "veertu"
+    when /Parallels/
+      return "parallels"
     end
-    nil
+
+    case product
+    when /VirtualBox/
+      return "vbox"
+    when /OpenStack/
+      return "openstack"
+    when /(KVM|RHEV)/
+      return "kvm"
+    when /BHYVE/
+      return "bhyve"
+    end
+    nil # doesn't look like a virt
   end
 end

data/lib/ohai/mixin/os.rb

@@ -32,8 +32,6 @@ module Ohai
           "aix"
         when /darwin(.+)$/
           "darwin"
-        when /hpux(.+)$/
-          "hpux"
         when /linux/
           "linux"
         when /freebsd(.+)$/

data/lib/ohai/mixin/softlayer_metadata.rb

@@ -29,11 +29,11 @@ module ::Ohai::Mixin::SoftlayerMetadata
   # @return [Hash]
   def fetch_metadata
     {
-      "public_fqdn"   => fetch_metadata_item("getFullyQualifiedDomainName.txt"),
-      "local_ipv4"    => fetch_metadata_item("getPrimaryBackendIpAddress.txt"),
-      "public_ipv4"   => fetch_metadata_item("getPrimaryIpAddress.txt"),
-      "region"        => fetch_metadata_item("getDatacenter.txt"),
-      "instance_id"   => fetch_metadata_item("getId.txt"),
+      "public_fqdn" => fetch_metadata_item("getFullyQualifiedDomainName.txt"),
+      "local_ipv4" => fetch_metadata_item("getPrimaryBackendIpAddress.txt"),
+      "public_ipv4" => fetch_metadata_item("getPrimaryIpAddress.txt"),
+      "region" => fetch_metadata_item("getDatacenter.txt"),
+      "instance_id" => fetch_metadata_item("getId.txt"),
     }
   end
 

data/lib/ohai/plugins/aix/virtualization.rb

@@ -61,8 +61,8 @@ Ohai.plugin(:Virtualization) do
               splat = line.strip.split
               key   = splat[0].downcase
               value = {
-                        "address"   => splat[1],
-                        "netmask"   => splat[2],
+                        "address" => splat[1],
+                        "netmask" => splat[2],
                         "broadcast" => splat[3],
                       }
               wpars[wpar_name][title][key] = value
@@ -72,7 +72,7 @@ Ohai.plugin(:Virtualization) do
               key   = splat[2].downcase
               value = {
                         "destination" => splat[0],
-                        "gateway"     => splat[1],
+                        "gateway" => splat[1],
                       }
               wpars[wpar_name][title][key] = value
             when "file systems"
@@ -81,7 +81,7 @@ Ohai.plugin(:Virtualization) do
               key = splat[1].downcase
               value = {
                         "mountpoint" => splat[0],
-                        "device"     => splat[1],
+                        "device" => splat[1],
                         "vfs" => splat[2],
                         "options" => splat[3].split(","),
                       }

data/lib/ohai/plugins/bsd/virtualization.rb

@@ -17,11 +17,11 @@
 # limitations under the License.
 #
 
-require "ohai/mixin/dmi_decode"
-
 Ohai.plugin(:Virtualization) do
-  include Ohai::Mixin::DmiDecode
   provides "virtualization"
+  depends "dmi"
+  require "ohai/mixin/dmi_decode"
+  include Ohai::Mixin::DmiDecode
 
   collect_data(:freebsd, :openbsd, :netbsd, :dragonflybsd) do
 
@@ -108,15 +108,13 @@ Ohai.plugin(:Virtualization) do
       logger.trace("Plugin Virtualization: Guest running on #{hypervisor} detected")
     end
 
-    # parse dmidecode to discover various virtualization guests
-    if File.exist?("/usr/local/sbin/dmidecode") || File.exist?("/usr/pkg/sbin/dmidecode")
-      guest = guest_from_dmi(shell_out("dmidecode").stdout)
-      if guest
-        virtualization[:system] = guest
-        virtualization[:role] = "guest"
-        virtualization[:systems][guest.to_sym] = "guest"
-        logger.trace("Plugin Virtualization: Guest running on #{guest} detected")
-      end
+    # parse dmi to discover various virtualization guests
+    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
+    if guest
+      logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
+      virtualization[:system] = guest
+      virtualization[:role] = "guest"
+      virtualization[:systems][guest.to_sym] = "guest"
     end
   end
 end

data/lib/ohai/plugins/c.rb

@@ -149,19 +149,6 @@ Ohai.plugin(:C) do
     end
   end
 
-  def collect_hpux_cc
-    # hpux cc
-    collect("what /opt/ansic/bin/cc") do |so|
-      description = so.stdout.split($/).select { |line| line =~ /HP C Compiler/ }.first
-      if description
-        output = description.split
-        @c[:hpcc] = Mash.new
-        @c[:hpcc][:version] = output[1] if output.size >= 1
-        @c[:hpcc][:description] = description.strip
-      end
-    end
-  end
-
   collect_data(:aix) do
     @c = Mash.new
     collect_xlc
@@ -182,13 +169,6 @@ Ohai.plugin(:C) do
     languages[:c] = @c unless @c.empty?
   end
 
-  collect_data(:hpux) do
-    @c = Mash.new
-    collect_gcc
-    collect_hpux_cc
-    languages[:c] = @c unless @c.empty?
-  end
-
   collect_data(:default) do
     @c = Mash.new
     collect_gcc