ohai 14.15.0 → 15.0.35

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "FreeBSD cpu plugin on FreeBSD >=10.2" do
   before(:each) do

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

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

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

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

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

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

data/spec/unit/plugins/gce_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 require "open-uri"
 
 describe Ohai::System, "plugin gce" do

data/spec/unit/plugins/go_spec.rb

@@ -13,7 +13,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 go" do
   let(:plugin) { get_plugin("go") }

data/spec/unit/plugins/groovy_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin groovy" do
   let(:plugin) { get_plugin("groovy") }

data/spec/unit/plugins/haskell_spec.rb

@@ -14,7 +14,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 haskell" do
 

data/spec/unit/plugins/hostname_spec.rb

@@ -16,7 +16,9 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
+require "wmi-lite/wmi"
+require "socket"
 
 describe Ohai::System, "hostname plugin" do
   before(:each) do
@@ -88,3 +90,68 @@ describe Ohai::System, "hostname plugin" do
     end
   end
 end
+
+describe Ohai::System, "hostname plugin for windows", :windows_only do
+  let(:success) { true }
+
+  let(:host) do
+    {
+      "name" => "local",
+      "dnshostname" => "local",
+    }
+  end
+
+  let(:info) do
+    [
+      "local",
+      [],
+      23,
+      "address1",
+      "address2",
+      "address3",
+      "address4"
+    ]
+  end
+
+  let(:local_hostent) do
+    [
+      "local",
+      [],
+      23,
+      "address"
+    ]
+  end
+
+  let(:fqdn_hostent) do
+    [
+      "local.dx.internal.cloudapp.net",
+      [],
+      23,
+      "address"
+    ]
+  end
+
+  before(:each) do
+    @plugin = get_plugin("hostname")
+    allow(WmiLite::Wmi).to receive(:new).and_return(success)
+    allow(success).to receive(:first_of).with("Win32_ComputerSystem").and_return(host)
+    allow(Socket).to receive(:gethostname).and_return("local")
+    allow(Socket).to receive(:gethostbyname).with(anything()).and_return(info)
+  end
+
+  context "when hostname is not set for the machine" do
+    it "should return short machine name" do
+      allow(Socket).to receive(:gethostbyaddr).with(anything()).and_return(local_hostent)
+      @plugin.run
+      expect(@plugin[:fqdn]).to eq("local")
+    end
+  end
+
+  context "when hostname is set for the machine" do
+    it "should return the fqdn of the machine" do
+      allow(Socket).to receive(:gethostbyaddr).with(anything()).and_return(fqdn_hostent)
+      @plugin.run
+      expect(@plugin[:fqdn]).to eq("local.dx.internal.cloudapp.net")
+    end
+  end
+end

data/spec/unit/plugins/init_package_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Init package" do
   let(:plugin) do

data/spec/unit/plugins/java_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin java (Java5 Client VM)" do
   let(:plugin) { get_plugin("java") }

data/spec/unit/plugins/joyent_spec.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin joyent" do
   let(:plugin) { get_plugin("joyent") }
@@ -65,14 +65,14 @@ describe Ohai::System, "plugin joyent" do
           Name: Joyent Instance
           Image: pkgbuild 16.3.1
           Documentation: https://docs.joyent.com/images/smartos/pkgbuild
-      EOS
+        EOS
 
         pkg_install_conf = <<~EOS
           GPG_KEYRING_VERIFY=/opt/local/etc/gnupg/pkgsrc.gpg
           GPG_KEYRING_PKGVULN=/opt/local/share/gnupg/pkgsrc-security.gpg
           PKG_PATH=https://pkgsrc.joyent.com/packages/SmartOS/2016Q3/x86_64/All
           VERIFIED_INSTALLATION=trusted
-      EOS
+        EOS
 
         allow(::File).to receive(:read).with("/etc/product").and_return(etc_product)
         allow(::File).to receive(:read).with("/opt/local/etc/pkg_install.conf").and_return(pkg_install_conf)

data/spec/unit/plugins/kernel_spec.rb

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

data/spec/unit/plugins/linode_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "plugin linode" do
   let(:plugin) { get_plugin("linode") }

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

@@ -15,7 +15,7 @@
 #  limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Linux Block Device Plugin" do
   DISKS = {

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

@@ -17,7 +17,7 @@
 #
 
 require "tempfile"
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 shared_examples "Common cpu info" do |total_cpu, real_cpu|
   describe "cpu" do
@@ -92,12 +92,12 @@ describe Ohai::System, "General Linux cpu plugin" do
   end
 
   after(:each) do
-    begin
-      tempfile.close
-      tempfile.unlink
-    rescue
+
+    tempfile.close
+    tempfile.unlink
+  rescue
       # really do not care
-    end
+
   end
 
   context "with old kernel that doesn't include cores in /proc/cpuinfo" do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Linux filesystem plugin" do
   let(:plugin) { get_plugin("filesystem") }
@@ -69,7 +69,7 @@ describe Ohai::System, "Linux filesystem plugin" do
         /dev/mapper/sys.vg-usr.lv  19223252   5479072  12767696      31% /usr
         /dev/mapper/sys.vg-var.lv  19223252   3436556  14810212      19% /var
         /dev/md0                960492     36388    875312       4% /boot
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @stdout, ""))
 
       @inode_stdout = <<~DFI
@@ -79,7 +79,7 @@ DF
         tmpfs           126922    273  126649    1% /run
         none            126922      1  126921    1% /run/lock
         none            126922      1  126921    1% /run/shm
-DFI
+      DFI
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
     end
 
@@ -148,7 +148,7 @@ DFI
         /dev/md0 on /boot type ext3 (rw,noatime,errors=remount-ro)
         fusectl on /sys/fs/fuse/connections type fusectl (rw)
         binfmt_misc on /proc/sys/fs/binfmt_misc type binfmt_misc (rw,noexec,nosuid,nodev)
-MOUNT
+      MOUNT
       allow(plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @stdout, ""))
     end
 
@@ -189,7 +189,7 @@ MOUNT
         /dev/mapper/sys.vg-usr.lv  19223252   5479072  12767696      31% /usr
         /dev/mapper/sys.vg-var.lv  19223252   3436556  14810212      19% /var
         /dev/md0                960492     36388    875312       4% /boot
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
 
       @inode_stdout = <<~DFI
@@ -199,7 +199,7 @@ DF
         tmpfs           126922    273  126649    1% /run
         none            126922      1  126921    1% /run/lock
         none            126922      1  126921    1% /run/shm
-DFI
+      DFI
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
 
       @stdout = <<~BLKID_TYPE
@@ -215,7 +215,7 @@ DFI
         /dev/mapper/sys.vg-usr.lv: LABEL=\"/usr\" UUID=\"26ec33c5-d00b-4f88-a550-492def013bbc\" TYPE=\"ext4\"
         /dev/mapper/sys.vg-var.lv: LABEL=\"/var\" UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" TYPE=\"ext4\"
         /dev/mapper/sys.vg-home.lv: LABEL=\"/home\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" TYPE=\"xfs\"
-BLKID_TYPE
+      BLKID_TYPE
       allow(plugin).to receive(:shell_out).with("/sbin/blkid", timeout: 60).and_return(mock_shell_out(0, @stdout, ""))
     end
 
@@ -245,7 +245,7 @@ BLKID_TYPE
         /dev/mapper/sys.vg-usr.lv  19223252   5479072  12767696      31% /usr
         /dev/mapper/sys.vg-var.lv  19223252   3436556  14810212      19% /var
         /dev/md0                960492     36388    875312       4% /boot
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
 
       @inode_stdout = <<~DFI
@@ -255,7 +255,7 @@ DF
         tmpfs           126922    273  126649    1% /run
         none            126922      1  126921    1% /run/lock
         none            126922      1  126921    1% /run/shm
-DFI
+      DFI
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
 
       allow(plugin).to receive(:which).with("lsblk").and_return("/sbin/lsblk")
@@ -274,7 +274,7 @@ DFI
         NAME=\"sys.vg-var.lv\" UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" LABEL=\"/var\" FSTYPE=\"ext4\"
         NAME=\"sys.vg-home.lv\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" LABEL=\"/home\" FSTYPE=\"xfs\"
         NAME=\"debian--7-root (dm-0)\" UUID=\"09187faa-3512-4505-81af-7e86d2ccb99a\" LABEL=\"root\" FSTYPE=\"ext4\"
-BLKID_TYPE
+      BLKID_TYPE
       allow(plugin).to receive(:shell_out)
         .with("/sbin/lsblk -n -P -o NAME,UUID,LABEL,FSTYPE", timeout: 60)
         .and_return(mock_shell_out(0, @stdout, ""))
@@ -312,7 +312,7 @@ BLKID_TYPE
         /dev/mapper/sys.vg-usr.lv  19223252   5479072  12767696      31% /usr
         /dev/mapper/sys.vg-var.lv  19223252   3436556  14810212      19% /var
         /dev/md0                960492     36388    875312       4% /boot
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
 
       @inode_stdout = <<~DFI
@@ -322,7 +322,7 @@ DF
         tmpfs           126922    273  126649    1% /run
         none            126922      1  126921    1% /run/lock
         none            126922      1  126921    1% /run/shm
-DFI
+      DFI
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
 
       allow(plugin).to receive(:which).with("lsblk").and_return("/sbin/lsblk")
@@ -341,7 +341,7 @@ DFI
         NAME=\"sys.vg-var.lv\" UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" LABEL=\"/var\" FSTYPE=\"ext4\"
         NAME=\"sys.vg-home.lv\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" LABEL=\"/BADhome\" FSTYPE=\"xfs\"
         NAME=\"debian--7-root (dm-0)\" UUID=\"09187faa-3512-4505-81af-7e86d2ccb99a\" LABEL=\"root\" FSTYPE=\"ext4\"
-BLKID_TYPE
+      BLKID_TYPE
       allow(plugin).to receive(:shell_out)
         .with("/sbin/lsblk -n -P -o NAME,UUID,LABEL,FSTYPE", timeout: 60)
         .and_return(mock_shell_out(0, @stdout, ""))
@@ -358,7 +358,7 @@ BLKID_TYPE
         /dev/mapper/sys.vg-usr.lv: LABEL=\"/usr\" UUID=\"26ec33c5-d00b-4f88-a550-492def013bbc\" TYPE=\"ext4\"
         /dev/mapper/sys.vg-var.lv: LABEL=\"/var\" UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" TYPE=\"ext4\"
         /dev/mapper/sys.vg-home.lv: LABEL=\"/home\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" TYPE=\"xfs\"
-BLKID_TYPE
+      BLKID_TYPE
       allow(plugin).to receive(:shell_out).with("/sbin/blkid", timeout: 60).and_return(mock_shell_out(0, @stdout, ""))
     end
 
@@ -405,7 +405,7 @@ BLKID_TYPE
         /dev/md0 /boot ext3 rw,noatime,errors=remount-ro,data=ordered 0 0
         fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0
         binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0
-MOUNTS
+      MOUNTS
       @counter = 0
       allow(@double_file).to receive(:read_nonblock) do
         @counter += 1
@@ -448,7 +448,7 @@ MOUNTS
         /dev/mapper/sys.vg-home.lv  97605056  53563252  44041804      55% /home
         /dev/mapper/sys.vg-home.lv  97605056  53563252  44041804      55% /home2
         /dev/mapper/sys.vg-root.lv  4805760    378716   4182924       9% /var/chroot
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
 
       @inode_stdout = <<~DFI
@@ -460,7 +460,7 @@ DF
         /dev/mapper/sys.vg-home.lv  60891136  4696030 56195106      8% /home
         /dev/mapper/sys.vg-home.lv  60891136  4696030 56195106      8% /home2
         /dev/mapper/sys.vg-root.lv  1310720 107407 1203313       9% /var/chroot
-DFI
+      DFI
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
 
       allow(plugin).to receive(:which).with("lsblk").and_return("/sbin/lsblk")
@@ -468,7 +468,7 @@ DFI
       @stdout = <<~BLKID_TYPE
         NAME=\"/dev/mapper/sys.vg-root.lv\" UUID=\"7742d14b-80a3-4e97-9a32-478be9ea9aea\" LABEL=\"/\" FSTYPE=\"ext4\"
         NAME=\"/dev/mapper/sys.vg-home.lv\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" LABEL=\"/home\" FSTYPE=\"xfs\"
-BLKID_TYPE
+      BLKID_TYPE
       allow(plugin).to receive(:shell_out)
         .with("/sbin/lsblk -n -P -o NAME,UUID,LABEL,FSTYPE", timeout: 60)
         .and_return(mock_shell_out(0, @stdout, ""))
@@ -493,7 +493,7 @@ BLKID_TYPE
         /dev/mapper/sys.vg-home.lv  97605056  53563252  44041804      55% /home
         /dev/sdb1              97605056  53563252  44041804      55% /mnt
         /dev/sdc1              4805760    378716   4182924       9% /mnt
-DF
+      DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
 
       @inode_stdout = <<~DFI
@@ -505,7 +505,7 @@ DF
         /dev/mapper/sys.vg-home.lv  60891136  4696030 56195106      8% /home
         /dev/sdb1       60891136  4696030 56195106      8% /mnt
         /dev/sdc1       1310720 107407 1203313          9% /mnt
-DFI
+      DFI
       allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, @inode_stdout, ""))
 
       allow(plugin).to receive(:which).with("lsblk").and_return("/sbin/lsblk")
@@ -515,7 +515,7 @@ DFI
         NAME=\"/dev/sdb1\" UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" LABEL=\"/mnt\" FSTYPE=\"ext4\"
         NAME=\"/dev/sdc1\" UUID=\"7f1e51bf-3608-4351-b7cd-379e39cff36a\" LABEL=\"/mnt\" FSTYPE=\"ext4\"
         NAME=\"/dev/mapper/sys.vg-home.lv\" UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" LABEL=\"/home\" FSTYPE=\"xfs\"
-BLKID_TYPE
+      BLKID_TYPE
       allow(plugin).to receive(:shell_out)
         .with("/sbin/lsblk -n -P -o NAME,UUID,LABEL,FSTYPE", timeout: 60)
         .and_return(mock_shell_out(0, @stdout, ""))

data/spec/unit/plugins/linux/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,14 +16,13 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 require "openssl"
 
 describe Ohai::System, "plugin fips" do
   let(:enabled) { "0" }
   let(:plugin) { get_plugin("linux/fips") }
-  let(:fips_path) { "/proc/sys/crypto/fips_enabled" }
-  let(:openssl_test_mode) { true }
+  let(:openssl_test_mode) { false }
 
   subject do
     plugin.run
@@ -32,59 +31,28 @@ describe Ohai::System, "plugin fips" do
 
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:linux)
-    allow(::File).to receive(:read).with(fips_path).and_return(enabled)
   end
 
   around do |ex|
-    begin
-      $FIPS_TEST_MODE = openssl_test_mode
-      ex.run
-    ensure
-      $FIPS_TEST_MODE = false
-    end
-  end
 
-  context "fips file is present and contains 1" do
-    let(:enabled) { "1" }
+    $FIPS_TEST_MODE = openssl_test_mode
+    ex.run
+  ensure
+    $FIPS_TEST_MODE = false
 
-    it "sets fips plugin" do
-      expect(subject).to be(true)
-    end
-  end
-
-  context "fips file does not contain 1" do
-    let(:enabled) { "0" }
-
-    it "does not set fips plugin" do
-      expect(subject).to be(false)
-    end
   end
 
-  context "fips file is not present" do
-    before do
-      allow(::File).to receive(:read).and_raise(Errno::ENOENT, "bibbleboop")
-    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 Ruby 2.5 or newer", if: defined?(OpenSSL.fips_mode) do
-    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
-    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