ohai 13.12.6 → 14.0.28

data/spec/unit/loader_spec.rb

@@ -23,7 +23,7 @@ describe Ohai::Loader do
   extend IntegrationSupport
 
   let(:loader) { Ohai::Loader.new(ohai) }
-  let(:ohai) { double("Ohai::System", :data => Mash.new, :provides_map => provides_map) }
+  let(:ohai) { double("Ohai::System", :data => Mash.new, :provides_map => provides_map, logger: Ohai::Log) }
   let(:provides_map) { Ohai::ProvidesMap.new }
 
   describe "#initialize" do
@@ -33,68 +33,6 @@ describe Ohai::Loader do
     end
   end
 
-  when_plugins_directory "contains both V6 & V7 plugins" do
-    with_plugin("zoo.rb", <<EOF)
-Ohai.plugin(:Zoo) do
-  provides 'seals'
-end
-EOF
-
-    with_plugin("zoo_too.rb", <<EOF)
-Ohai.plugin(:Zoo) do
-  provides 'elephants'
-end
-EOF
-
-    with_plugin("lake.rb", <<EOF)
-provides 'fish'
-EOF
-
-    describe "load_plugin() method" do
-      describe "when loading a v7 plugin" do
-        let(:plugin) { loader.load_plugin(path_to("zoo.rb")) }
-
-        it "saves the plugin according to its attribute" do
-          plugin
-          expect(provides_map.map.keys).to include("seals")
-        end
-
-        it "saves a single plugin source" do
-          expect(plugin.source).to eql([path_to("zoo.rb")])
-        end
-
-        it "saves all plugin sources" do
-          plugin
-          loader.load_plugin(path_to("zoo_too.rb"))
-          expect(plugin.source).to eql([path_to("zoo.rb"), path_to("zoo_too.rb")])
-        end
-      end
-
-      describe "when loading a v6 plugin" do
-        let(:plugin) { loader.load_plugin(path_to("lake.rb"), path_to(".")) }
-
-        before(:each) do
-          expect(Ohai::Log).to receive(:warn).with(/\[DEPRECATION\]/)
-        end
-
-        it "does not add this plugin's provided attributes to the provides map" do
-          plugin
-          expect(provides_map.map).to be_empty
-        end
-
-        it "saves the plugin's source" do
-          expect(plugin.source).to eql(path_to("lake.rb"))
-        end
-      end
-
-      it "logs a warning if a plugin doesn't exist" do
-        expect(Ohai::Log).to receive(:warn).with(/Unable to open or read plugin/)
-        loader.load_plugin(path_to("rainier.rb"), path_to("."))
-        expect(provides_map.map).to be_empty
-      end
-    end
-  end
-
   when_plugins_directory "is an additional plugin path" do
     with_plugin("cookbook_a/alpha.rb", <<EOF)
 Ohai.plugin(:Alpha) do
@@ -170,7 +108,7 @@ EOF
     describe "load_plugin() method" do
       describe "when the plugin uses Ohai.plugin instead of Ohai.plugins" do
         it "logs an unsupported operation warning" do
-          expect(Ohai::Log).to receive(:warn).with(/Plugin Method Error: <#{path_to("extra_s.rb")}>:/)
+          expect(loader.logger).to receive(:warn).with(/Plugin Method Error: <#{path_to("extra_s.rb")}>:/)
           loader.load_plugin(path_to("extra_s.rb"))
         end
 
@@ -181,7 +119,7 @@ EOF
 
       describe "when the plugin tries to call an unexisting method" do
         it "shoud log an unsupported operation warning" do
-          expect(Ohai::Log).to receive(:warn).with(/Plugin Method Error: <#{path_to("no_method.rb")}>:/)
+          expect(loader.logger).to receive(:warn).with(/Plugin Method Error: <#{path_to("no_method.rb")}>:/)
           loader.load_plugin(path_to("no_method.rb"))
         end
 
@@ -192,7 +130,7 @@ EOF
 
       describe "when the plugin defines collect_data on the same platform more than once" do
         it "shoud log an illegal plugin definition warning" do
-          expect(Ohai::Log).to receive(:warn).with(/Plugin Definition Error: <#{path_to("illegal_def.rb")}>:/)
+          expect(loader.logger).to receive(:warn).with(/Plugin Definition Error: <#{path_to("illegal_def.rb")}>:/)
           loader.load_plugin(path_to("illegal_def.rb"))
         end
 
@@ -203,7 +141,7 @@ EOF
 
       describe "when an unexpected error is encountered" do
         it "logs a warning" do
-          expect(Ohai::Log).to receive(:warn).with(/Plugin Error: <#{path_to("unexpected_error.rb")}>:/)
+          expect(loader.logger).to receive(:warn).with(/Plugin Error: <#{path_to("unexpected_error.rb")}>:/)
           loader.load_plugin(path_to("unexpected_error.rb"))
         end
 
@@ -214,7 +152,7 @@ EOF
 
       describe "when the plugin name symbol has bad syntax" do
         it "logs a syntax error warning" do
-          expect(Ohai::Log).to receive(:warn).with(/Plugin Syntax Error: <#{path_to("bad_symbol.rb")}>:/)
+          expect(loader.logger).to receive(:warn).with(/Plugin Syntax Error: <#{path_to("bad_symbol.rb")}>:/)
           loader.load_plugin(path_to("bad_symbol.rb"))
         end
 
@@ -225,7 +163,7 @@ EOF
 
       describe "when the plugin forgets an 'end'" do
         it "logs a syntax error warning" do
-          expect(Ohai::Log).to receive(:warn).with(/Plugin Syntax Error: <#{path_to("no_end.rb")}>:/)
+          expect(loader.logger).to receive(:warn).with(/Plugin Syntax Error: <#{path_to("no_end.rb")}>:/)
           loader.load_plugin(path_to("no_end.rb"))
         end
 
@@ -236,7 +174,7 @@ EOF
 
       describe "when the plugin has an invalid name" do
         it "logs an invalid plugin name warning" do
-          expect(Ohai::Log).to receive(:warn).with(/Plugin Name Error: <#{path_to("bad_name.rb")}>:/)
+          expect(loader.logger).to receive(:warn).with(/Plugin Name Error: <#{path_to("bad_name.rb")}>:/)
           loader.load_plugin(path_to("bad_name.rb"))
         end
 

data/spec/unit/mixin/azure_metadata_spec.rb

@@ -25,13 +25,18 @@ describe Ohai::Mixin::AzureMetadata do
     mixin
   end
 
+  before do
+    logger = instance_double("Mixlib::Log::Child", trace: nil, debug: nil, warn: nil)
+    allow(mixin).to receive(:logger).and_return(logger)
+  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" })
+      expect(http_mock).to receive(:get).with("http://www.chef.io", { "Metadata" => "true" })
       mixin.http_get("http://www.chef.io")
     end
   end
@@ -41,7 +46,7 @@ describe Ohai::Mixin::AzureMetadata do
       http_mock = double("http", { :code => "500" })
       allow(mixin).to receive(:http_get).and_return(http_mock)
 
-      expect(Ohai::Log).to receive(:warn)
+      expect(mixin.logger).to receive(:warn)
       vals = mixin.fetch_metadata
       expect(vals).to eq(nil)
     end
@@ -50,7 +55,7 @@ describe Ohai::Mixin::AzureMetadata 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)
+      expect(mixin.logger).to receive(:warn)
       vals = mixin.fetch_metadata
       expect(vals).to eq(nil)
     end
@@ -59,7 +64,7 @@ describe Ohai::Mixin::AzureMetadata 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)
+      expect(mixin.logger).not_to receive(:warn)
       vals = mixin.fetch_metadata
       expect(vals).to eq({ "foo" => "bar" })
     end

data/spec/unit/mixin/command_spec.rb

@@ -28,7 +28,10 @@ describe Ohai::Mixin::Command, "shell_out" do
 
   let(:options) { windows? ? { timeout: 30 } : { timeout: 30, env: { "PATH" => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" } } }
 
+  let(:logger) { instance_double("Mixlib::Log::Child", trace: nil, debug: nil, warn: nil) }
+
   before(:each) do
+    allow(Ohai::Mixin::Command).to receive(:logger).and_return(logger)
     allow(Ohai::Mixin::Command).to receive(:name).and_return(plugin_name)
     @original_env = ENV.to_hash
     ENV.clear
@@ -53,7 +56,7 @@ describe Ohai::Mixin::Command, "shell_out" do
         to receive(:exitstatus).
         and_return(256)
 
-      expect(Ohai::Log).to receive(:debug).
+      expect(logger).to receive(:trace).
         with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and returned 256")
 
       Ohai::Mixin::Command.shell_out(cmd)
@@ -71,8 +74,8 @@ describe Ohai::Mixin::Command, "shell_out" do
         to receive(:run_command).
         and_raise(Errno::ENOENT, "sparkle-dream")
 
-      expect(Ohai::Log).
-        to receive(:debug).
+      expect(logger).
+        to receive(:trace).
         with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and failed " \
              "#<Errno::ENOENT: No such file or directory - sparkle-dream>")
 
@@ -92,8 +95,8 @@ describe Ohai::Mixin::Command, "shell_out" do
         to receive(:run_command).
         and_raise(Mixlib::ShellOut::CommandTimeout)
 
-      expect(Ohai::Log).
-        to receive(:debug).
+      expect(logger).
+        to receive(:trace).
         with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and timed " \
              "out after 30 seconds")
 
@@ -118,7 +121,7 @@ describe Ohai::Mixin::Command, "shell_out" do
         to receive(:exitstatus).
         and_return(256)
 
-      expect(Ohai::Log).to receive(:debug).
+      expect(logger).to receive(:trace).
         with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and returned 256")
 
       Ohai::Mixin::Command.shell_out(cmd, options)
@@ -135,8 +138,8 @@ describe Ohai::Mixin::Command, "shell_out" do
           to receive(:run_command).
           and_raise(Mixlib::ShellOut::CommandTimeout)
 
-        expect(Ohai::Log).
-          to receive(:debug).
+        expect(logger).
+          to receive(:trace).
           with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and timed " \
                "out after 10 seconds")
 

data/spec/unit/mixin/ec2_metadata_spec.rb

@@ -28,6 +28,11 @@ describe Ohai::Mixin::Ec2Metadata do
     metadata_object
   end
 
+  before do
+    logger = instance_double("Mixlib::Log::Child", trace: nil, debug: nil, warn: nil)
+    allow(mixin).to receive(:logger).and_return(logger)
+  end
+
   context "#best_api_version" do
     context "with a sorted list of metadata versions" do
       let(:response) { double("Net::HTTP Response", :body => "1.0\n2011-05-01\n2012-01-12\nUnsupported", :code => "200") }

data/spec/unit/mixin/softlayer_metadata_spec.rb

@@ -27,6 +27,11 @@ describe ::Ohai::Mixin::SoftlayerMetadata do
     mixin
   end
 
+  before do
+    logger = instance_double("Mixlib::Log::Child", trace: nil, debug: nil, warn: nil)
+    allow(mixin).to receive(:logger).and_return(logger)
+  end
+
   def make_request(item)
     "/rest/v3.1/SoftLayer_Resource_Metadata/#{item}"
   end
@@ -41,7 +46,7 @@ describe ::Ohai::Mixin::SoftlayerMetadata do
       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)
 
-      expect(::Ohai::Log).to receive(:error).at_least(:once)
+      expect(mixin.logger).to receive(:error).at_least(:once)
       expect { mixin.fetch_metadata }.to raise_error(StandardError)
     end
 

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

@@ -69,7 +69,7 @@ DF_PK
          /dev/hd11admin   /admin           jfs2   Jul 17 13:22 rw,log=/dev/hd8
          /proc            /proc            procfs Jul 17 13:22 rw
          /dev/hd10opt     /opt             jfs2   Jul 17 13:22 rw,log=/dev/hd8
-192.168.1.11 /stage/middleware1 /stage/middleware2 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
+192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
 MOUNT
 
     @mount_wpar = <<-MOUNT
@@ -82,7 +82,7 @@ MOUNT
          Global           /tmp             jfs2   Nov 23 21:03 rw,log=NULL
          Global           /usr             jfs2   Nov 23 21:03 rw,log=NULL
          Global           /var             jfs2   Nov 23 21:03 rw,log=NULL
-192.168.1.11 /stage/middleware3 /stage/middleware4 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
+192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
 MOUNT
 
     @plugin = get_plugin("aix/filesystem")
@@ -134,19 +134,19 @@ MOUNT
         expect(@plugin[:filesystem]["/dev/hd4"]["mount_options"]).to eq(["rw", "log=/dev/hd8"])
       end
 
-      # For entries like 192.168.1.11 /stage/middleware1 /stage/middleware2 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
+      # For entries like 192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
       context "having node values" do
 
         it "returns the filesystem mount location" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware1"]["mount"]).to eq("/stage/middleware2")
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["mount"]).to eq("/stage/middleware")
         end
 
         it "returns the filesystem type" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware1"]["fs_type"]).to eq("nfs3")
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["fs_type"]).to eq("nfs3")
         end
 
         it "returns the filesystem mount options" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware1"]["mount_options"]).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["mount_options"]).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
         end
       end
     end
@@ -196,19 +196,19 @@ MOUNT
         expect(@plugin[:filesystem]["Global:/"]["mount_options"]).to eq(["rw", "log=NULL"])
       end
 
-      # For entries like 192.168.1.11 /stage/middleware3 /stage/middleware4 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
+      # For entries like 192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
       context "having node values" do
 
         it "returns the filesystem mount location" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware3"]["mount"]).to eq("/stage/middleware4")
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["mount"]).to eq("/stage/middleware")
         end
 
         it "returns the filesystem type" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware3"]["fs_type"]).to eq("nfs3")
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["fs_type"]).to eq("nfs3")
         end
 
         it "returns the filesystem mount options" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware3"]["mount_options"]).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["mount_options"]).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
         end
       end
     end

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

@@ -113,7 +113,7 @@ ARP_AN
         @plugin.run
       end
 
-      it 'for \'macaddress\'' do
+      it "for 'macaddress'" do
         expect(@plugin[:macaddress]).to eq("BE:42:80:00:B0:05")
       end
     end

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

@@ -272,12 +272,12 @@ LSWPAR_L
       end
 
       context "when collecting WPAR info" do
-        it 'finds the WPAR\'s hostname correctly' do
+        it "finds the WPAR's hostname correctly" do
           expect(wpar1[:hostname]).to eq("applejack-pony-541ba3.ponyville.com")
           expect(wpar2[:hostname]).to eq("fluttershy-pony-5c969f.ponyville.com")
         end
 
-        it 'finds the WPAR\'s IP correctly' do
+        it "finds the WPAR's IP correctly" do
           expect(wpar1[:address]).to eq("192.168.0.231")
           expect(wpar2[:address]).to eq("192.168.0.18")
         end
@@ -289,7 +289,7 @@ LSWPAR_L
       end
     end
 
-    context 'when WPARs don\'t exist on the LPAR' do
+    context "when WPARs don't exist on the LPAR" do
       before do
         allow(plugin).to receive(:shell_out).with("lswpar -L").and_return(mock_shell_out(0, "", nil))
         plugin.run

data/spec/unit/plugins/cloud_spec.rb

@@ -89,18 +89,6 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:softlayer] = nil
       @plugin.run
       expect(@plugin[:cloud]).to be_nil
-      expect(@plugin[:cloud_v2]).to be_nil
-    end
-  end
-
-  describe "with a cloud mash" do
-    before do
-      @plugin[:ec2] = Mash.new
-    end
-
-    it "populates cloud public ip" do
-      @plugin.run
-      expect(@plugin[:cloud]).to eq(@plugin[:cloud_v2])
     end
   end
 

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

@@ -1,6 +1,6 @@
 #
 # Author:: Nathan L Smith (<nlloyds@gmail.com>)
-# Copyright:: Copyright (c) 2013-2018 Chef Software, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -78,7 +78,7 @@ machdep.cpu.max_basic: 13
 CTL
 
     allow(@plugin).to receive(:collect_os).and_return(:darwin)
-    allow(@plugin).to receive(:shell_out).with("sysctl hw machdep").and_return(mock_shell_out(0, @stdout, ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -a").and_return(mock_shell_out(0, @stdout, ""))
     @plugin.run
   end
 

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

@@ -19,7 +19,7 @@
 require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "darwin filesystem plugin" do
-  let (:plugin) { get_plugin("darwin/filesystem") }
+  let(:plugin) { get_plugin("darwin/filesystem") }
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:darwin)
 
@@ -27,11 +27,6 @@ describe Ohai::System, "darwin filesystem plugin" do
     allow(plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, "", ""))
   end
 
-  it "sets both filesystem and filesystem2 attributes" do
-    plugin.run
-    expect(plugin[:filesystem]).to eq(plugin[:filesystem2])
-  end
-
   describe "when gathering filesystem usage data from df" do
     before(:each) do
       @stdout = <<-DF

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

@@ -20,7 +20,7 @@ require_relative "../../../spec_helper.rb"
 require_relative "hardware_system_profiler_output.rb"
 
 describe Ohai::System, "Darwin hardware plugin", :unix_only do
-  let (:plugin) { get_plugin("darwin/hardware") }
+  let(:plugin) { get_plugin("darwin/hardware") }
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:darwin)
     # Make sure it always runs correct commands and mock the data as it calls them

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

@@ -40,6 +40,14 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization]).to eq({ "systems" => {} })
     end
 
+    it "should set docker host if docker exists" do
+      allow(plugin).to receive(:docker_exists?).and_return(true)
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("docker")
+      expect(plugin[:virtualization][:role]).to eq("host")
+      expect(plugin[:virtualization][:systems][:docker]).to eq("host")
+    end
+
     it "should set vmware host if /Applications/VMware\ Fusion.app exists" do
       allow(plugin).to receive(:fusion_exists?).and_return(true)
       plugin.run