ohai 13.0.1 → 13.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc03fe6ff6ba0d982a2aa2f46478ef5a9591aedb
-  data.tar.gz: 060eee8013d65b8225ae6d430c694b6356d9584f
+  metadata.gz: 5a790e9dca44c313d60c13521eddb5f71fb17d95
+  data.tar.gz: b42fe376d2bc0ae29386b3d5e90607e65f47050a
 SHA512:
-  metadata.gz: 50cb72595109dd4e3a7d2b0bd573dfe7eca8624a9d6ec398ec14e60b0085050f6ca9cf0438123d53b928d5f86a9696610d4931be2b1f6450d0b0f25d3a41ee65
-  data.tar.gz: 1d0ad0f6f97869c6875e5b71d83c2bb64f5dcf5db5e41d99c18da40e9667fe0cc3654338623ff885b76be270513775aee51ed7289e82410c0c15dfe9fe3e8d32
+  metadata.gz: 9280f45b479f112e18e8118db63f9b091c94eab2a08756f3e306ee4fc23d4bba4246550c6c1e5d9fb2e2293eaeeac11da6946af12778258b3f96c5c236b13910
+  data.tar.gz: 94e260d4a12d569b9a8c3a0cef67359f05b82760b636f30f10658ebb73adcbcd9bd2af5a33681a715ce4c743d1ca3dc2292d83edcb8cb2fa5b0b0a023b01833a

data/lib/ohai/loader.rb

@@ -133,8 +133,8 @@ module Ohai
         load_v7_plugin_class(contents, plugin_path)
       else
         Ohai::Log.warn("[DEPRECATION] Plugin at #{plugin_path} is a version 6 plugin. \
-Version 6 plugins will not be supported in future releases of Ohai. \
-Please upgrade your plugin to version 7 plugin syntax. \
+Version 6 plugins will not be supported in Chef/Ohai 14. \
+Please upgrade your plugin to version 7 plugin format. \
 For more information visit here: docs.chef.io/ohai_custom.html")
 
         load_v6_plugin_class(contents, plugin_path, plugin_dir_path)

data/lib/ohai/mixin/command.rb

@@ -27,8 +27,13 @@ module Ohai
       # DISCLAIMER: Logging only works in the context of a plugin!!
       # accept a command and any of the mixlib-shellout options
       def shell_out(cmd, **options)
+        options = options.dup
         # unless specified by the caller timeout after 30 seconds
         options[:timeout] ||= 30
+        unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+          options[:env] = options.key?(:env) ? options[:env].dup : {}
+          options[:env]["PATH"] ||= ((ENV["PATH"] || "").split(":") + %w{/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin}).join(":")
+        end
         so = Mixlib::ShellOut.new(cmd, options)
         begin
           so.run_command

data/lib/ohai/mixin/ec2_metadata.rb

@@ -2,7 +2,7 @@
 # Author:: Tim Dysinger (<tim@dysinger.net>)
 # Author:: Benjamin Black (<bb@chef.io>)
 # Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: 2009-2017 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,37 +42,41 @@ module Ohai
       EC2_METADATA_ADDR = "169.254.169.254" unless defined?(EC2_METADATA_ADDR)
       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-11-05 2014-02-25 }
-
+                                   2014-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02 }
       EC2_ARRAY_VALUES = %w{security-groups}
       EC2_ARRAY_DIR    = %w{network/interfaces/macs}
       EC2_JSON_DIR     = %w{iam}
 
       def best_api_version
-        response = http_client.get("/")
-        if response.code == "404"
-          Ohai::Log.debug("ec2 metadata mixin: Received HTTP 404 from metadata server while determining API version, assuming 'latest'")
-          return "latest"
-        elsif response.code != "200"
-          raise "Unable to determine EC2 metadata version (returned #{response.code} response)"
-        end
-        # 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")
-        versions = response.body.split("\n").sort
-        until versions.empty? || EC2_SUPPORTED_VERSIONS.include?(versions.last)
-          pv = versions.pop
-          Ohai::Log.debug("ec2 metadata mixin: EC2 shows unsupported metadata version: #{pv}") unless pv == "latest"
-        end
-        Ohai::Log.debug("ec2 metadata mixin: EC2 metadata version: #{versions.last}")
-        if versions.empty?
-          raise "Unable to determine EC2 metadata version (no supported entries found)"
+        @api_version ||= begin
+          Ohai::Log.debug("ec2 metadata mixin: Fetching http://#{EC2_METADATA_ADDR}/ to determine the latest supported metadata release")
+          response = http_client.get("/")
+          if response.code == "404"
+            Ohai::Log.debug("ec2 metadata mixin: Received HTTP 404 from metadata server while determining API version, assuming 'latest'")
+            return "latest"
+          elsif response.code != "200"
+            raise "Unable to determine EC2 metadata version (returned #{response.code} response)"
+          end
+          # 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)
+            pv = versions.pop
+            Ohai::Log.debug("ec2 metadata mixin: EC2 lists metadata version: #{pv} not yet supported by Ohai") unless pv == "latest"
+          end
+          Ohai::Log.debug("ec2 metadata mixin: Latest supported EC2 metadata version: #{versions.last}")
+          if versions.empty?
+            raise "Unable to determine EC2 metadata version (no supported entries found)"
+          end
+          versions.last
         end
-        versions.last
       end
 
       def http_client
-        Net::HTTP.start(EC2_METADATA_ADDR).tap { |h| h.read_timeout = 30 }
+        @conn ||= Net::HTTP.start(EC2_METADATA_ADDR).tap do |h|
+          h.read_timeout = 10
+          h.keep_alive_timeout = 10
+        end
       end
 
       # Get metadata for a given path and API version
@@ -84,6 +88,7 @@ module Ohai
       #   `nil` and continue the run instead of failing it.
       def metadata_get(id, api_version)
         path = "/#{api_version}/meta-data/#{id}"
+        Ohai::Log.debug("ec2 metadata mixin: Fetching http://#{EC2_METADATA_ADDR}#{path}")
         response = http_client.get(path)
         case response.code
         when "200"
@@ -97,31 +102,28 @@ module Ohai
       end
 
       def fetch_metadata(id = "", api_version = nil)
-        api_version ||= best_api_version
-        return {} if api_version.nil?
-
         metadata = {}
-        retrieved_metadata = metadata_get(id, api_version)
+        retrieved_metadata = metadata_get(id, best_api_version)
         if retrieved_metadata
           retrieved_metadata.split("\n").each do |o|
             key = expand_path("#{id}#{o}")
             if key[-1..-1] != "/"
               metadata[metadata_key(key)] =
                 if EC2_ARRAY_VALUES.include? key
-                  retr_meta = metadata_get(key, api_version)
+                  retr_meta = metadata_get(key, best_api_version)
                   retr_meta ? retr_meta.split("\n") : retr_meta
                 else
-                  metadata_get(key, api_version)
+                  metadata_get(key, best_api_version)
                 end
             elsif (not key.eql?(id)) && (not key.eql?("/"))
               name = key[0..-2]
               sym = metadata_key(name)
               if EC2_ARRAY_DIR.include?(name)
-                metadata[sym] = fetch_dir_metadata(key, api_version)
+                metadata[sym] = fetch_dir_metadata(key, best_api_version)
               elsif EC2_JSON_DIR.include?(name)
-                metadata[sym] = fetch_json_dir_metadata(key, api_version)
+                metadata[sym] = fetch_json_dir_metadata(key, best_api_version)
               else
-                fetch_metadata(key, api_version).each { |k, v| metadata[k] = v }
+                fetch_metadata(key, best_api_version).each { |k, v| metadata[k] = v }
               end
             end
           end
@@ -167,17 +169,14 @@ module Ohai
       end
 
       def fetch_userdata
-        api_version = best_api_version
-        return nil if api_version.nil?
-        response = http_client.get("/#{api_version}/user-data/")
+        Ohai::Log.debug("ec2 metadata mixin: Fetching http://#{EC2_METADATA_ADDR}/#{best_api_version}/user-data/")
+        response = http_client.get("/#{best_api_version}/user-data/")
         response.code == "200" ? response.body : nil
       end
 
       def fetch_dynamic_data
         @fetch_dynamic_data ||= begin
-          api_version = best_api_version
-          return {} if api_version.nil?
-          response = http_client.get("/#{api_version}/dynamic/instance-identity/document/")
+          response = http_client.get("/#{best_api_version}/dynamic/instance-identity/document/")
 
           if json?(response.body) && response.code == "200"
             FFI_Yajl::Parser.parse(response.body)

data/lib/ohai/plugins/linux/mdadm.rb

@@ -1,6 +1,8 @@
 #
 # Author:: Tim Smith <tsmith@limelight.com>
+# Author:: Phil Dibowitz <phild@ipomc.com>
 # Copyright:: Copyright (c) 2013-2014, Limelight Networks, Inc.
+# Copyright:: Copyright (c) 2017 Facebook, Inc.
 # Plugin:: mdadm
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,15 +54,19 @@ Ohai.plugin(:Mdadm) do
   collect_data(:linux) do
     # gather a list of all raid arrays
     if File.exist?("/proc/mdstat")
-      devices = []
+      devices = {}
       File.open("/proc/mdstat").each do |line|
-        devices << Regexp.last_match[1] if line =~ /(md[0-9]+)/
+        if line =~ /(md[0-9]+)/
+          device = Regexp.last_match[1]
+          pieces = line.split(/\s+/)
+          devices[device] = pieces[4..-1].map { |s| s.match(/(.+)\[\d\]/)[1] }
+        end
       end
 
       # create the mdadm mash and gather individual information if devices are present
       unless devices.empty?
         mdadm Mash.new
-        devices.sort.each do |device|
+        devices.keys.sort.each do |device|
           mdadm[device] = Mash.new
 
           # gather detailed information on the array
@@ -68,6 +74,7 @@ Ohai.plugin(:Mdadm) do
 
           # if the mdadm command was sucessful pass so.stdout to create_raid_device_mash to grab the tidbits we want
           mdadm[device] = create_raid_device_mash(so.stdout) if so.stdout
+          mdadm[device]["members"] = devices[device]
         end
       end
     end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "13.0.1"
+  VERSION = "13.1.0"
 end

data/spec/unit/mixin/command_spec.rb

@@ -26,15 +26,24 @@ describe Ohai::Mixin::Command, "shell_out" do
 
   let(:plugin_name) { :OSSparkleDream }
 
+  let(:options) { windows? ? { timeout: 30 } : { timeout: 30, env: { "PATH" => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" } } }
+
   before(:each) do
     allow(Ohai::Mixin::Command).to receive(:name).and_return(plugin_name)
+    @original_env = ENV.to_hash
+    ENV.clear
+  end
+
+  after(:each) do
+    ENV.clear
+    ENV.update(@original_env)
   end
 
   describe "when the command runs" do
     it "logs the command and exitstatus" do
       expect(Mixlib::ShellOut).
         to receive(:new).
-        with(cmd, { timeout: 30 }).
+        with(cmd, options).
         and_return(shell_out)
 
       expect(shell_out).
@@ -55,7 +64,7 @@ describe Ohai::Mixin::Command, "shell_out" do
     it "logs the command and error message" do
       expect(Mixlib::ShellOut).
         to receive(:new).
-        with(cmd, { timeout: 30 }).
+        with(cmd, options).
         and_return(shell_out)
 
       expect(shell_out).
@@ -76,7 +85,7 @@ describe Ohai::Mixin::Command, "shell_out" do
     it "logs the command an timeout error message" do
       expect(Mixlib::ShellOut).
         to receive(:new).
-        with(cmd, { timeout: 30 }).
+        with(cmd, options).
         and_return(shell_out)
 
       expect(shell_out).
@@ -94,7 +103,7 @@ describe Ohai::Mixin::Command, "shell_out" do
   end
 
   describe "when a timeout option is provided" do
-    let(:options) { { timeout: 10 } }
+    let(:options) { windows? ? { timeout: 10 } : { timeout: 10, env: { "PATH" => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" } } }
 
     it "runs the command with the provided timeout" do
       expect(Mixlib::ShellOut).

data/spec/unit/plugins/ec2_spec.rb

@@ -49,7 +49,7 @@ describe Ohai::System, "plugin ec2" do
       allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
       allow(Socket).to receive(:new).and_return(t)
       expect(@http_client).to receive(:get).
-        with("/").exactly(3).times.
+        with("/").
         and_return(double("Net::HTTP Response", :body => "2012-01-12", :code => "200"))
     end
 

data/spec/unit/plugins/eucalyptus_spec.rb

@@ -36,7 +36,7 @@ describe Ohai::System, "plugin eucalyptus" do
       allow(plugin).to receive(:http_client).and_return(@http_client)
 
       expect(@http_client).to receive(:get).
-        with("/").twice.
+        with("/").
         and_return(double("Net::HTTP Response", :body => "2012-01-12", :code => "200"))
       expect(@http_client).to receive(:get).
         with("/2012-01-12/meta-data/").

data/spec/unit/plugins/linux/mdadm_spec.rb

@@ -99,6 +99,12 @@ MD
       end
     end
 
+    it "should detect member devies" do
+      @plugin.run
+      expect(@plugin[:mdadm][:md0][:members].sort).to eq(
+        %w{sdc sdd sde sdf sdg sdh}
+      )
+    end
   end
 
 end

data/spec/unit/plugins/openstack_spec.rb

@@ -160,7 +160,7 @@ EOM
         }'
       end
 
-      let(:http_client) { double("Net::HTTP", :read_timeout= => nil) }
+      let(:http_client) { double("Net::HTTP", { :read_timeout= => nil, :keep_alive_timeout= => nil } ) }
 
       def allow_get(url, response_body)
         allow(http_client).to receive(:get).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 13.0.1
+  version: 13.1.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu