ohai 14.15.0 → 15.0.35

data/spec/unit/plugins/solaris2/dmi_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 SOLARIS_DMI_OUT = <<~EOS.freeze
   ID    SIZE TYPE

data/spec/unit/plugins/solaris2/filesystem.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper"
+require_relative "spec_helper"
 
 describe Ohai::System, "Solaris2.X filesystem plugin" do
   let(:plugin) { get_plugin("filesystem") }
@@ -60,7 +60,7 @@ describe Ohai::System, "Solaris2.X filesystem plugin" do
         -hosts                         0           0           0     0%    /net
         auto_home                      0           0           0     0%    /home
         -fedfs 0 0 0 0% /nfs4
-DF_PKA
+      DF_PKA
 
       @mount = <<~MOUNT
         / on rpool/ROOT/solaris-0 read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/mountpoint=/zones/servername.chef.internal.dns/root//zone=servername.chef.internal.dns/nozonemod/sharezone=151/dev=4bd0b7e on Fri Feb  2 16:27:36 2018
@@ -82,7 +82,7 @@ DF_PKA
         /var/share/pkg/repositories on rpool/VARSHARE/pkg/repositories read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/zone=servername.chef.internal.dns/sharezone=151/dev=4bd0b85 on Fri Feb  2 16:28:12 2018
         /export/home/<usernameredacted> on rpool/export/home/<usernameredacted> read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/zone=servername.chef.internal.dns/sharezone=151/dev=4bd0b8a on Fri Feb  2 16:39:15 2018
         /export/home/<usernameredacted> on rpool/export/home/<usernameredacted> read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/zone=servername.chef.internal.dns/sharezone=151/dev=4bd0b8b on Fri Feb 2 16:39:16 2018
-MOUNT
+      MOUNT
 
       @zfs_get = <<~ZFS_GET
         data0   type    filesystem      -
@@ -323,7 +323,7 @@ MOUNT
         data0/Movies    relatime        off     default
         data0/Movies    redundant_metadata      all     default
         data0/Movies overlay off default:
-ZFS_GET
+      ZFS_GET
     end
 
     after(:each) do

data/spec/unit/plugins/solaris2/hostname_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Solaris2.X hostname plugin" do
   before(:each) do

data/spec/unit/plugins/solaris2/kernel_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Solaris2.X kernel plugin" do
   # NOTE: Solaris will report the same module loaded multiple times

data/spec/unit/plugins/solaris2/memory_spec.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Solaris2.X memory plugin" do
   before(:each) do

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

@@ -16,7 +16,7 @@
 #  limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Solaris2.X network plugin" do
 
@@ -41,7 +41,7 @@ describe Ohai::System, "Solaris2.X network plugin" do
       rtls0  172.31.4.82          255.255.255.255       52:54:00:2d:93:0c
       rtls0  172.31.4.81          255.255.255.255       02:08:20:37:80:87
       rtls0  224.0.0.0            240.0.0.0       SM    01:00:5e:00:00:00
-ARP_RN
+    ARP_RN
 
     @solaris_ifconfig = <<~ENDIFCONFIG
       lo0:3: flags=2001000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4,VIRTUAL> mtu 8232 index 1
@@ -80,7 +80,7 @@ ARP_RN
       vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 1460 index 5
        srcof qfe1
        inet6 fe80::203:baff:fe17:4444/128
-ENDIFCONFIG
+    ENDIFCONFIG
 
     @solaris_netstat_rn = <<~NETSTAT_RN
       Routing Table: IPv4
@@ -95,7 +95,7 @@ ENDIFCONFIG
       --------------------------- --------------------------- ----- --- ------- -----
       fe80::/10                   fe80::250:56ff:fe13:3757    U       1       0 e1000g0
       ::1                         ::1                         UH      1       0 lo0
-NETSTAT_RN
+    NETSTAT_RN
 
     @solaris_route_get = <<~ROUTE_GET
          route to: default
@@ -106,7 +106,7 @@ NETSTAT_RN
             flags: <UP,GATEWAY,DONE,STATIC>
        recvpipe  sendpipe  ssthresh    rtt,ms rttvar,ms  hopcount      mtu     expire
              0         0         0         0         0         0      1500         0
-ROUTE_GET
+    ROUTE_GET
 
     @solaris11_route_get = <<~ROUTE_GET
          route to: default
@@ -117,7 +117,7 @@ ROUTE_GET
             flags: <UP,GATEWAY,DONE,STATIC>
        recvpipe  sendpipe  ssthresh    rtt,ms rttvar,ms  hopcount      mtu     expire
              0         0         0         0         0         0      1500         0
-ROUTE_GET
+    ROUTE_GET
 
     @ifconfig_lines = @solaris_ifconfig.split("\n")
 

data/spec/unit/plugins/solaris2/platform_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Solaris plugin platform" do
   before(:each) do
@@ -39,7 +39,7 @@ describe Ohai::System, "Solaris plugin platform" do
         OEM# = 0
         Origin# = 1
         NumCPU = 16
-UNAME_X
+      UNAME_X
 
       allow(File).to receive(:exist?).with("/sbin/uname").and_return(true)
       allow(@plugin).to receive(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))
@@ -79,7 +79,7 @@ UNAME_X
         OEM# = 0
         Origin# = 1
         NumCPU = 1
-UNAME_X
+      UNAME_X
 
       allow(File).to receive(:exist?).with("/sbin/uname").and_return(true)
       allow(@plugin).to receive(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))

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

@@ -16,25 +16,26 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Solaris virtualization platform" do
+  let(:plugin) { get_plugin("solaris2/virtualization") }
+
   before(:each) do
     @psrinfo_pv = <<~PSRINFO_PV
       The physical processor has 1 virtual processor (0)
         x86 (GenuineIntel family 6 model 2 step 3 clock 2667 MHz)
               Intel Pentium(r) Pro
-PSRINFO_PV
+    PSRINFO_PV
 
-    @plugin = get_plugin("solaris2/virtualization")
-    allow(@plugin).to receive(:collect_os).and_return(:solaris2)
+    allow(plugin).to receive(:collect_os).and_return(:solaris2)
 
     # default to all requested Files not existing
     allow(File).to receive(:exist?).with("/usr/sbin/psrinfo").and_return(false)
     allow(File).to receive(:exist?).with("/usr/sbin/smbios").and_return(false)
     allow(File).to receive(:exist?).with("/usr/sbin/zoneadm").and_return(false)
-    allow(@plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, "", ""))
-    allow(@plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "", ""))
+    allow(plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, "", ""))
+    allow(plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "", ""))
   end
 
   describe "when we are checking for kvm" do
@@ -43,83 +44,54 @@ PSRINFO_PV
     end
 
     it "should run psrinfo -pv" do
-      expect(@plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv")
-      @plugin.run
+      expect(plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv")
+      plugin.run
     end
 
     it "Should set kvm guest if psrinfo -pv contains QEMU Virtual CPU" do
-      allow(@plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "QEMU Virtual CPU", ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("kvm")
-      expect(@plugin[:virtualization][:role]).to eq("guest")
-      expect(@plugin[:virtualization][:systems][:kvm]).to eq("guest")
+      allow(plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "QEMU Virtual CPU", ""))
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("kvm")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:kvm]).to eq("guest")
     end
 
     it "should not set virtualization if kvm isn't there" do
-      expect(@plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, @psrinfo_pv, ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:systems]).to eq({})
+      expect(plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, @psrinfo_pv, ""))
+      plugin.run
+      expect(plugin[:virtualization][:systems]).to eq({})
     end
   end
 
-  describe "when we are parsing smbios" do
-    before(:each) do
-      expect(File).to receive(:exist?).with("/usr/sbin/smbios").and_return(true)
-    end
-
-    it "should run smbios" do
-      expect(@plugin).to receive(:shell_out).with("/usr/sbin/smbios")
-      @plugin.run
-    end
-
-    it "should set virtualpc guest if smbios detects Microsoft Virtual Machine" do
-      ms_vpc_smbios = <<~MSVPC
-        ID    SIZE TYPE
-        1     72   SMB_TYPE_SYSTEM (system information)
-
-          Manufacturer: Microsoft Corporation
-          Product: Virtual Machine
-          Version: VS2005R2
-          Serial Number: 1688-7189-5337-7903-2297-1012-52
-
-          UUID: D29974A4-BE51-044C-BDC6-EFBC4B87A8E9
-          Wake-Up Event: 0x6 (power switch)
-MSVPC
-      allow(@plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, ms_vpc_smbios, ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("virtualpc")
-      expect(@plugin[:virtualization][:role]).to eq("guest")
-    end
-
-    it "should set vmware guest if smbios detects VMware Virtual Platform" do
-      vmware_smbios = <<~VMWARE
-        ID    SIZE TYPE
-        1     72   SMB_TYPE_SYSTEM (system information)
-
-          Manufacturer: VMware, Inc.
-          Product: VMware Virtual Platform
-          Version: None
-          Serial Number: VMware-50 3f f7 14 42 d1 f1 da-3b 46 27 d0 29 b4 74 1d
-
-          UUID: a86cc405-e1b9-447b-ad05-6f8db39d876a
-          Wake-Up Event: 0x6 (power switch)
-VMWARE
-      allow(@plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, vmware_smbios, ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("vmware")
-      expect(@plugin[:virtualization][:role]).to eq("guest")
-      expect(@plugin[:virtualization][:systems][:vmware]).to eq("guest")
+  describe "when we are parsing DMI data" do
+
+    it "sets virtualization attributes if the appropriate DMI data is present" do
+      plugin[:dmi] = { system: {
+                                  manufacturer: "Amazon EC2",
+                                  product: "c5n.large",
+                                  version: nil,
+                               },
+                     }
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("amazonec2")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:amazonec2]).to eq("guest")
     end
 
-    it "should run smbios and not set virtualization if nothing is detected" do
-      expect(@plugin).to receive(:shell_out).with("/usr/sbin/smbios")
-      @plugin.run
-      expect(@plugin[:virtualization][:systems]).to eq({})
+    it "sets empty virtualization attributes if nothing is detected" do
+      plugin[:dmi] = { system: {
+                                  manufacturer: "Supermicro",
+                                  product: "X10SLH-N6-ST031",
+                                  version: "0123456789",
+                               },
+                     }
+      plugin.run
+      expect(plugin[:virtualization]).to eq({ "systems" => {} })
     end
   end
 
   it "should not set virtualization if no tests match" do
-    @plugin.run
-    expect(@plugin[:virtualization][:systems]).to eq({})
+    plugin.run
+    expect(plugin[:virtualization][:systems]).to eq({})
   end
 end

data/spec/unit/plugins/ssh_host_keys_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "ssh_host_key plugin" do
 
@@ -81,7 +81,7 @@ describe Ohai::System, "ssh_host_key plugin" do
         HostKey /etc/ssh/ssh_host_dsa_key
         HostKey /etc/ssh/ssh_host_ecdsa_key
         HostKey /etc/ssh/ssh_host_ed25519_key
-EOS
+      EOS
     end
     it_behaves_like "loads keys"
   end
@@ -94,7 +94,7 @@ EOS
         #HostKey /etc/ssh/ssh_host_dsa_key
         #HostKey /etc/ssh/ssh_host_ecdsa_key
         #HostKey /etc/ssh/ssh_host_ed25519_key
-EOS
+      EOS
     end
     it_behaves_like "loads keys"
   end

data/spec/unit/plugins/sysconf_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "sysconf plugin", :unix_only do
   let(:plugin) { get_plugin("sysconf") }
@@ -343,7 +343,7 @@ describe Ohai::System, "sysconf plugin", :unix_only do
       RAW_SOCKETS                        200809
       _POSIX_IPV6                        200809
       _POSIX_RAW_SOCKETS                 200809
-GETCONF_OUT
+    GETCONF_OUT
     allow(plugin).to receive(:which).with("getconf").and_return("/usr/bin/getconf")
     allow(plugin).to receive(:shell_out).with("/usr/bin/getconf -a").and_return(mock_shell_out(0, getconf_out, ""))
     allow(plugin).to receive(:collect_os).and_return(:linux)

data/spec/unit/plugins/timezone_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "timezone plugin" do
   before(:each) do

data/spec/unit/plugins/virtualbox_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 vbox_output = <<~EOF
   Oracle VM VirtualBox Guest Additions Command Line Management Interface Version 5.0.2

data/spec/unit/plugins/vmware_spec.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin vmware" do
   let(:plugin) { get_plugin("vmware") }

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 shared_examples "a cpu" do |cpu_no|
   describe "cpu #{cpu_no}" do
@@ -65,7 +65,6 @@ describe Ohai::System, "Windows cpu plugin" do
     @plugin = get_plugin("cpu")
     allow(@plugin).to receive(:collect_os).and_return(:windows)
 
-    @double_wmi = double(WmiLite::Wmi)
     @double_wmi_instance = instance_double(WmiLite::Wmi)
 
     @processors = [{ "description" => "Intel64 Family 6 Model 70 Stepping 1",

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

@@ -16,7 +16,7 @@
 #  limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 require "wmi-lite/wmi"
 
 describe Ohai::System, "Windows Filesystem Plugin", :windows_only do
@@ -41,7 +41,7 @@ describe Ohai::System, "Windows Filesystem Plugin", :windows_only do
         "size" => "10000000",
         "filesystem" => "FAT32",
         "freespace" => "100000",
-        "name" => "D:"
+        "name" => "D:",
         # Lets not pass "volumename" for this drive
       }
     ]

data/spec/unit/plugins/windows/fips_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2016-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,15 +16,13 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 require "openssl"
 
-describe Ohai::System, "plugin fips", :windows_only do
+describe Ohai::System, "plugin fips" do
   let(:enabled) { 0 }
   let(:plugin) { get_plugin("windows/fips") }
-  let(:fips_key) { 'System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy' }
-  let(:win_reg_entry) { { "Enabled" => enabled } }
-  let(:openssl_test_mode) { true }
+  let(:openssl_test_mode) { false }
 
   subject do
     plugin.run
@@ -33,86 +31,28 @@ describe Ohai::System, "plugin fips", :windows_only do
 
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:windows)
-    allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with(fips_key, arch).and_yield(win_reg_entry)
   end
 
   around do |ex|
-    begin
-      $FIPS_TEST_MODE = openssl_test_mode
-      ex.run
-    ensure
-      $FIPS_TEST_MODE = false
-    end
-  end
-
-  shared_examples "fips_plugin" do
-    context "fips enabled key is set to 1" do
-      let(:enabled) { 1 }
-
-      it "sets fips plugin" do
-        expect(subject).to be(true)
-      end
-    end
-
-    context "fips enabled key is set to 0" do
-      let(:enabled) { 0 }
 
-      it "does not set fips plugin" do
-        expect(subject).to be(false)
-      end
-    end
-
-    context "fips key does not exist" do
-      before do
-        allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).and_raise(Win32::Registry::Error, 50)
-      end
+    $FIPS_TEST_MODE = openssl_test_mode
+    ex.run
+  ensure
+    $FIPS_TEST_MODE = false
 
-      it "does not set fips plugin" do
-        expect(subject).to be(false)
-      end
-    end
   end
 
-  context "on 32 bit ruby" do
-    let(:arch) { Win32::Registry::KEY_READ | 0x100 }
-
-    before { stub_const("::RbConfig::CONFIG", { "target_cpu" => "i386" } ) }
-
-    it_behaves_like "fips_plugin"
-  end
-
-  context "on 64 bit ruby" do
-    let(:arch) { Win32::Registry::KEY_READ | 0x200 }
-
-    before { stub_const("::RbConfig::CONFIG", { "target_cpu" => "x86_64" } ) }
-
-    it_behaves_like "fips_plugin"
-  end
-
-  context "on unknown ruby" do
-    let(:arch) { Win32::Registry::KEY_READ }
-
-    before { stub_const("::RbConfig::CONFIG", { "target_cpu" => nil } ) }
-
-    it_behaves_like "fips_plugin"
-  end
-
-  context "with Ruby 2.5 or newer", if: defined?(OpenSSL.fips_mode) do
-    let(:arch) { Win32::Registry::KEY_READ }
-    let(:openssl_test_mode) { false }
-
-    context "with OpenSSL.fips_mode == false" do
-      before { allow(OpenSSL).to receive(:fips_mode).and_return(false) }
-      it "does not set fips plugin" do
-        expect(subject).to be(false)
-      end
+  context "with OpenSSL.fips_mode == false" do
+    before { allow(OpenSSL).to receive(:fips_mode).and_return(false) }
+    it "does not set fips plugin" do
+      expect(subject).to be(false)
     end
+  end
 
-    context "with OpenSSL.fips_mode == true" do
-      before { allow(OpenSSL).to receive(:fips_mode).and_return(true) }
-      it "sets fips plugin" do
-        expect(subject).to be(true)
-      end
+  context "with OpenSSL.fips_mode == true" do
+    before { allow(OpenSSL).to receive(:fips_mode).and_return(true) }
+    it "sets fips plugin" do
+      expect(subject).to be(true)
     end
   end
 end