ohai 13.8.0 → 13.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed79bd1846153f8db453aa5c4d5a450522ccb0ffaa7ddb9faf6f1e8f317ec938
-  data.tar.gz: 504355e9a917477dd61c28ca6f99eda71a31f8882897d05f5a7f006b2b2e45f5
+  metadata.gz: ac08ce5a211365837e135cb56aac6da7739a18ad4668ea9c13d29ff530b80f3b
+  data.tar.gz: f423edf0da0a9af0ff03a8c0c9179200a626f3b57af5c825ddce62710870e056
 SHA512:
-  metadata.gz: 47c46363f70bd81d58a2dd14b6076371c5328498c255b925d860ececef66e241133ddc45d5baa319fc22b301a46ad6e5c71ab295d09f20601d062504fb8fbc24
-  data.tar.gz: 95eb6bd6fe89046944619277d60a947195416892874a554c21a1d004dfa6f758be1e3ad52d7c9bb997dd6fdb2e3e72b879bee12b810b4592fe9a1bcf19a30f52
+  metadata.gz: '09a90504692248fc72740b5bcb5477b433d99e036a0182980a5b3618e9cb6ca34198641fa52cc35890d705cd68c299d36c58df38dd0b22a697b3def7343c26b7'
+  data.tar.gz: 2558c4c4589659fa4881f2f2f47c03b31277fcd0ca8dc181c4d7a60fd0bce535a6a14d41196a5e194a2e618d17baf5d06294411bb6be221ec142ba74c62c88be

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"
+  gem "chefstyle", "= 0.6.0"
   gem "rake", ">= 10.1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
@@ -17,10 +17,6 @@ group :ci do
   gem "rspec_junit_formatter"
 end
 
-group :changelog do
-  gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
-end
-
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,

data/lib/ohai/mixin/azure_metadata.rb

@@ -22,7 +22,7 @@ module Ohai
     module AzureMetadata
 
       AZURE_METADATA_ADDR = "169.254.169.254" unless defined?(AZURE_METADATA_ADDR)
-      AZURE_METADATA_URL = "/metadata/instance?api-version=2017-04-02" unless defined?(AZURE_METADATA_URL)
+      AZURE_METADATA_URL = "/metadata/instance?api-version=2017-08-01" unless defined?(AZURE_METADATA_URL)
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)

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

@@ -27,7 +27,7 @@ Ohai.plugin(:Uptime) do
     # 1148-20:54:50
     # This reads as 1148 days, 20 hours, 54 minutes, 50 seconds since the process was started (elapsed)
     # who -b does not return the YEAR, so we need something more concrete
-    so = shell_out("LC_ALL=POSIX ps -o etime= -p 1").stdout
+    so = shell_out("LC_ALL=POSIX ps -o etime= -p 1").stdout.strip
 
     # Here we'll check our shell_out for a dash, which indicates there is a # of days involved
     # We'll chunk off the days, hours (where applicable), minutes, seconds into seperate vars

data/lib/ohai/plugins/azure.rb

@@ -68,9 +68,13 @@ Ohai.plugin(:Azure) do
   end
 
   # create the basic structure we'll store our data in
-  def initialize_metadata_mash
+  def initialize_metadata_mash_compute
     metadata = Mash.new
     metadata["compute"] = Mash.new
+    metadata
+  end
+
+  def initialize_metadata_mash_network(metadata)
     metadata["network"] = Mash.new
     metadata["network"]["interfaces"] = Mash.new
     %w{public_ipv4 local_ipv4 public_ipv6 local_ipv6}.each do |type|
@@ -93,27 +97,31 @@ Ohai.plugin(:Azure) do
 
     endpoint_data = fetch_metadata
     return nil if endpoint_data.nil?
-    metadata = initialize_metadata_mash
+    metadata = initialize_metadata_mash_compute
 
     # blindly add everything in compute to our data structure
     endpoint_data["compute"].each do |k, v|
       metadata["compute"][k] = v
     end
 
-    # parse out per interface interface IP data
-    endpoint_data["network"]["interface"].each do |int|
-      metadata["network"]["interfaces"][int["macAddress"]] = Mash.new
-      metadata["network"]["interfaces"][int["macAddress"]]["mac"] = int["macAddress"]
-      metadata["network"]["interfaces"][int["macAddress"]]["public_ipv6"] = fetch_ip_data(int, "ipv6", "publicIpAddress")
-      metadata["network"]["interfaces"][int["macAddress"]]["public_ipv4"] = fetch_ip_data(int, "ipv4", "publicIpAddress")
-      metadata["network"]["interfaces"][int["macAddress"]]["local_ipv6"] = fetch_ip_data(int, "ipv6", "privateIpAddress")
-      metadata["network"]["interfaces"][int["macAddress"]]["local_ipv4"] = fetch_ip_data(int, "ipv4", "privateIpAddress")
-    end
+    # receiving network output is not guaranteed
+    unless endpoint_data["network"].nil?
+      metadata = initialize_metadata_mash_network(metadata)
+      # parse out per interface interface IP data
+      endpoint_data["network"]["interface"].each do |int|
+        metadata["network"]["interfaces"][int["macAddress"]] = Mash.new
+        metadata["network"]["interfaces"][int["macAddress"]]["mac"] = int["macAddress"]
+        metadata["network"]["interfaces"][int["macAddress"]]["public_ipv6"] = fetch_ip_data(int, "ipv6", "publicIpAddress")
+        metadata["network"]["interfaces"][int["macAddress"]]["public_ipv4"] = fetch_ip_data(int, "ipv4", "publicIpAddress")
+        metadata["network"]["interfaces"][int["macAddress"]]["local_ipv6"] = fetch_ip_data(int, "ipv6", "privateIpAddress")
+        metadata["network"]["interfaces"][int["macAddress"]]["local_ipv4"] = fetch_ip_data(int, "ipv4", "privateIpAddress")
+      end
 
-    # aggregate the total IP data
-    %w{public_ipv4 local_ipv4 public_ipv6 local_ipv6}.each do |type|
-      metadata["network"]["interfaces"].each_value do |val|
-        metadata["network"][type].concat val[type] unless val[type].empty?
+      # aggregate the total IP data
+      %w{public_ipv4 local_ipv4 public_ipv6 local_ipv6}.each do |type|
+        metadata["network"]["interfaces"].each_value do |val|
+          metadata["network"][type].concat val[type] unless val[type].empty?
+        end
       end
     end
 

data/lib/ohai/plugins/cloud.rb

@@ -26,6 +26,7 @@ Ohai.plugin(:Cloud) do
   depends "openstack"
   depends "azure"
   depends "digital_ocean"
+  depends "softlayer"
 
   # Class to help enforce the interface exposed to node[:cloud] (OHAI-542)
   #
@@ -295,6 +296,27 @@ Ohai.plugin(:Cloud) do
     @cloud_attr_obj.provider = "digital_ocean"
   end
 
+  # ----------------------------------------
+  # softlayer
+  # ----------------------------------------
+
+  # Is current cloud softlayer?
+  #
+  # === Return
+  # true:: If softlayer Hash is defined
+  # false:: Otherwise
+  def on_softlayer?
+    softlayer != nil
+  end
+
+  # Fill cloud hash with softlayer values
+  def get_softlayer_values
+    @cloud_attr_obj.add_ipv4_addr(softlayer["public_ipv4"], :public)
+    @cloud_attr_obj.add_ipv4_addr(softlayer["local_ipv4"], :private)
+    @cloud_attr_obj.public_hostname = softlayer["public_fqdn"]
+    @cloud_attr_obj.provider = "softlayer"
+  end
+
   collect_data do
     require "ipaddr"
 
@@ -308,6 +330,7 @@ Ohai.plugin(:Cloud) do
     get_openstack_values if on_openstack?
     get_azure_values if on_azure?
     get_digital_ocean_values if on_digital_ocean?
+    get_softlayer_values if on_softlayer?
 
     # set node[:cloud] and node[:cloud_v2] hash here
     cloud_v2 @cloud_attr_obj.cloud_mash

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

@@ -20,6 +20,7 @@
 
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
+  depends "hardware"
 
   def vboxmanage_exists?
     which("VBoxManage")
@@ -47,12 +48,24 @@ Ohai.plugin(:Virtualization) do
       virtualization[:systems][:vbox] = "host"
     end
 
+    if hardware[:boot_rom_version].match?(/VirtualBox/i)
+      virtualization[:system] = "vbox"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:vbox] = "guest"
+    end
+
     if fusion_exists?
       virtualization[:system] = "vmware"
       virtualization[:role] = "host"
       virtualization[:systems][:vmware] = "host"
     end
 
+    if hardware[:boot_rom_version].match?(/VMW/i)
+      virtualization[:system] = "vmware"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:vmware] = "guest"
+    end
+
     if prlctl_exists?
       virtualization[:system] = "parallels"
       virtualization[:role] = "host"

data/lib/ohai/version.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2017, Chef Software Inc.
+# Copyright:: Copyright (c) 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "13.8.0"
+  VERSION = "13.9.0"
 end

data/spec/unit/plugins/aix/uptime_spec.rb

@@ -24,15 +24,19 @@ describe Ohai::System, "Aix plugin uptime" do
     @plugin = get_plugin("aix/uptime")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     allow(@plugin).to receive(:shell_out).and_call_original
-    allow(@plugin).to receive(:shell_out).with("LC_ALL=POSIX ps -o etime= -p 1").and_return(mock_shell_out(0, "1148-20:54:50", nil))
-    @plugin.run
   end
 
-  it "should set uptime_seconds to uptime with days" do
+  it "should set uptime_seconds and uptime standard case" do
+    allow(@plugin).to receive(:shell_out).with("LC_ALL=POSIX ps -o etime= -p 1").and_return(mock_shell_out(0, "1148-20:54:50", nil))
+    @plugin.run
     expect(@plugin[:uptime_seconds]).to eq(99262490)
+    expect(@plugin[:uptime]).to eq("1148 days 20 hours 54 minutes 50 seconds")
   end
 
-  it "should set uptime to a human readable date with days" do
-    expect(@plugin[:uptime]).to eq("1148 days 20 hours 54 minutes 50 seconds")
+  it "should set uptime_seconds and uptime in the whitespace case" do
+    allow(@plugin).to receive(:shell_out).with("LC_ALL=POSIX ps -o etime= -p 1").and_return(mock_shell_out(0, " 2-20:54:50", nil))
+    @plugin.run
+    expect(@plugin[:uptime_seconds]).to eq(248090)
+    expect(@plugin[:uptime]).to eq("2 days 20 hours 54 minutes 50 seconds")
   end
 end

data/spec/unit/plugins/cloud_spec.rb

@@ -86,6 +86,7 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:azure] = nil
       @plugin[:gce] = nil
       @plugin[:digital_ocean] = nil
+      @plugin[:softlayer] = nil
       @plugin.run
       expect(@plugin[:cloud]).to be_nil
       expect(@plugin[:cloud_v2]).to be_nil
@@ -457,4 +458,39 @@ describe Ohai::System, "plugin cloud" do
     end
   end
 
+  describe "with softlayer mash" do
+    before do
+      @plugin[:softlayer] = Mash.new
+      @plugin[:softlayer] = { "local_ipv4" => "192.168.0.1",
+                              "public_ipv4" => "8.8.8.8",
+                              "public_fqdn" => "abc1234.public.com",
+      }
+    end
+
+    it "populates cloud public ip" do
+      @plugin.run
+      expect(@plugin[:cloud][:public_ipv4_addrs][0]).to eq(@plugin[:softlayer][:public_ipv4])
+    end
+
+    it "populates cloud private ip" do
+      @plugin.run
+      expect(@plugin[:cloud][:local_ipv4_addrs][0]).to eq(@plugin[:softlayer][:local_ipv4])
+    end
+
+    it "populates first cloud public ip" do
+      @plugin.run
+      expect(@plugin[:cloud][:public_ipv4_addrs].first).to eq(@plugin[:softlayer][:public_ipv4])
+    end
+
+    it "populates cloud public_hostname" do
+      @plugin.run
+      expect(@plugin[:cloud][:public_hostname]).to eq(@plugin[:softlayer][:public_fqdn])
+    end
+
+    it "populates cloud provider" do
+      @plugin.run
+      expect(@plugin[:cloud][:provider]).to eq("softlayer")
+    end
+  end
+
 end

data/spec/unit/plugins/darwin/virtualization_spec.rb

@@ -29,6 +29,9 @@ describe Ohai::System, "Darwin virtualization platform" do
     allow(plugin).to receive(:ioreg_exists?).and_return(false)
     allow(plugin).to receive(:vboxmanage_exists?).and_return(false)
     allow(plugin).to receive(:fusion_exists?).and_return(false)
+    allow(plugin).to receive(:docker_exists?).and_return(false)
+    plugin[:hardware] = Mash.new
+    plugin[:hardware][:boot_rom_version] = "not_a_vm"
   end
 
   describe "when detecting OS X virtualization" do
@@ -45,6 +48,14 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:vmware]).to eq("host")
     end
 
+    it "should set vmware guest if hardware attributes mention vmware" do
+      plugin[:hardware][:boot_rom_version] = "VMW71.00V.6997262.B64.1710270607"
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("vmware")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:vmware]).to eq("guest")
+    end
+
     it "should set vbox host if /usr/local/bin/VBoxManage exists" do
       allow(plugin).to receive(:vboxmanage_exists?).and_return("/usr/local/bin/VBoxManage")
       plugin.run
@@ -53,6 +64,14 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:vbox]).to eq("host")
     end
 
+    it "should set vbox guest if hardware attributes mention virtualbox" do
+      plugin[:hardware][:boot_rom_version] = "VirtualBox"
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("vbox")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:vbox]).to eq("guest")
+    end
+
     it "should set parallels host if /usr/bin/prlctl exists" do
       allow(plugin).to receive(:prlctl_exists?).and_return("/usr/bin/prlctl")
       plugin.run

data/spec/unit/plugins/vmware_spec.rb

@@ -64,6 +64,7 @@ describe Ohai::System, "plugin vmware" do
       plugin[:virtualization][:systems] = Mash.new
       plugin[:virtualization][:systems][:vmware] = Mash.new
       allow(File).to receive(:exist?).with("/usr/bin/vmware-toolbox-cmd").and_return(false)
+      plugin.run
       expect(plugin).not_to have_key(:vmware)
     end
   end
@@ -73,6 +74,7 @@ describe Ohai::System, "plugin vmware" do
       plugin[:virtualization] = Mash.new
       plugin[:virtualization][:systems] = Mash.new
       plugin[:virtualization][:systems][:vbox] = Mash.new
+      plugin.run
       expect(plugin).not_to have_key(:vmware)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 13.8.0
+  version: 13.9.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu