ohai 16.7.18 → 16.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57f034c4995360aa8eb45d92d95ddee35d307411506e57be5a55b9a5e58b52f3
-  data.tar.gz: dcffcadad6b0a1038b1715397ec2e9ee54000d42ac7cf3f2229e7bbe42e69395
+  metadata.gz: c661e4c6ab76f9c2e8e8fb2ae7d287caa31d81c1b3149f689c8d00853d392488
+  data.tar.gz: e48961c413eafcbb0af751b34b9fb7dd805ae2e7d0650dcecbf1cf2b8adbe691
 SHA512:
-  metadata.gz: 9198da99387e9dfcc99350cba0a7e1e95f2a1e1de7fecf4ecf76b311d38352214b1f76179aa20bcd42f0017f7a8c5d9e73f251c016eb9e8c83d4e0be234da0a8
-  data.tar.gz: bbd44815894afe658ab51d54088589f4c66d62a5099a81c93c48801a8aa454f9c8af38498b667a2fe51088889145a5b05cf376860459c4889453a088c066f9f5
+  metadata.gz: 72849d5d2c327b4994aa073d85556bbd3b2a0ef200646593a2f62cc283c39ee435b99a81c87f56b31583dbf99e174a365d08c634ee91863d0a19b1c0d261f40e
+  data.tar.gz: c5104a84a7067fff9dde9d5e456107e300bd5e6f42dd3d42684ac491cdbaf511fb9c31741cf4763c0dbfeacc08008dc9f517568c31d1873ea7228b32bf33bcde

data/Gemfile

@@ -4,19 +4,19 @@ source "https://rubygems.org"
 gemspec
 
 # pull these gems from master of chef/chef so that we're testing against what we will release
-gem "chef-config", git: "https://github.com/chef/chef", glob: "chef-config/chef-config.gemspec"
-gem "chef-utils", git: "https://github.com/chef/chef", glob: "chef-utils/chef-utils.gemspec"
+gem "chef-config", git: "https://github.com/chef/chef", branch: "chef-16", glob: "chef-config/chef-config.gemspec"
+gem "chef-utils", git: "https://github.com/chef/chef", branch: "chef-16", 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
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  gem "chefstyle", "1.6.2"
   gem "ipaddr_extensions"
   gem "rake", ">= 10.1.0"
   gem "rspec-collection_matchers", "~> 1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop-performance", "1.8.1"
+  gem "rubocop-performance", "1.9.2"
   gem "rubocop-rspec"
 end
 

data/lib/ohai/dsl/plugin.rb

@@ -218,7 +218,7 @@ module Ohai
       def safe_get_attribute(*keys)
         keys.inject(@data) do |attrs, key|
           unless attrs.nil? || attrs.is_a?(Array) || attrs.is_a?(Hash)
-            raise TypeError.new("Expected Hash but got #{attrs.class}.")
+            raise TypeError, "Expected Hash but got #{attrs.class}."
           end
 
           attrs[key]

data/lib/ohai/dsl/plugin/versionvii.rb

@@ -195,8 +195,6 @@ module Ohai
           # key? to avoid falsely instantiating a configuration hash.
           if Ohai.config[:plugin].key?(snake_case_name)
             Ohai.config[:plugin][snake_case_name]
-          else
-            nil
           end
         end
       end

data/lib/ohai/mixin/azure_metadata.rb

@@ -36,8 +36,8 @@ module Ohai
 
       # it's important that the newer versions are at the end of this array so we can skip sorting it
       AZURE_SUPPORTED_VERSIONS ||= %w{ 2017-04-02 2017-08-01 2017-12-01 2018-02-01 2018-04-02
-                                   2018-10-01 2019-02-01 2019-03-11 2019-04-30 2019-06-01
-                                   2019-06-04 2019-08-01 2019-08-15 2019-11-01 }.freeze
+                                       2018-10-01 2019-02-01 2019-03-11 2019-04-30 2019-06-01
+                                       2019-06-04 2019-08-01 2019-08-15 2019-11-01 }.freeze
 
       def best_api_version
         @api_version ||= begin

data/lib/ohai/mixin/ec2_metadata.rb

@@ -42,23 +42,31 @@ module Ohai
 
       EC2_METADATA_ADDR ||= "169.254.169.254"
       EC2_SUPPORTED_VERSIONS ||= %w{ 1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 2007-12-15
-                                   2008-02-01 2008-09-01 2009-04-04 2011-01-01 2011-05-01 2012-01-12
-                                   2014-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02 }.freeze
+                                     2008-02-01 2008-09-01 2009-04-04 2011-01-01 2011-05-01 2012-01-12
+                                     2014-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02
+                                     2016-11-30 2018-08-17 2018-11-29 2019-10-01 2020-08-24 2020-11-01 }.freeze
       EC2_ARRAY_VALUES ||= %w{security-groups local_ipv4s}.freeze
       EC2_ARRAY_DIR    ||= %w{network/interfaces/macs}.freeze
       EC2_JSON_DIR     ||= %w{iam}.freeze
 
+      #
+      # The latest metadata version in EC2_SUPPORTED_VERSIONS that this instance supports
+      # in AWS supported metadata versions are determined at instance start so we need to be
+      # cautious here in case an instance has been running for a long time
+      #
+      # @return [String] the version
+      #
       def best_api_version
         @api_version ||= begin
           logger.trace("Mixin EC2: Fetching http://#{EC2_METADATA_ADDR}/ to determine the latest supported metadata release")
-          response = http_client.get("/")
+          response = http_client.get("/", { 'X-aws-ec2-metadata-token': v2_token })
           if response.code == "404"
             logger.trace("Mixin EC2: Received HTTP 404 from metadata server while determining API version, assuming 'latest'")
             return "latest"
           elsif response.code != "200"
             raise "Mixin EC2: Unable to determine EC2 metadata version (returned #{response.code} response)"
           end
-          # Note: Sorting the list of versions may have unintended consequences in
+          # NOTE: Sorting the list of versions may have unintended consequences in
           # non-EC2 environments. It appears to be safe in EC2 as of 2013-04-12.
           versions = response.body.split("\n").sort
           until versions.empty? || EC2_SUPPORTED_VERSIONS.include?(versions.last)
@@ -84,6 +92,23 @@ module Ohai
         end
       end
 
+      #
+      # Fetch an API token for use querying AWS IMDSv2 or return nil if no token if found
+      # AWS like systems (think OpenStack) will not respond with a token here
+      #
+      # @return [NilClass, String] API token or nil
+      #
+      def v2_token
+        @v2_token ||= begin
+            request = http_client.put("/latest/api/token", nil, { 'X-aws-ec2-metadata-token-ttl-seconds': "60" })
+            if request.code == "404" # not on AWS
+              nil
+            else
+              request.body
+            end
+          end
+      end
+
       # Get metadata for a given path and API version
       #
       # Typically, a 200 response is expected for valid metadata.
@@ -93,7 +118,7 @@ module Ohai
       def metadata_get(id, api_version)
         path = "/#{api_version}/meta-data/#{id}"
         logger.trace("Mixin EC2: Fetching http://#{EC2_METADATA_ADDR}#{path}")
-        response = http_client.get(path)
+        response = http_client.get(path, { 'X-aws-ec2-metadata-token': v2_token })
         case response.code
         when "200"
           response.body
@@ -119,7 +144,7 @@ module Ohai
                 else
                   metadata_get(key, best_api_version)
                 end
-            elsif (not key.eql?(id)) && (not key.eql?("/"))
+            elsif (!key.eql?(id)) && (!key.eql?("/"))
               name = key[0..-2]
               sym = metadata_key(name)
               if EC2_ARRAY_DIR.include?(name)
@@ -144,7 +169,7 @@ module Ohai
             if key[-1..-1] != "/"
               retr_meta = metadata_get("#{id}#{key}", api_version)
               metadata[metadata_key(key)] = retr_meta || ""
-            elsif not key.eql?("/")
+            elsif !key.eql?("/")
               metadata[key[0..-2]] = fetch_dir_metadata("#{id}#{key}", api_version)
             end
           end
@@ -164,7 +189,7 @@ module Ohai
               json = String(data)
               parser = FFI_Yajl::Parser.new
               metadata[metadata_key(key)] = parser.parse(json)
-            elsif not key.eql?("/")
+            elsif !key.eql?("/")
               metadata[key[0..-2]] = fetch_json_dir_metadata("#{id}#{key}", api_version)
             end
           end
@@ -174,13 +199,13 @@ module Ohai
 
       def fetch_userdata
         logger.trace("Mixin EC2: Fetching http://#{EC2_METADATA_ADDR}/#{best_api_version}/user-data/")
-        response = http_client.get("/#{best_api_version}/user-data/")
+        response = http_client.get("/#{best_api_version}/user-data/", { 'X-aws-ec2-metadata-token': v2_token })
         response.code == "200" ? response.body : nil
       end
 
       def fetch_dynamic_data
         @fetch_dynamic_data ||= begin
-          response = http_client.get("/#{best_api_version}/dynamic/instance-identity/document/")
+          response = http_client.get("/#{best_api_version}/dynamic/instance-identity/document/", { 'X-aws-ec2-metadata-token': v2_token })
 
           if json?(response.body) && response.code == "200"
             FFI_Yajl::Parser.parse(response.body)

data/lib/ohai/mixin/gce_metadata.rb

@@ -72,7 +72,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/plugins/aix/kernel.rb

@@ -24,10 +24,12 @@ Ohai.plugin(:Kernel) do
   collect_data(:aix) do
     kernel Mash.new
 
-    kernel[:name] =    shell_out("uname -s").stdout.split($/)[0].downcase
-    kernel[:release] = shell_out("uname -r").stdout.split($/)[0]
-    kernel[:version] = shell_out("uname -v").stdout.split($/)[0]
-    kernel[:machine] = shell_out("uname -p").stdout.split($/)[0]
+    uname_so = shell_out("uname -rvp").stdout.split
+
+    kernel[:name] =    "aix" # this is here for historical reasons, but it's always aix
+    kernel[:release] = uname_so[0]
+    kernel[:version] = uname_so[1]
+    kernel[:machine] = uname_so[2]
     kernel[:bits] =    shell_out("getconf KERNEL_BITMODE").stdout.strip
 
     modules = Mash.new

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

@@ -25,10 +25,10 @@ Ohai.plugin(:Memory) do
     memory Mash.new
     memory[:swap] = Mash.new
 
-    meminfo = shell_out("svmon -G -O unit=MB,summary=longreal | grep '[0-9]'").stdout
+    meminfo = shell_out("svmon -G -O unit=KB,summary=longreal | grep '[0-9]'").stdout
     total_in_mb, _u, free_in_mb = meminfo.split
-    memory[:total] = "#{total_in_mb.to_i * 1024}kB"
-    memory[:free] = "#{free_in_mb.to_i * 1024}kB"
+    memory[:total] = "#{total_in_mb.to_i}kB"
+    memory[:free] = "#{free_in_mb.to_i}kB"
 
     swap_info = shell_out("swap -s").stdout.split # returns swap info in 4K blocks
     memory[:swap]["total"] = "#{swap_info[2].to_i * 4}kB"

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

@@ -22,7 +22,7 @@
 Ohai.plugin(:Network) do
   require_relative "../../mixin/network_helper"
 
-  provides "network", "counters/network", "macaddress"
+  provides "network", "network/interfaces", "counters/network", "macaddress"
 
   include Ohai::Mixin::NetworkHelper
 
@@ -38,46 +38,44 @@ Ohai.plugin(:Network) do
     # => state up/down (ifconfig/lsattr)
     # => arp (arp -an)
 
-    iface = Mash.new
+    ifaces = Mash.new
 
     network Mash.new unless network
-    network[:interfaces] ||= Mash.new
 
     # We unfortunately have to do things a bit different here, if ohai is running
     # within a WPAR. For instance, the WPAR isn't aware of some of its own networking
-    # minutia such as default gateway/route.
+    # minutia such as default gateway/route. lpars return 0 here. wpars return > 0
     unless shell_out("uname -W").stdout.to_i > 0
       # :default_interface, :default_gateway - route -n get 0
-      so = shell_out("netstat -rn |grep default")
-      so.stdout.lines.each do |line|
-        items = line.split(" ")
-        if items[0] == "default"
-          network[:default_gateway] = items[1]
-          network[:default_interface] = items[5]
-        end
-      end
+      default_line = shell_out("netstat -rn")
+        .stdout
+        .each_line
+        .detect { |l| l.start_with?("default") }
+        .split
+      network[:default_gateway] = default_line[1]
+      network[:default_interface] = default_line[5]
     end
 
-    # Splits the ifconfig output to 1 line per interface
-    if_so = shell_out("ifconfig -a")
-    if_so.stdout.gsub(/\n(\w+\d+)/, '___\1').split("___").each do |intraface|
-      splat = intraface.split(":")
-      interface = splat[0]
-      line = splat[1..-1][0]
-      iface[interface] = Mash.new
-      iface[interface][:state] = (line.include?("<UP,") ? "up" : "down")
-
-      intraface.lines.each do |lin|
-        case lin
+    # Splits the ifconfig output into arrays of interface strings
+    shell_out("ifconfig -a").stdout.split(/\n(?=\w)/).each do |int_lines|
+      int_name, int_data = int_lines.split(":", 2)
+
+      ifaces[int_name] = Mash.new
+      ifaces[int_name][:addresses] ||= Mash.new
+      ifaces[int_name][:state] = (int_data.include?("<UP,") ? "up" : "down")
+
+      int_data.each_line do |line|
+        case line
         when /flags=\S+<(\S+)>/
-          iface[interface][:flags] = $1.split(",")
-          iface[interface][:metric] = $1 if lin =~ /metric\s(\S+)/
+          ifaces[int_name][:flags] = $1.split(",")
+          ifaces[int_name][:metric] = $1 if line =~ /metric\s(\S+)/
         else
           # We have key value pairs.
-          if lin =~ %r{inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(/(\d{1,2}))?}
-            tmp_addr, tmp_prefix = $1, $3
+          if line =~ %r{inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(/(\d{1,2}))?}
+            tmp_addr = $1
+            tmp_prefix = $3
             if tmp_prefix.nil?
-              netmask = hex_to_dec_netmask($1) if lin =~ /netmask\s0x(\S+)\s/
+              netmask = hex_to_dec_netmask($1) if line =~ /netmask\s0x(\S+)\s/
               unless netmask
                 tmp_prefix ||= "32"
                 netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
@@ -86,57 +84,51 @@ Ohai.plugin(:Network) do
               netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
             end
 
-            iface[interface][:addresses] ||= Mash.new
-            iface[interface][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
-            iface[interface][:addresses][tmp_addr][:netmask] = netmask
+            ifaces[int_name][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
+            ifaces[int_name][:addresses][tmp_addr][:netmask] = netmask
 
-            if lin =~ /broadcast\s(\S+)\s/
-              iface[interface][:addresses][tmp_addr][:broadcast] = $1
+            if line =~ /broadcast\s(\S+)\s/
+              ifaces[int_name][:addresses][tmp_addr][:broadcast] = $1
             end
-          elsif lin =~ %r{inet6 ([a-f0-9\:]+)%?(\d*)/?(\d*)?}
-            # TODO do we have more properties on inet6 in aix? broadcast
-            iface[interface][:addresses] ||= Mash.new
-            iface[interface][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }
+          elsif line =~ %r{inet6 ([a-f0-9\:]+)%?(\d*)/?(\d*)?}
+            # TODO: do we have more properties on inet6 in aix? broadcast
+            ifaces[int_name][:addresses] ||= Mash.new
+            ifaces[int_name][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }
           else
-            # load all key-values, example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
-            properties = lin.split
-            n = properties.length / 2 - 1
-            (0..n).each do |i|
-              iface[interface][properties[i * 2]] = properties[(i * 2 + 1)]
+            # add all key value data into the interface mash
+            # for example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
+            # has keys tcp_sendspace, tcp_recvspace, and rfc1323
+            line.split.each_slice(2) do |key, value|
+              ifaces[int_name][key] = value
             end
           end
         end
       end
 
       # Query macaddress
-      e_so = shell_out("entstat -d #{interface} | grep \"Hardware Address\"")
-      iface[interface][:addresses] ||= Mash.new
-      e_so.stdout.lines.each do |l|
-        if l =~ /Hardware Address: (\S+)/
-          iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" }
-          macaddress $1.upcase unless shell_out("uname -W").stdout.to_i > 0
-        end
+      shell_out("entstat -d #{int_name}").stdout =~ /Hardware Address: (\S+)/
+      if $1
+        ifaces[int_name][:addresses][$1.upcase] = { "family" => "lladdr" }
+        macaddress $1.upcase unless shell_out("uname -W").stdout.to_i > 0
       end
     end # ifconfig stdout
 
     # Query routes information
     %w{inet inet6}.each do |family|
-      so_n = shell_out("netstat -nrf #{family}")
-      so_n.stdout.lines.each do |line|
+      shell_out("netstat -nrf #{family}").stdout.each_line do |line|
         if line =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\S+)/
           interface = $6
-          iface[interface][:routes] = [] unless iface[interface][:routes]
-          iface[interface][:routes] << Mash.new( destination: $1, family: family,
-                                                 via: $2, flags: $3)
+          ifaces[interface][:routes] ||= []
+          ifaces[interface][:routes] << Mash.new( destination: $1, family: family,
+                                                  via: $2, flags: $3)
         end
       end
     end
 
     # List the arp entries in system.
-    so = shell_out("arp -an")
     count = 0
-    so.stdout.lines.each do |line|
-      network[:arp] ||= Mash.new
+    network[:arp] ||= Mash.new
+    shell_out("arp -an").stdout.each_line do |line|
       if line =~ /\s*(\S+) \((\S+)\) at ([a-fA-F0-9\:]+) \[(\w+)\] stored in bucket/
         network[:arp][count] ||= Mash.new
         network[:arp][count][:remote_host] = $1
@@ -145,6 +137,6 @@ Ohai.plugin(:Network) do
         count += 1
       end
     end
-    network["interfaces"] = iface
+    network["interfaces"] = ifaces
   end
 end

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

@@ -23,8 +23,8 @@ Ohai.plugin(:Platform) do
   depends "kernel"
 
   collect_data(:aix) do
-    platform kernel[:name]
+    platform "aix"
+    platform_family "aix"
     platform_version [kernel[:version], kernel[:release]].join(".")
-    platform_family platform
   end
 end

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

@@ -23,17 +23,14 @@ Ohai.plugin(:Virtualization) do
   collect_data(:aix) do
     virtualization Mash.new
 
-    so = shell_out("uname -L")
-    lpar_no = so.stdout.split($/)[0].split(/\s/)[0]
-    lpar_name = so.stdout.split($/)[0].split(/\s/)[1]
+    lpar_no, lpar_name = shell_out("uname -L").stdout.split(nil, 2)
 
     unless lpar_no.to_i == -1 || (lpar_no.to_i == 1 && lpar_name == "NULL")
       virtualization[:lpar_no] = lpar_no
       virtualization[:lpar_name] = lpar_name
     end
 
-    so = shell_out("uname -W")
-    wpar_no = so.stdout.split($/)[0]
+    wpar_no = shell_out("uname -W").stdout.strip
     if wpar_no.to_i > 0
       virtualization[:wpar_no] = wpar_no
     else
@@ -41,8 +38,11 @@ Ohai.plugin(:Virtualization) do
       so = shell_out("lswpar -L").stdout.scan(/={65}.*?(?:EXPORTED\n\n)+/m)
       wpars = Mash.new
       so.each do |wpar|
-        wpar_name = wpar.lines[1].split[0]
+        wpar_heading = wpar.lines[1].split
+        wpar_name = wpar_heading[0]
+
         wpars[wpar_name] = Mash.new
+        wpars[wpar_name][:state] = wpar_heading[2].downcase
 
         wpar.scan(/^[A-Z]{4,}.*?[A-Z\:0-9]$.*?\n\n/m).each do |section|
 

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

@@ -31,7 +31,7 @@ Ohai.plugin(:Virtualization) do
 
     # detect when in a jail or when a jail is actively running (not in stopped state)
     so = shell_out("sysctl -n security.jail.jailed")
-    if so.stdout.split($/)[0].to_i == 1
+    if so.stdout.strip.to_i == 1
       virtualization[:system] = "jail"
       virtualization[:role] = "guest"
       virtualization[:systems][:jail] = "guest"

data/lib/ohai/plugins/c.rb

@@ -123,12 +123,12 @@ Ohai.plugin(:C) do
   end
 
   def collect_xlc
-    # ibm xlc
-
+    # IBM XL C/C++ for AIX, V13.1.3 (5725-C72, 5765-J07)
+    # Version: 13.01.0003.0000
     so = shell_out("xlc -qversion")
     if so.exitstatus == 0 || (so.exitstatus >> 8) == 249
       description = so.stdout.split($/).first
-      if description =~ /V(\d+\.\d+)/
+      if description =~ /V(\d+\.\d+(.\d+)?)/
         @c[:xlc] = Mash.new
         @c[:xlc][:version] = $1
         @c[:xlc][:description] = description.strip