ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/scsi.rb

@@ -1,52 +1,52 @@
-# frozen_string_literal: true
-#
-# Author:: Phil Dibowitz <phil@ipom.com>
-# Copyright:: Copyright (c) 2018 Facebook, 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 CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-Ohai.plugin(:Lsscsi) do
-  provides "scsi"
-  optional true
-
-  require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
-
-  collect_data(:linux) do
-    devices = Mash.new
-    lsscsi = shell_out("lsscsi")
-
-    lsscsi.stdout.each_line do |line|
-      line_bits = line.split
-      info = {}
-
-      # The first three fields are consistent...
-      info["scsi_addr"] = line_bits.shift[1..-2]
-      info["type"] = line_bits.shift
-      info["transport"] = line_bits.shift
-
-      # After that the last two are consistent...
-      info["device"] = line_bits.pop
-      info["revision"] = line_bits.pop
-
-      # What"s in the middle is the make and model...
-      # which could have arbitrary spaces
-      info["name"] = line_bits.join(" ")
-
-      devices[info["scsi_addr"]] = info
-    end
-
-    scsi devices
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Phil Dibowitz <phil@ipom.com>
+# Copyright:: Copyright (c) 2018 Facebook, 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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Lsscsi) do
+  provides "scsi"
+  optional true
+
+  require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
+
+  collect_data(:linux) do
+    devices = Mash.new
+    lsscsi = shell_out("lsscsi")
+
+    lsscsi.stdout.each_line do |line|
+      line_bits = line.split
+      info = {}
+
+      # The first three fields are consistent...
+      info["scsi_addr"] = line_bits.shift[1..-2]
+      info["type"] = line_bits.shift
+      info["transport"] = line_bits.shift
+
+      # After that the last two are consistent...
+      info["device"] = line_bits.pop
+      info["revision"] = line_bits.pop
+
+      # What"s in the middle is the make and model...
+      # which could have arbitrary spaces
+      info["name"] = line_bits.join(" ")
+
+      devices[info["scsi_addr"]] = info
+    end
+
+    scsi devices
+  end
+end

data/lib/ohai/plugins/shard.rb

@@ -1,142 +1,142 @@
-#
-# Author:: Phil Dibowitz <phil@ipom.com>
-# Copyright:: Copyright (c) 2016 Facebook, 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 CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-Ohai.plugin(:ShardSeed) do
-  depends "hostname", "dmi", "machine_id", "machinename", "fips", "hardware", "kernel"
-  provides "shard_seed".freeze
-
-  def get_dmi_property(dmi, thing)
-    %w{system base_board chassis}.each do |section|
-      if dmi[section] && dmi[section][thing] && !dmi[section][thing].strip.empty?
-        return dmi[section][thing]
-      end
-    end
-    Ohai::Log.error("shard_seed: Failed to get dmi property #{thing}: is dmidecode installed?")
-    raise "Failed to generate shard_seed"
-  end
-
-  def default_sources
-    case collect_os
-    when "linux", "darwin", "windows"
-      %i{machinename serial uuid}
-    else
-      [:machinename]
-    end
-  end
-
-  def default_digest_algorithm
-    if fips && fips["kernel"]["enabled"]
-      # Even though it is being used safely, FIPS-mode will still blow up on
-      # any use of MD5 so default to SHA2 instead.
-      "sha256"
-    else
-      "md5"
-    end
-  end
-
-  def digest_algorithm
-    case Ohai.config[:plugin][:shard_seed][:digest_algorithm] || default_digest_algorithm
-    when "md5"
-      require "digest/md5" unless defined?(Digest::MD5)
-      Digest::MD5
-    when "sha256"
-      require "openssl/digest"
-      OpenSSL::Digest::SHA256
-    end
-  end
-
-  # Common sources go here. Put sources that need to be different per-platform
-  # under their collect_data block.
-  def create_seed(&block)
-    sources = Ohai.config[:plugin][:shard_seed][:sources] || default_sources
-    data = ""
-    sources.each do |src|
-      data << case src
-              when :fqdn
-                fqdn
-              when :hostname
-                hostname
-              when :machine_id
-                machine_id
-              when :machinename
-                machinename
-              else
-                yield(src)
-              end
-    end
-    if data.empty?
-      Ohai::Log.error("shard_seed: Unable to generate seed! Either ensure 'dmidecode' is installed, or use 'Ohai.config[:plugin][:shard_seed][:sources]' to set different sources.")
-      raise "Failed to generate shard_seed"
-    end
-    shard_seed digest_algorithm.hexdigest(data)[0...7].to_i(16)
-  end
-
-  collect_data do
-    create_seed do |src|
-      Ohai::Log.error("shard_seed: No such source #{src}")
-      raise "No such shard_seed source: #{src}"
-    end
-  end
-
-  collect_data(:windows) do
-    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
-    wmi = WmiLite::Wmi.new
-
-    create_seed do |src|
-      case src
-      when :serial
-        wmi.first_of("Win32_BIOS")["SerialNumber"]
-      when :os_serial
-        kernel["os_info"]["serial_number"]
-      when :uuid
-        wmi.first_of("Win32_ComputerSystemProduct")["UUID"]
-      else
-        Ohai::Log.error("shard_seed: No such source #{src}")
-        raise "No such shard_seed source: #{src}"
-      end
-    end
-  end
-
-  collect_data(:darwin) do
-    create_seed do |src|
-      case src
-      when :serial
-        hardware["serial_number"]
-      when :uuid
-        hardware["platform_UUID"]
-      else
-        Ohai::Log.error("shard_seed: No such source #{src}")
-        raise "No such shard_seed source: #{src}"
-      end
-    end
-  end
-
-  collect_data(:linux) do
-    create_seed do |src|
-      case src
-      when :serial
-        get_dmi_property(dmi, :serial_number)
-      when :uuid
-        get_dmi_property(dmi, :uuid)
-      else
-        Ohai::Log.error("shard_seed: No such source #{src}")
-        raise "No such shard_seed source: #{src}"
-      end
-    end
-  end
-end
+#
+# Author:: Phil Dibowitz <phil@ipom.com>
+# Copyright:: Copyright (c) 2016 Facebook, 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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:ShardSeed) do
+  depends "hostname", "dmi", "machine_id", "machinename", "fips", "hardware", "kernel"
+  provides "shard_seed".freeze
+
+  def get_dmi_property(dmi, thing)
+    %w{system base_board chassis}.each do |section|
+      if dmi[section] && dmi[section][thing] && !dmi[section][thing].strip.empty?
+        return dmi[section][thing]
+      end
+    end
+    Ohai::Log.error("shard_seed: Failed to get dmi property #{thing}: is dmidecode installed?")
+    raise "Failed to generate shard_seed"
+  end
+
+  def default_sources
+    case collect_os
+    when "linux", "darwin", "windows"
+      %i{machinename serial uuid}
+    else
+      [:machinename]
+    end
+  end
+
+  def default_digest_algorithm
+    if fips && fips["kernel"]["enabled"]
+      # Even though it is being used safely, FIPS-mode will still blow up on
+      # any use of MD5 so default to SHA2 instead.
+      "sha256"
+    else
+      "md5"
+    end
+  end
+
+  def digest_algorithm
+    case Ohai.config[:plugin][:shard_seed][:digest_algorithm] || default_digest_algorithm
+    when "md5"
+      require "digest/md5" unless defined?(Digest::MD5)
+      Digest::MD5
+    when "sha256"
+      require "openssl/digest"
+      OpenSSL::Digest::SHA256
+    end
+  end
+
+  # Common sources go here. Put sources that need to be different per-platform
+  # under their collect_data block.
+  def create_seed(&block)
+    sources = Ohai.config[:plugin][:shard_seed][:sources] || default_sources
+    data = ""
+    sources.each do |src|
+      data << case src
+              when :fqdn
+                fqdn
+              when :hostname
+                hostname
+              when :machine_id
+                machine_id
+              when :machinename
+                machinename
+              else
+                yield(src)
+              end
+    end
+    if data.empty?
+      Ohai::Log.error("shard_seed: Unable to generate seed! Either ensure 'dmidecode' is installed, or use 'Ohai.config[:plugin][:shard_seed][:sources]' to set different sources.")
+      raise "Failed to generate shard_seed"
+    end
+    shard_seed digest_algorithm.hexdigest(data)[0...7].to_i(16)
+  end
+
+  collect_data do
+    create_seed do |src|
+      Ohai::Log.error("shard_seed: No such source #{src}")
+      raise "No such shard_seed source: #{src}"
+    end
+  end
+
+  collect_data(:windows) do
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+    wmi = WmiLite::Wmi.new
+
+    create_seed do |src|
+      case src
+      when :serial
+        wmi.first_of("Win32_BIOS")["SerialNumber"]
+      when :os_serial
+        kernel["os_info"]["serial_number"]
+      when :uuid
+        wmi.first_of("Win32_ComputerSystemProduct")["UUID"]
+      else
+        Ohai::Log.error("shard_seed: No such source #{src}")
+        raise "No such shard_seed source: #{src}"
+      end
+    end
+  end
+
+  collect_data(:darwin) do
+    create_seed do |src|
+      case src
+      when :serial
+        hardware["serial_number"]
+      when :uuid
+        hardware["platform_UUID"]
+      else
+        Ohai::Log.error("shard_seed: No such source #{src}")
+        raise "No such shard_seed source: #{src}"
+      end
+    end
+  end
+
+  collect_data(:linux) do
+    create_seed do |src|
+      case src
+      when :serial
+        get_dmi_property(dmi, :serial_number)
+      when :uuid
+        get_dmi_property(dmi, :uuid)
+      else
+        Ohai::Log.error("shard_seed: No such source #{src}")
+        raise "No such shard_seed source: #{src}"
+      end
+    end
+  end
+end

data/lib/ohai/plugins/shells.rb

@@ -1,32 +1,32 @@
-# frozen_string_literal: true
-#
-# Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 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 CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-Ohai.plugin(:Shells) do
-  provides "shells"
-
-  collect_data do
-    if file_exist?("/etc/shells")
-      shells []
-      file_open("/etc/shells").readlines.each do |line|
-        # remove carriage returns and skip over comments / empty lines
-        shells << line.chomp if line[0] == "/"
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Tim Smith (<tsmith@chef.io>)
+# Copyright:: Copyright (c) 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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Shells) do
+  provides "shells"
+
+  collect_data do
+    if file_exist?("/etc/shells")
+      shells []
+      file_open("/etc/shells").readlines.each do |line|
+        # remove carriage returns and skip over comments / empty lines
+        shells << line.chomp if line[0] == "/"
+      end
+    end
+  end
+end

data/lib/ohai/plugins/softlayer.rb

@@ -1,48 +1,48 @@
-# frozen_string_literal: true
-#
-# Author:: Alexey Karpik <alexey.karpik@rightscale.com>
-# Author:: Peter Schroeter <peter.schroeter@rightscale.com>
-# Author:: Stas Turlo <stanislav.turlo@rightscale.com>
-# Copyright:: Copyright (c) 2010-2014 RightScale 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 CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Ohai.plugin(:Softlayer) do
-  require_relative "../mixin/softlayer_metadata"
-  include ::Ohai::Mixin::SoftlayerMetadata
-
-  provides "softlayer"
-
-  # Identifies the softlayer cloud
-  #
-  # === Return
-  # true:: If the softlayer cloud can be identified
-  # false:: Otherwise
-  def looks_like_softlayer?
-    hint?("softlayer")
-  end
-
-  collect_data do
-    # Adds softlayer Mash
-    if looks_like_softlayer?
-      logger.trace("Plugin Softlayer: looks_like_softlayer? == true")
-      metadata = fetch_metadata
-      softlayer Mash.new
-      metadata&.each { |k, v| softlayer[k] = v }
-    else
-      logger.trace("Plugin Softlayer: looks_like_softlayer? == false")
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Alexey Karpik <alexey.karpik@rightscale.com>
+# Author:: Peter Schroeter <peter.schroeter@rightscale.com>
+# Author:: Stas Turlo <stanislav.turlo@rightscale.com>
+# Copyright:: Copyright (c) 2010-2014 RightScale 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 CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Ohai.plugin(:Softlayer) do
+  require_relative "../mixin/softlayer_metadata"
+  include ::Ohai::Mixin::SoftlayerMetadata
+
+  provides "softlayer"
+
+  # Identifies the softlayer cloud
+  #
+  # === Return
+  # true:: If the softlayer cloud can be identified
+  # false:: Otherwise
+  def looks_like_softlayer?
+    hint?("softlayer")
+  end
+
+  collect_data do
+    # Adds softlayer Mash
+    if looks_like_softlayer?
+      logger.trace("Plugin Softlayer: looks_like_softlayer? == true")
+      metadata = fetch_metadata
+      softlayer Mash.new
+      metadata&.each { |k, v| softlayer[k] = v }
+    else
+      logger.trace("Plugin Softlayer: looks_like_softlayer? == false")
+    end
+  end
+end