ohai 16.5.4 → 16.8.1

data/lib/ohai/plugins/sysconf.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca <dcavalca@fb.com>
 # Copyright:: Copyright (c) 2016 Facebook

data/lib/ohai/plugins/timezone.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: John Bellone (<jbellone@bloomberg.net>)
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/train.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Train) do
+  provides "train"
+
+  collect_data do
+    if transport_connection
+      train Mash.new
+      train["family_hierarchy"] = transport_connection.platform.family_hierarchy
+      train["family"] = transport_connection.platform.family
+      train["platform"] = transport_connection.platform.platform
+      train["backend"] = transport_connection.backend_type
+      if transport_connection.respond_to?(:uri)
+        train["scheme"] = URI.parse(transport_connection.uri).scheme
+        train["uri"] = transport_connection.uri
+      end
+    end
+  end
+end

data/lib/ohai/plugins/uptime.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Bryan McLellan (<btm@loftninjas.org>)
@@ -54,7 +55,7 @@ Ohai.plugin(:Uptime) do
   end
 
   collect_data(:linux) do
-    uptime, idletime = File.open("/proc/uptime").gets.split(" ")
+    uptime, idletime = file_open("/proc/uptime").gets.split
     uptime_seconds uptime.to_i
     uptime seconds_to_human(uptime.to_i)
     idletime_seconds idletime.to_i

data/lib/ohai/plugins/virtualbox.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Smith <tsmith@chef.io>
 # Author:: Joshua Colson <joshua.colson@gmail.com>
@@ -127,7 +128,7 @@ Ohai.plugin(:Virtualbox) do
     logger.trace("Plugin VboxHost: Could not run '#{so_cmd}'. Skipping data")
   end
 
-  collect_data(:default) do
+  collect_data(:windows, :linux, :solaris2, :darwin) do
     case virtualization.dig("systems", "vbox")
     when "guest"
       logger.trace("Plugin Virtualbox: Node detected as vbox guest. Collecting guest data.")

data/lib/ohai/plugins/vmware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: "Dan Robinson" <drobinson@chef.io>
 # Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com>
@@ -36,12 +37,11 @@ Ohai.plugin(:VMware) do
   depends "virtualization"
 
   def from_cmd(cmd)
-    so = shell_out(cmd)
-    so.stdout.split($/)[0]
+    shell_out(cmd).stdout.strip
   end
 
   def get_vm_attributes(vmtools_path)
-    if !File.exist?(vmtools_path)
+    if !file_exist?(vmtools_path)
       logger.trace("Plugin VMware: #{vmtools_path} not found")
     else
       vmware Mash.new

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Pete Higgins (pete@peterhiggins.org)
 # Copyright:: Copyright (c) Chef Software Inc.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # License:: Apache License, Version 2.0
 #

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: James Gartrell (<jgartrel@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -205,7 +206,7 @@ Ohai.plugin(:Network) do
     so = shell_out("arp -a")
     if so.exitstatus == 0
       so.stdout.lines do |line|
-        if line =~ /^Interface:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+[-]+\s+(0x\S+)/
+        if line =~ /^Interface:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+-+\s+(0x\S+)/
           cint = $2.downcase
         end
         next unless iface[cint]

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: James Gartrell (<jgartrel@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Stuart Preston (<stuart@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
 # Author:: Tim Smith (<tsmith@chef.io>)

data/lib/ohai/plugins/zpools.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Jason J. W. Williams (williamsjj@digitar.com)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -45,7 +46,6 @@ Ohai.plugin(:Zpools) do
           pools[$1][:zpool_version] = sanitize_value($8)
         end
       end
-
     rescue Ohai::Exceptions::Exec
       Ohai::Log.debug('Plugin Zpools: Could not shell_out "zpool list -H -o name,size,alloc,free,cap,dedup,health,version". Skipping plugin.')
     end
@@ -65,7 +65,9 @@ Ohai.plugin(:Zpools) do
       if platform_family == "solaris2"
         command = "su adm -c \"zpool status #{pool}\""
       else
-        command = "zpool status #{pool}"
+        # -L is used to give us real device names not label or uuid
+        # for example sda instead of ata-WDC_WD60EZAZ-00SF3B0_WD-WX32D203UXYK
+        command = "zpool status #{pool} -L"
       end
 
       so = shell_out(command)
@@ -74,7 +76,7 @@ Ohai.plugin(:Zpools) do
         # linux: http://rubular.com/r/J3wQC6E2lH
         # solaris: http://rubular.com/r/FqOBzUQQ4p
         # freebsd: http://rubular.com/r/RYkMNlytXl
-        when /^\s+((sd|c|ad|da)[-_a-zA-Z0-9]+)\s+([-_a-zA-Z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)$/
+        when /^\s+((sd|c|ad|da|nvme|xvd)[-_a-zA-Z0-9]+)\s+([-_a-zA-Z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)$/
           logger.trace("Plugin Zpools: Parsing zpool status line: #{line.chomp}")
           pools[pool][:devices][$1] = Mash.new
           pools[pool][:devices][$1][:state] = $3

data/lib/ohai/provides_map.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Daniel DeLeo (<dan@chef.io>)

data/lib/ohai/runner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Claire McQuin (<claire@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -24,6 +25,9 @@ module Ohai
   class Runner
 
     attr_reader :failed_plugins, :logger
+
+    attr_accessor :transport_connection
+
     # safe_run: set to true if this runner will run plugins in
     # safe-mode. default false.
     def initialize(controller, safe_run = false)
@@ -54,15 +58,13 @@ module Ohai
           else
             raise Ohai::Exceptions::InvalidPlugin, "Invalid plugin version #{plugin.version} for plugin #{plugin}"
           end
-        rescue Ohai::Exceptions::Error # rubocop: disable Lint/ShadowedException
-          raise
-        rescue SystemExit # abort or exit from plug-in should exit Ohai with failure code
+        rescue Ohai::Exceptions::Error, SystemExit # SystemExit: abort or exit from plug-in should exit Ohai with failure code
           raise
         rescue Exception => e
           logger.trace("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
         end
       end
-      logger.trace("Plugin #{plugin.name} took #{elapsed} seconds to run.")
+      logger.trace("Plugin #{plugin.name} took #{"%f" % elapsed.truncate(6)} seconds to run.")
     end
 
     # @param [Ohai::DSL::Plugin] plugin
@@ -93,6 +95,7 @@ module Ohai
         end
 
         if dependency_providers.empty?
+          next_plugin.transport_connection = transport_connection
           @safe_run ? next_plugin.safe_run : next_plugin.run
           if next_plugin.failed
             @failed_plugins << next_plugin.name

data/lib/ohai/system.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -29,7 +30,9 @@ require_relative "mixin/constant_helper"
 require_relative "provides_map"
 require_relative "hints"
 require_relative "config"
+require_relative "train_transport"
 require "ffi_yajl" unless defined?(FFI_Yajl)
+require "cgi" unless defined?(CGI)
 
 module Ohai
   # The class used by Ohai::Application and Chef to actually collect data
@@ -40,6 +43,7 @@ module Ohai
     attr_reader :config
     attr_reader :provides_map
     attr_reader :logger
+    attr_writer :transport_connection
 
     # the cli flag is used to determine if we're being constructed by
     # something like chef-client (which doesn't set this flag) and
@@ -67,7 +71,6 @@ module Ohai
       configure_logging if @cli
 
       @loader = Ohai::Loader.new(self)
-      @runner = Ohai::Runner.new(self, true)
 
       Ohai::Hints.refresh_hints
 
@@ -75,6 +78,13 @@ module Ohai
       recursive_remove_constants(Ohai::NamedPlugin)
     end
 
+    def runner
+      @runner ||=
+        Ohai::Runner.new(self, true).tap do |runner|
+          runner.transport_connection = transport_connection unless transport_connection.nil?
+        end
+    end
+
     def [](key)
       @data[key]
     end
@@ -102,6 +112,13 @@ module Ohai
       @loader.load_all
     end
 
+    # get backend parameters for target mode
+    #
+    # @return [Train::Transport]
+    def transport_connection
+      @transport_connection ||= Ohai::TrainTransport.new(logger).build_transport&.connection
+    end
+
     # run all plugins or those that match the attribute filter is provided
     #
     # @param safe [Boolean]
@@ -111,13 +128,14 @@ module Ohai
     def run_plugins(safe = false, attribute_filter = nil)
       begin
         @provides_map.all_plugins(attribute_filter).each do |plugin|
-          @runner.run_plugin(plugin)
+          runner.run_plugin(plugin)
         end
+        transport_connection.close unless transport_connection.nil?
       rescue Ohai::Exceptions::AttributeNotFound, Ohai::Exceptions::DependencyCycle => e
         logger.error("Encountered error while running plugins: #{e.inspect}")
         raise
       end
-      critical_failed = Ohai::Config.ohai[:critical_plugins] & @runner.failed_plugins
+      critical_failed = Ohai::Config.ohai[:critical_plugins] & runner.failed_plugins
       unless critical_failed.empty?
         msg = "The following Ohai plugins marked as critical failed: #{critical_failed}"
         if @cli
@@ -139,7 +157,7 @@ module Ohai
     def run_additional_plugins(plugin_path)
       @loader.load_additional(plugin_path).each do |plugin|
         logger.trace "Running plugin #{plugin}"
-        @runner.run_plugin(plugin)
+        runner.run_plugin(plugin)
       end
 
       freeze_strings!
@@ -225,5 +243,16 @@ module Ohai
       end
       visitor.call(@data)
     end
+
+    # Extract additional backend parameters from Target Mode URL.
+    #
+    # @api private
+    # @return [Hash]
+    def backend_parameters
+      uri = URI.parse(config[:target])
+      return {} unless uri.query
+
+      CGI.parse(uri.query).map { |k, v| [k.to_sym, v.first] }.to_h
+    end
   end
 end

data/lib/ohai/train_transport.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef-config/mixin/train_transport" unless defined?(ChefConfig::Mixin::TrainTransport)
+
+module Ohai
+  class TrainTransport
+    include ChefConfig::Mixin::TrainTransport
+
+    def config
+      Ohai::Config
+    end
+  end
+end

data/lib/ohai/util/file_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $stderr.puts "WARN: Ohai::Util::FileHelper is deprecated, please use Ohai::Mixin::Which or remove if the reference is unnecessary"
 require_relative "../mixin/which"
 module Ohai::Util

data/lib/ohai/util/ip_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
 # License:: Apache License, Version 2.0
@@ -32,7 +33,7 @@ module Ohai
           IPV6_LINK_LOCAL_UNICAST_BLOCK.include?(ip) || IPV6_PRIVATE_ADDRESS_BLOCK.include?(ip)
         end
       end
-      alias :unique_local_address? :private_address?
+      alias unique_local_address? private_address?
 
       def public_address?(addr)
         !private_address?(addr)

data/lib/ohai/util/win32.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Author:: Adam Edwards (<adamed@chef.io>)
 #
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -18,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "16.5.4".freeze
+  VERSION = "16.8.1"
 end

data/ohai.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $:.unshift File.expand_path("lib", __dir__)
 require "ohai/version"
 
@@ -11,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://github.com/chef/ohai/"
 
-  s.required_ruby_version = ">= 2.5"
+  s.required_ruby_version = ">= 2.6"
 
   s.add_dependency "chef-config", ">= 12.8", "< 17"
   s.add_dependency "chef-utils", ">= 16.0", "< 17"
@@ -23,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
   s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   s.add_dependency "plist", "~> 3.1"
+  s.add_dependency "train-core"
   s.add_dependency "wmi-lite", "~> 1.0"
   # Note for ohai developers: If chef-config causes you grief, try:
   #     bundle install --with development

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 16.5.4
+  version: 16.8.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -180,6 +180,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: train-core
+  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: wmi-lite
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +246,7 @@ files:
 - lib/ohai/mixin/shell_out.rb
 - lib/ohai/mixin/softlayer_metadata.rb
 - lib/ohai/mixin/string.rb
+- lib/ohai/mixin/train_helpers.rb
 - lib/ohai/mixin/which.rb
 - lib/ohai/plugin_config.rb
 - lib/ohai/plugins/aix/kernel.rb
@@ -270,11 +285,11 @@ files:
 - lib/ohai/plugins/gce.rb
 - lib/ohai/plugins/go.rb
 - lib/ohai/plugins/groovy.rb
+- lib/ohai/plugins/grub2.rb
 - lib/ohai/plugins/haskell.rb
 - lib/ohai/plugins/hostname.rb
 - lib/ohai/plugins/init_package.rb
 - lib/ohai/plugins/java.rb
-- lib/ohai/plugins/joyent.rb
 - lib/ohai/plugins/kernel.rb
 - lib/ohai/plugins/keys.rb
 - lib/ohai/plugins/languages.rb
@@ -336,6 +351,7 @@ files:
 - lib/ohai/plugins/ssh_host_key.rb
 - lib/ohai/plugins/sysconf.rb
 - lib/ohai/plugins/timezone.rb
+- lib/ohai/plugins/train.rb
 - lib/ohai/plugins/uptime.rb
 - lib/ohai/plugins/virtualbox.rb
 - lib/ohai/plugins/vmware.rb
@@ -350,6 +366,7 @@ files:
 - lib/ohai/provides_map.rb
 - lib/ohai/runner.rb
 - lib/ohai/system.rb
+- lib/ohai/train_transport.rb
 - lib/ohai/util/file_helper.rb
 - lib/ohai/util/ip_helper.rb
 - lib/ohai/util/win32.rb
@@ -367,7 +384,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="