ohai 15.1.5 → 15.2.5

data/lib/ohai/util/win32.rb

@@ -28,18 +28,18 @@ module Ohai
         ffi_lib "advapi32"
 
         attach_function :lookup_account_sid,
-        :LookupAccountSidA, [ :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :long
+          :LookupAccountSidA, %i{pointer pointer pointer pointer pointer pointer pointer}, :long
 
         attach_function :convert_string_sid_to_sid,
-        :ConvertStringSidToSidA, [ :pointer, :pointer ], :long
+          :ConvertStringSidToSidA, %i{pointer pointer}, :long
 
         ffi_lib "kernel32"
 
         attach_function :local_free,
-        :LocalFree, [ :pointer ], :long
+          :LocalFree, [ :pointer ], :long
 
         attach_function :get_last_error,
-        :GetLastError, [], :long
+          :GetLastError, [], :long
       end
     end
   end

data/lib/ohai/version.rb

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

data/spec/data/plugins/rpmquery.output

@@ -3,3 +3,5 @@ tzdata	0	2016d	1.el7	1463486618	noarch
 nss-softokn-freebl	0	3.16.2.3	14.2.el7_2	1463486619	x86_64
 glibc	0	2.17	106.el7_2.6	1463486666	x86_64
 libstdc++	0	4.8.5	4.el7	1463486669	x86_64
+kernel  0       3.10.0  862.2.3.el7     1526310781      x86_64
+kernel  0       3.10.0  862.el7 1521745632      x86_64

data/spec/functional/application_spec.rb

@@ -81,7 +81,7 @@ RSpec.describe "Ohai::Application" do
 
       it "loads the workstation configuration file" do
         app.configure_ohai
-        expect(Ohai.config[:disabled_plugins]).to eq([ :Foo, :Baz ])
+        expect(Ohai.config[:disabled_plugins]).to eq(%i{Foo Baz})
       end
     end
 

data/spec/functional/loader_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe "Ohai::Loader" do
       it "loads all the plugins" do
         loader.load_all
         loaded_plugins = loader.instance_variable_get(:@v7_plugin_classes)
-        loaded_plugins_names = loaded_plugins.map { |plugin| plugin.name }
+        loaded_plugins_names = loaded_plugins.map(&:name)
         expect(loaded_plugins_names).to eq(["Ohai::NamedPlugin::Foo"])
       end
     end

data/spec/unit/dsl/plugin_spec.rb

@@ -220,7 +220,7 @@ shared_examples "Ohai::DSL::Plugin" do
               it "returns nil" do
                 expect(
                   plugin.get_attribute("the_monarch", "henchmen",
-                                       "corky_knightrider")
+                    "corky_knightrider")
                 ).to be nil
               end
             end
@@ -229,9 +229,9 @@ shared_examples "Ohai::DSL::Plugin" do
               it "raises a TypeError" do
                 expect do
                   plugin.get_attribute("the_monarch", "arch_rival",
-                                       "dr_venture", "since")
+                    "dr_venture", "since")
                 end.to raise_error(TypeError,
-                                 "Expected Hash but got String.")
+                  "Expected Hash but got String.")
               end
             end
           end
@@ -254,7 +254,7 @@ shared_examples "Ohai::DSL::Plugin" do
               it "returns nil" do
                 expect(
                   plugin.get_attribute(:the_monarch, :henchmen,
-                                       :corky_knightrider)
+                    :corky_knightrider)
                 ).to be nil
               end
             end
@@ -263,9 +263,9 @@ shared_examples "Ohai::DSL::Plugin" do
               it "raises a TypeError" do
                 expect do
                   plugin.get_attribute(:the_monarch, :arch_rival,
-                                       :dr_venture, :since)
+                    :dr_venture, :since)
                 end.to raise_error(TypeError,
-                                 "Expected Hash but got String.")
+                  "Expected Hash but got String.")
               end
             end
           end
@@ -327,7 +327,7 @@ shared_examples "Ohai::DSL::Plugin" do
               it "returns false" do
                 expect(
                   plugin.attribute?("the_monarch", "henchmen",
-                                    "corky_knightrider")
+                    "corky_knightrider")
                 ).to be false
               end
             end
@@ -336,9 +336,9 @@ shared_examples "Ohai::DSL::Plugin" do
               it "raises a TypeError" do
                 expect do
                   plugin.attribute?("the_monarch", "arch_rival",
-                                    "dr_venture", "since")
+                    "dr_venture", "since")
                 end.to raise_error(TypeError,
-                                 "Expected Hash but got String.")
+                  "Expected Hash but got String.")
               end
             end
           end
@@ -360,7 +360,7 @@ shared_examples "Ohai::DSL::Plugin" do
               it "returns false" do
                 expect(
                   plugin.attribute?(:the_monarch, :henchmen,
-                                    :corky_knightrider)
+                    :corky_knightrider)
                 ).to be false
               end
             end
@@ -369,9 +369,9 @@ shared_examples "Ohai::DSL::Plugin" do
               it "raises a TypeError" do
                 expect do
                   plugin.attribute?(:the_monarch, :arch_rival,
-                                    :dr_venture, :since)
+                    :dr_venture, :since)
                 end.to raise_error(TypeError,
-                                 "Expected Hash but got String.")
+                  "Expected Hash but got String.")
               end
             end
           end
@@ -494,7 +494,7 @@ describe Ohai::DSL::Plugin::VersionVII do
 
     it "saves a list of platforms" do
       plugin = Ohai.plugin(:Test) { collect_data(:freebsd, :netbsd, :openbsd) {} }
-      [:freebsd, :netbsd, :openbsd].each do |platform|
+      %i{freebsd netbsd openbsd}.each do |platform|
         expect(plugin.data_collector).to have_key(platform)
       end
     end
@@ -505,7 +505,7 @@ describe Ohai::DSL::Plugin::VersionVII do
         collect_data(:windows) {}
         collect_data(:darwin) {}
       end
-      [:darwin, :default, :windows].each do |platform|
+      %i{darwin default windows}.each do |platform|
         expect(plugin.data_collector).to have_key(platform)
       end
     end
@@ -513,7 +513,7 @@ describe Ohai::DSL::Plugin::VersionVII do
     it "saves platforms across multiple plugins" do
       plugin = Ohai.plugin(:Test) { collect_data {} }
       plugin = Ohai.plugin(:Test) { collect_data(:aix, :sigar) {} }
-      [:aix, :default, :sigar].each do |platform|
+      %i{aix default sigar}.each do |platform|
         expect(plugin.data_collector).to have_key(platform)
       end
     end

data/spec/unit/plugin_config_spec.rb

@@ -54,7 +54,7 @@ describe "Ohai::PluginConfig" do
           let(:value) do
             {
               bar0: true,
-              bar1: [ :baz0, :baz1, :baz2 ],
+              bar1: %i{baz0 baz1 baz2},
               bar2: { qux0: true, qux1: false },
             }
           end
@@ -68,7 +68,7 @@ describe "Ohai::PluginConfig" do
           let(:value) do
             {
               :bar0 => true,
-              "bar1" => [ :baz0, :baz1, :baz2 ],
+              "bar1" => %i{baz0 baz1 baz2},
               :bar2 => { qux0: true, qux1: false },
             }
           end
@@ -82,7 +82,7 @@ describe "Ohai::PluginConfig" do
           let(:value) do
             {
               bar0: true,
-              bar1: [ :baz0, :baz1, :baz2 ],
+              bar1: %i{baz0 baz1 baz2},
               bar2: { :qux0 => true, "qux1" => false },
             }
           end

data/spec/unit/plugins/docker_spec.rb

@@ -47,17 +47,17 @@ macvlan
 null
 overlay},
     "Authorization" => nil,
-    "Log" => [
-      "awslogs",
-      "fluentd",
-      "gcplogs",
-      "gelf",
-      "journald",
-      "json-file",
-      "logentries",
-      "splunk",
-      "syslog",
-    ],
+    "Log" => %w{
+      awslogs
+      fluentd
+      gcplogs
+      gelf
+      journald
+      json-file
+      logentries
+      splunk
+      syslog
+    },
   },
   "networking" => {
     "ipv4_forwarding" => true,

data/spec/unit/plugins/ec2_spec.rb

@@ -400,7 +400,8 @@ describe Ohai::System, "plugin ec2" do
           "skunumber" => nil,
           "uuid" => "5A352AEC-CD91-E85F-BBFC-CC891D0BF9D6",
           "vendor" => "Xen",
-          "version" => "4.2.amazon" })
+          "version" => "4.2.amazon" }
+      )
     end
   end
 
@@ -416,7 +417,8 @@ describe Ohai::System, "plugin ec2" do
           "skunumber" => nil,
           "uuid" => "5A352AEC-CD91-E85F-BBFC-CC891D0BF9D6",
           "vendor" => "Xen",
-          "version" => "1.2.3" })
+          "version" => "1.2.3" }
+      )
     end
   end
 

data/spec/unit/plugins/erlang_spec.rb

@@ -27,9 +27,9 @@ describe Ohai::System, "plugin erlang" do
     erl_v_output = "Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 7.3\n"
     erl_systeminfo_output = "19.1,8.1,2.11"
     allow(plugin).to receive(:shell_out).with("erl +V")
-                                        .and_return(mock_shell_out(0, "", erl_v_output))
+      .and_return(mock_shell_out(0, "", erl_v_output))
     allow(plugin).to receive(:shell_out).with("erl -eval '{ok, Ver} = file:read_file(filename:join([code:root_dir(), \"releases\", erlang:system_info(otp_release), \"OTP_VERSION\"])), Vsn = binary:bin_to_list(Ver, {0, byte_size(Ver) - 1}), io:format(\"~s,~s,~s\", [Vsn, erlang:system_info(version), erlang:system_info(nif_version)]), halt().' -noshell")
-                                        .and_return(mock_shell_out(0, erl_systeminfo_output, ""))
+      .and_return(mock_shell_out(0, erl_systeminfo_output, ""))
   end
 
   it "sets languages[:erlang][:options]" do

data/spec/unit/plugins/hostname_spec.rb

@@ -64,9 +64,11 @@ describe Ohai::System, "hostname plugin" do
     before(:each) do
       allow(@plugin).to receive(:collect_os).and_return(:linux)
       allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(
-        mock_shell_out(0, "katie", ""))
+        mock_shell_out(0, "katie", "")
+      )
       allow(@plugin).to receive(:shell_out).with("hostname --fqdn").and_return(
-        mock_shell_out(0, "", ""), mock_shell_out(0, "katie.local", ""))
+        mock_shell_out(0, "", ""), mock_shell_out(0, "katie.local", "")
+      )
     end
 
     it "should be called twice" do
@@ -79,9 +81,11 @@ describe Ohai::System, "hostname plugin" do
     before(:each) do
       allow(@plugin).to receive(:collect_os).and_return(:linux)
       allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(
-        mock_shell_out(0, "katie", ""))
+        mock_shell_out(0, "katie", "")
+      )
       allow(@plugin).to receive(:shell_out).with("hostname --fqdn").and_return(
-        mock_shell_out(0, "katie.local", ""))
+        mock_shell_out(0, "katie.local", "")
+      )
     end
 
     it "should be not be called twice" do
@@ -109,7 +113,7 @@ describe Ohai::System, "hostname plugin for windows", :windows_only do
       "address1",
       "address2",
       "address3",
-      "address4"
+      "address4",
     ]
   end
 
@@ -118,7 +122,7 @@ describe Ohai::System, "hostname plugin for windows", :windows_only do
       "local",
       [],
       23,
-      "address"
+      "address",
     ]
   end
 
@@ -127,7 +131,7 @@ describe Ohai::System, "hostname plugin for windows", :windows_only do
       "local.dx.internal.cloudapp.net",
       [],
       23,
-      "address"
+      "address",
     ]
   end
 
@@ -136,12 +140,12 @@ describe Ohai::System, "hostname plugin for windows", :windows_only do
     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)
+    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)
+      allow(Socket).to receive(:gethostbyaddr).with(anything).and_return(local_hostent)
       @plugin.run
       expect(@plugin[:fqdn]).to eq("local")
     end
@@ -149,7 +153,7 @@ describe Ohai::System, "hostname plugin for windows", :windows_only do
 
   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)
+      allow(Socket).to receive(:gethostbyaddr).with(anything).and_return(fqdn_hostent)
       @plugin.run
       expect(@plugin[:fqdn]).to eq("local.dx.internal.cloudapp.net")
     end

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

@@ -410,6 +410,7 @@ describe Ohai::System, "Linux filesystem plugin" do
       allow(@double_file).to receive(:read_nonblock) do
         @counter += 1
         raise EOFError if @counter == 2
+
         @mounts
       end
       allow(@double_file).to receive(:close)

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

@@ -87,7 +87,8 @@ describe Ohai::System, "Linux lspci plugin" do
       NUMANode:	0
     LSPCI
     allow(plugin).to receive(:shell_out).with("lspci -vnnmk").and_return(
-      mock_shell_out(0, @stdout, ""))
+      mock_shell_out(0, @stdout, "")
+    )
   end
 
   describe "when gathering data from lspci" do

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

@@ -101,6 +101,11 @@ describe Ohai::System, "Linux plugin platform" do
       expect(plugin.platform_id_remap("sles_sap")).to eq("suse")
     end
 
+    # https://github.com/chef/os_release/blob/master/archarm
+    it "returns arch for archarm" do
+      expect(plugin.platform_id_remap("archarm")).to eq("arch")
+    end
+
     # https://github.com/chef/os_release/blob/master/sles_15_0
     it "returns suse for sles os-release id" do
       expect(plugin.platform_id_remap("sles")).to eq("suse")

data/spec/unit/plugins/network_spec.rb

@@ -421,8 +421,8 @@ describe Ohai::System, "Network Plugin" do
           end
 
           it "warns about this conflict" do
-            expect(@plugin.logger).to receive(:trace).with(/\[inet\] no ipaddress\/mask on eth1/).once
-            expect(@plugin.logger).to receive(:trace).with(/\[inet6\] no ipaddress\/mask on eth1/).once
+            expect(@plugin.logger).to receive(:trace).with(%r{\[inet\] no ipaddress/mask on eth1}).once
+            expect(@plugin.logger).to receive(:trace).with(%r{\[inet6\] no ipaddress/mask on eth1}).once
             allow(@plugin.logger).to receive(:trace)
             @plugin.run
           end
@@ -822,6 +822,7 @@ describe Ohai::System, "Network Plugin" do
           @plugin["network"]["default_interface"] = nil
           @plugin["network"]["interfaces"].each do |i, iv|
             next if i == "lo"
+
             iv["addresses"].delete_if { |k, kv| kv["family"] == "inet" }
           end
         end

data/spec/unit/plugins/openstack_spec.rb

@@ -25,51 +25,32 @@ describe Ohai::System, "plugin openstack" do
 
   before(:each) do
     allow(plugin).to receive(:hint?).with("openstack").and_return(false)
-    plugin[:dmi] = nil
+    plugin[:virtualization] = { system: {} }
   end
 
-  context "when there is no relevant hint or dmi data" do
+  context "when there is no relevant hint or virtualization data" do
     it "does not set any openstack data" do
       plugin.run
       expect(plugin[:openstack]).to be_nil
     end
   end
 
-  context "when DMI data is Openstack" do
+  context "when virtualization data is Openstack" do
     context "and the metadata service is not available" do
       before do
         allow(plugin).to receive(:can_socket_connect?)
           .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, default_timeout)
           .and_return(false)
-        plugin[:dmi] = dmi_data
+        plugin[:virtualization] = { system: { guest: "openstack" } }
         plugin.run
       end
 
-      context "with normal openstack metadata" do
-        let(:dmi_data) do
-          { system: { all_records: [ { Manufacturer: "OpenStack Foundation" } ] } }
-        end
-
-        it "sets openstack attribute" do
-          expect(plugin[:openstack][:provider]).to eq("openstack")
-        end
-
-        it "doesn't set metadata attributes" do
-          expect(plugin[:openstack][:instance_id]).to be_nil
-        end
+      it "sets openstack attribute" do
+        expect(plugin[:openstack][:provider]).to eq("openstack")
       end
-      context "with Red Hat openstack metadata" do
-        let(:dmi_data) do
-          { system: { manufacturer: "Red Hat", product_name: "OpenStack Compute" } }
-        end
 
-        it "sets openstack attribute" do
-          expect(plugin[:openstack][:provider]).to eq("openstack")
-        end
-
-        it "doesn't set metadata attributes" do
-          expect(plugin[:openstack][:instance_id]).to be_nil
-        end
+      it "doesn't set metadata attributes" do
+        expect(plugin[:openstack][:instance_id]).to be_nil
       end
     end
   end
@@ -80,7 +61,7 @@ describe Ohai::System, "plugin openstack" do
       allow(plugin).to receive(:can_socket_connect?)
         .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, default_timeout)
         .and_return(false)
-      plugin[:dmi] = { system: { all_records: [ { Manufacturer: "OpenStack Foundation" } ] } }
+      plugin[:virtualization] = { system: { guest: "openstack" } }
       plugin.run
       expect(plugin[:openstack][:provider]).to eq("dreamhost")
     end
@@ -114,8 +95,8 @@ describe Ohai::System, "plugin openstack" do
 
         it "overwrite timout by setting" do
           allow(plugin).to receive(:can_socket_connect?)
-          .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, override_timout)
-          .and_return(false)
+            .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, override_timout)
+            .and_return(false)
           allow(plugin).to receive(:hint?).with("openstack").and_return(true)
           plugin.run
         end
@@ -302,4 +283,24 @@ describe Ohai::System, "plugin openstack" do
       end
     end
   end
+
+  context "when openstack virtualization is present" do
+    context "and the metadata service is not available" do
+      before do
+        allow(plugin).to receive(:can_socket_connect?)
+          .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, default_timeout)
+          .and_return(false)
+        plugin[:virtualization] = { system: { guest: "openstack" } }
+        plugin.run
+      end
+
+      it "sets openstack provider attribute since virtualization is present" do
+        expect(plugin[:openstack][:provider]).to eq("openstack")
+      end
+
+      it "doesn't set metadata attributes" do
+        expect(plugin[:openstack][:instance_id]).to be_nil
+      end
+    end
+  end
 end