ohai 13.3.0 → 13.4.0

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

@@ -16,13 +16,12 @@
 # limitations under the License.
 #
 
-require "ohai/util/file_helper"
-
-include Ohai::Util::FileHelper
-
 Ohai.plugin(:SystemdPaths) do
   provides "systemd_paths"
 
+  require "ohai/util/file_helper"
+  include Ohai::Util::FileHelper
+
   collect_data(:linux) do
     systemd_path_path = which("systemd-path")
     if systemd_path_path

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

@@ -16,9 +16,8 @@
 # limitations under the License.
 #
 
-require "ohai/mixin/dmi_decode"
-
 Ohai.plugin(:Virtualization) do
+  require "ohai/mixin/dmi_decode"
   include Ohai::Mixin::DmiDecode
   provides "virtualization"
 
@@ -186,6 +185,11 @@ Ohai.plugin(:Virtualization) do
         virtualization[:system] = $1
         virtualization[:role] = "guest"
         virtualization[:systems][$1.to_sym] = "guest"
+      elsif File.read("/proc/1/environ") =~ /container=lxc/
+        Ohai::Log.debug("Plugin Virtualization: /proc/1/environ indicates lxc container. Detecting as lxc guest")
+        virtualization[:system] = "lxc"
+        virtualization[:role] = "guest"
+        virtualization[:systems][:lxc] = "guest"
       elsif lxc_version_exists? && File.read("/proc/self/cgroup") =~ %r{\d:[^:]+:/$}
         # lxc-version shouldn't be installed by default
         # Even so, it is likely we are on an LXC capable host that is not being used as such

data/lib/ohai/plugins/network.rb

@@ -16,10 +16,9 @@
 # limitations under the License.
 #
 
-require "ipaddress"
-require "ohai/mixin/network_constants"
-
 Ohai.plugin(:NetworkAddresses) do
+  require "ipaddress"
+  require "ohai/mixin/network_constants"
   include Ohai::Mixin::NetworkConstants
 
   provides "ipaddress", "ip6address", "macaddress"

data/lib/ohai/plugins/openstack.rb

@@ -16,10 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "ohai/mixin/ec2_metadata"
-require "ohai/mixin/http_helper"
-
 Ohai.plugin(:Openstack) do
+  require "ohai/mixin/ec2_metadata"
+  require "ohai/mixin/http_helper"
   include Ohai::Mixin::Ec2Metadata
   include Ohai::Mixin::HttpHelper
 

data/lib/ohai/plugins/os.rb

@@ -16,9 +16,8 @@
 # limitations under the License.
 #
 
-require "ohai/mixin/os"
-
 Ohai.plugin(:OS) do
+  require "ohai/mixin/os"
   provides "os", "os_version"
   depends "kernel"
 

data/lib/ohai/plugins/packages.rb

@@ -32,7 +32,8 @@ Ohai.plugin(:Packages) do
 
   collect_data(:linux) do
     packages Mash.new
-    if %w{debian}.include? platform_family
+    case platform_family
+    when "debian"
       format = '${Package}\t${Version}\t${Architecture}\n'
       so = shell_out("dpkg-query -W -f='#{format}'")
       pkgs = so.stdout.lines
@@ -42,7 +43,7 @@ Ohai.plugin(:Packages) do
         packages[name] = { "version" => version, "arch" => arch }
       end
 
-    elsif %w{rhel fedora suse pld}.include? platform_family
+    when "rhel", "fedora", "suse", "pld"
       format = '%{NAME}\t%|EPOCH?{%{EPOCH}}:{0}|\t%{VERSION}\t%{RELEASE}\t%{INSTALLTIME}\t%{ARCH}\n'
       so = shell_out("rpm -qa --qf '#{format}'")
       pkgs = so.stdout.lines
@@ -51,6 +52,31 @@ Ohai.plugin(:Packages) do
         name, epoch, version, release, installdate, arch = pkg.split
         packages[name] = { "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }
       end
+
+    when "arch"
+      require "date"
+
+      # Set LANG=C to force an easy to parse date format
+      so = shell_out("LANG=C pacman -Qi")
+
+      so.stdout.split("\n\n").each do |record|
+        pacman_info = {}
+        record.lines.each do |line|
+          if line =~ /\A(.*?)\s+:\s(.*)\z/m
+            key, value = Regexp.last_match[1..2]
+            key = key.strip.downcase.gsub(/\s+/, "")
+            pacman_info[key] = value.strip
+          end
+        end
+
+        name = pacman_info["name"]
+        installdate = DateTime.strptime(pacman_info["installdate"], "%Ec").strftime("%s")
+        packages[name] = {
+          "version" => pacman_info["version"],
+          "installdate" => installdate,
+          "arch" => pacman_info["architecture"],
+        }
+      end
     end
   end
 

data/lib/ohai/plugins/passwd.rb

@@ -1,7 +1,6 @@
 
-require "etc"
-
 Ohai.plugin(:Passwd) do
+  require "etc"
   provides "etc", "current_user"
 
   def fix_encoding(str)

data/lib/ohai/plugins/rackspace.rb

@@ -14,9 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "resolv"
-
 Ohai.plugin(:Rackspace) do
+  require "resolv"
   provides "rackspace"
 
   depends "kernel", "network/interfaces"

data/lib/ohai/plugins/shard.rb

@@ -16,9 +16,8 @@
 # limitations under the License.
 #
 
-require "digest/md5"
-
 Ohai.plugin(:ShardSeed) do
+  require "digest/md5"
   depends "hostname", "dmi", "machine_id", "machinename"
   provides "shard_seed"
 

data/lib/ohai/plugins/softlayer.rb

@@ -18,9 +18,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "ohai/mixin/softlayer_metadata"
-
 Ohai.plugin(:Softlayer) do
+  require "ohai/mixin/softlayer_metadata"
   include ::Ohai::Mixin::SoftlayerMetadata
 
   provides "softlayer"

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

@@ -18,9 +18,8 @@
 # limitations under the License.
 #
 
-require "ohai/mixin/dmi_decode"
-
 Ohai.plugin(:Virtualization) do
+  require "ohai/mixin/dmi_decode"
   include Ohai::Mixin::DmiDecode
   provides "virtualization"
 

data/lib/ohai/plugins/uptime.rb

@@ -24,9 +24,8 @@
 # limitations under the License.
 #
 
-require "ohai/mixin/seconds_to_human"
-
 Ohai.plugin(:Uptime) do
+  require "ohai/mixin/seconds_to_human"
   provides "uptime", "uptime_seconds"
   provides "idletime", "idletime_seconds" # linux only
   depends "platform_version"

data/lib/ohai/version.rb

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

data/spec/data/plugins/pacman.output

@@ -0,0 +1,51 @@
+Name            : acl
+Version         : 2.2.52-3
+Description     : Access control list utilities, libraries and headers
+Architecture    : x86_64
+URL             : http://savannah.nongnu.org/projects/acl
+Licenses        : LGPL
+Groups          : None
+Provides        : xfsacl
+Depends On      : attr>=2.4.46
+Optional Deps   : None
+Required By     : coreutils  gettext  libarchive  logrotate  sed  shadow  systemd  tar
+Optional For    : None
+Conflicts With  : xfsacl
+Replaces        : xfsacl
+Installed Size  : 290.00 KiB
+Packager        : Bartlomiej Piotrowski <bpiotrowski@archlinux.org>
+Build Date      : Sun Nov  6 14:03:46 2016
+Install Date    : Sun Jul 23 03:25:45 2017
+Install Reason  : Installed as a dependency for another package
+Install Script  : No
+Validated By    : Signature
+
+Name            : abcde
+Version         : 2.8.1-2
+Description     : Frontend command-line utility that grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, all in one go
+Architecture    : any
+URL             : https://abcde.einval.com/
+Licenses        : GPL
+Groups          : None
+Provides        : None
+Depends On      : bash  cd-discid  wget  vorbis-tools  python2-eyed3
+Optional Deps   : cdparanoia: Paranoia ripping support [installed]
+                  cdrkit: icedax ripping support [installed]
+                  flac: FLAC encoding support [installed]
+                  id3: ID3 v1 tag support
+                  lame: MP3 encoding support [installed]
+                  mp3gain: MP3 normalization support [installed]
+                  perl-musicbrainz-discid: musicbrainz support (AUR)
+                  perl-webservice-musicbrainz: musicbrainz support (AUR)
+                  vorbisgain: Ogg Vorbis normalization support [installed]
+Required By     : None
+Optional For    : None
+Conflicts With  : None
+Replaces        : None
+Installed Size  : 334.00 KiB
+Packager        : Alexander Rødseth <rodseth@gmail.com>
+Build Date      : Wed Apr 26 02:04:21 2017
+Install Date    : Fri May  5 15:36:23 2017
+Install Reason  : Explicitly installed
+Install Script  : No
+Validated By    : Signature

data/spec/unit/mixin/azure_metadata_spec.rb

@@ -0,0 +1,67 @@
+#
+# Author:: Tim Smith <tsmith@chef.io>
+# Copyright:: 2017 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 CONDIT"Net::HTTP Response"NS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../../spec_helper.rb"
+require "ohai/mixin/azure_metadata"
+
+describe Ohai::Mixin::AzureMetadata do
+  let(:mixin) do
+    mixin = Object.new.extend(::Ohai::Mixin::AzureMetadata)
+    mixin
+  end
+
+  describe "#http_get" do
+    it "gets the passed URI" do
+      http_mock = double("http")
+      allow(http_mock).to receive(:read_timeout=)
+      allow(Net::HTTP).to receive(:start).with("169.254.169.254").and_return(http_mock)
+
+      expect(http_mock).to receive(:get).with("http://www.chef.io", initheader = { "Metadata" => "true" })
+      mixin.http_get("http://www.chef.io")
+    end
+  end
+
+  describe "#fetch_metadata" do
+    it "returns an empty hash given a non-200 response" do
+      http_mock = double("http", { :code => "500" })
+      allow(mixin).to receive(:http_get).and_return(http_mock)
+
+      expect(Ohai::Log).to receive(:warn)
+      vals = mixin.fetch_metadata
+      expect(vals).to eq(nil)
+    end
+
+    it "returns an empty hash given invalid JSON response" do
+      http_mock = double("http", { :code => "200", :body => '{ "foo" "bar"}' })
+      allow(mixin).to receive(:http_get).and_return(http_mock)
+
+      expect(Ohai::Log).to receive(:warn)
+      vals = mixin.fetch_metadata
+      expect(vals).to eq(nil)
+    end
+
+    it "returns a populated hash given valid JSON response" do
+      http_mock = double("http", { :code => "200", :body => '{ "foo": "bar"}' })
+      allow(mixin).to receive(:http_get).and_return(http_mock)
+
+      expect(Ohai::Log).not_to receive(:warn)
+      vals = mixin.fetch_metadata
+      expect(vals).to eq({ "foo" => "bar" })
+    end
+  end
+end

data/spec/unit/mixin/softlayer_metadata_spec.rb

@@ -36,7 +36,7 @@ describe ::Ohai::Mixin::SoftlayerMetadata do
   end
 
   context "fetch_metadata" do
-    it "riases error if softlayer api query results with error" do
+    it "raises error if softlayer api query results with error" do
       http_mock = double("http", { :ssl_version= => true, :use_ssl= => true, :ca_file= => true })
       allow(http_mock).to receive(:get).and_raise(StandardError.new("API return fake error"))
       allow(::Net::HTTP).to receive(:new).with("api.service.softlayer.com", 443).and_return(http_mock)

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

@@ -23,19 +23,17 @@ describe Ohai::System, "Aix plugin uptime" do
   before(:each) do
     @plugin = get_plugin("aix/uptime")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
-    allow(Time).to receive_message_chain(:now, :to_i).and_return(1412072511)
-    allow(Time).to receive_message_chain(:now, :zone).and_return("IST")
-    allow(DateTime).to receive_message_chain(:parse, :strftime, :to_i).and_return(1411561320)
-    allow(@plugin).to receive(:shell_out).with("who -b").and_return(mock_shell_out(0, "   .        system boot Sep 24 17:52", nil))
-
+    allow(@plugin).to receive(:shell_out).and_call_original
+    allow(Time).to receive_message_chain(:now, :to_i).and_return(1504287957)
+    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" do
-    expect(@plugin[:uptime_seconds]).to eq(511191)
+  it "should set uptime_seconds to uptime with days" do
+    expect(@plugin[:uptime_seconds]).to eq(1405025467)
   end
 
-  it "should set uptime to a human readable date" do
-    expect(@plugin[:uptime]).to eq("5 days 21 hours 59 minutes 51 seconds")
+  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")
   end
 end

data/spec/unit/plugins/azure_spec.rb

@@ -31,6 +31,33 @@ describe Ohai::System, "plugin azure" do
     }
   end
 
+  let(:response_data) do
+    { "compute" => { "location" => "westus",
+                     "name" => "timtest",
+                     "offer" => "UbuntuServer",
+                     "osType" => "Linux",
+                     "platformFaultDomain" => "0",
+                     "platformUpdateDomain" => "0",
+                     "publisher" => "Canonical",
+                     "sku" => "16.04-LTS",
+                     "version" => "16.04.201707270",
+                     "vmId" => "f78151b3-da8b-4bd8-a592-d9ce8a57ea65",
+                     "vmSize" => "Standard_DS2_v2" },
+      "network" => { "interface" => [ { "ipv4" =>
+                                          {  "ipAddress" => [{ "privateIpAddress" => "10.0.1.6", "publicIpAddress" => "40.118.212.225" }],
+                                             "subnet" => [{ "address" => "10.0.1.0", "prefix" => "24" }] },
+                                        "ipv6" =>
+                                          { "ipAddress" => [] },
+                                        "macAddress" => "000D3A37F080" }] } }
+  end
+
+  before do
+    # skips all the metadata logic unless we want to test it
+    allow(plugin).to receive(:can_socket_connect?).
+      with(Ohai::Mixin::AzureMetadata::AZURE_METADATA_ADDR, 80).
+      and_return(false)
+  end
+
   shared_examples_for "!azure" do
     it "does not set the azure attribute" do
       plugin.run
@@ -42,6 +69,7 @@ describe Ohai::System, "plugin azure" do
     it "sets the azure attribute" do
       plugin.run
       expect(plugin[:azure]).to be_truthy
+      expect(plugin[:azure]).to have_key(:metadata)
     end
   end
 
@@ -159,4 +187,57 @@ describe Ohai::System, "plugin azure" do
     it_behaves_like "azure"
   end
 
+  describe "with non-responsive metadata endpoint" do
+    before(:each) do
+      allow(plugin).to receive(:hint?).with("azure").and_return({})
+    end
+
+    it "does not return metadata information" do
+      allow(plugin).to receive(:can_socket_connect?).
+        with(Ohai::Mixin::AzureMetadata::AZURE_METADATA_ADDR, 80).
+        and_return(true)
+      allow(plugin).to receive(:fetch_metadata).and_return(nil)
+
+      plugin.run
+      expect(plugin[:azure]).to have_key(:metadata)
+      expect(plugin[:azure][:metadata]).to be_nil
+    end
+  end
+
+  describe "with responsive metadata endpoint" do
+    before(:each) do
+      allow(plugin).to receive(:hint?).with("azure").and_return({})
+      allow(plugin).to receive(:can_socket_connect?).
+        with(Ohai::Mixin::AzureMetadata::AZURE_METADATA_ADDR, 80).
+        and_return(true)
+      allow(plugin).to receive(:fetch_metadata).and_return(response_data)
+      plugin.run
+    end
+
+    it "returns metadata compute information" do
+      expect(plugin[:azure][:metadata][:compute][:location]).to eq("westus")
+      expect(plugin[:azure][:metadata][:compute][:name]).to eq("timtest")
+      expect(plugin[:azure][:metadata][:compute][:offer]).to eq("UbuntuServer")
+      expect(plugin[:azure][:metadata][:compute][:osType]).to eq("Linux")
+      expect(plugin[:azure][:metadata][:compute][:platformFaultDomain]).to eq("0")
+      expect(plugin[:azure][:metadata][:compute][:platformUpdateDomain]).to eq("0")
+      expect(plugin[:azure][:metadata][:compute][:publisher]).to eq("Canonical")
+      expect(plugin[:azure][:metadata][:compute][:sku]).to eq("16.04-LTS")
+      expect(plugin[:azure][:metadata][:compute][:version]).to eq("16.04.201707270")
+      expect(plugin[:azure][:metadata][:compute][:vmId]).to eq("f78151b3-da8b-4bd8-a592-d9ce8a57ea65")
+      expect(plugin[:azure][:metadata][:compute][:vmSize]).to eq("Standard_DS2_v2")
+    end
+
+    it "returns metadata network information" do
+      expect(plugin[:azure][:metadata][:network][:interfaces]["000D3A37F080"][:mac]).to eq("000D3A37F080")
+      expect(plugin[:azure][:metadata][:network][:interfaces]["000D3A37F080"][:public_ipv6]).to eq([])
+      expect(plugin[:azure][:metadata][:network][:interfaces]["000D3A37F080"][:public_ipv4]).to eq(["40.118.212.225"])
+      expect(plugin[:azure][:metadata][:network][:interfaces]["000D3A37F080"][:local_ipv6]).to eq([])
+      expect(plugin[:azure][:metadata][:network][:interfaces]["000D3A37F080"][:local_ipv4]).to eq(["10.0.1.6"])
+      expect(plugin[:azure][:metadata][:network][:public_ipv6]).to eq([])
+      expect(plugin[:azure][:metadata][:network][:public_ipv4]).to eq(["40.118.212.225"])
+      expect(plugin[:azure][:metadata][:network][:local_ipv6]).to eq([])
+      expect(plugin[:azure][:metadata][:network][:local_ipv4]).to eq(["10.0.1.6"])
+    end
+  end
 end