ohai 18.0.14 → 18.0.26

data/lib/ohai/plugins/aix/virtualization.rb

@@ -1,154 +1,154 @@
-#
-# Author:: Julian C. Dunn (<jdunn@chef.io>)
-# Author:: Isa Farnik (<isa@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(:Virtualization) do
-  provides "virtualization", "virtualization/wpars"
-
-  collect_data(:aix) do
-    virtualization Mash.new
-
-    lpar_no, lpar_name = shell_out("uname -L").stdout.split(nil, 2)
-    lpar_no = lpar_no.to_i
-
-    unless lpar_no == -1 || (lpar_no == 1 && lpar_name == "NULL")
-      virtualization[:lpar_no] = lpar_no
-      virtualization[:lpar_name] = lpar_name
-    end
-
-    wpar_no = shell_out("uname -W").stdout.strip.to_i
-    if wpar_no > 0
-      virtualization[:wpar_no] = wpar_no
-    else
-      # the below parses the output of lswpar in the long format
-      so = shell_out("lswpar -L").stdout.scan(/={65}.*?(?:EXPORTED\n\n)+/m)
-      wpars = Mash.new
-      so.each do |wpar|
-        wpar_heading = wpar.lines[1].split
-        wpar_name = wpar_heading[0]
-
-        wpars[wpar_name] = Mash.new
-        wpars[wpar_name][:state] = wpar_heading[2].downcase
-
-        wpar.scan(/^[A-Z]{4,}.*?[A-Z\:0-9]$.*?\n\n/m).each do |section|
-
-          # retrieve title of section
-          title = section.lines.first[0..-2].downcase
-          wpars[wpar_name][title] = Mash.new
-
-          # discard trailing section newline+title
-          # and save as array
-          sections = section.lines[1..-2]
-
-          sections.each do |line|
-            case title
-            when "network"
-              next if /^Interface|^---/.match?(line)
-
-              splat = line.strip.split
-              key   = splat[0].downcase
-              value = {
-                        "address" => splat[1],
-                        "netmask" => splat[2],
-                        "broadcast" => splat[3],
-                      }
-              wpars[wpar_name][title][key] = value
-            when "user-specified routes"
-              next if /^Type|^---/.match?(line)
-
-              splat = line.strip.split
-              key   = splat[2].downcase
-              value = {
-                        "destination" => splat[0],
-                        "gateway" => splat[1],
-                      }
-              wpars[wpar_name][title][key] = value
-            when "file systems"
-              next if /^MountPoint|^---/.match?(line)
-
-              splat = line.strip.split
-              key = splat[1].downcase
-              value = {
-                        "mountpoint" => splat[0],
-                        "device" => splat[1],
-                        "vfs" => splat[2],
-                        "options" => splat[3].split(","),
-                      }
-              wpars[wpar_name][title][key] = value
-            when "security settings"
-              privileges ||= ""
-              wpars[wpar_name][title]["Privileges"] ||= []
-
-              if /^Privileges/.match?(line)
-                privileges << line.split(":")[1].strip
-              else
-                privileges << line.strip
-              end
-
-              wpars[wpar_name][title]["Privileges"] += privileges.split(",")
-            when "device exports"
-              next if /^Name|^---/.match?(line)
-
-              splat = line.strip.split
-              key = splat[0].downcase
-              value = {
-                        "type" => splat[1],
-                        "status" => splat[2],
-                      }
-              wpars[wpar_name][title][key] = value
-            else
-              # key-value pairs are handled here
-              # such as GENERAL and RESOURCE-
-              # CONTROL
-              splat = line.strip.split(":")
-              key   = splat[0].downcase
-              value = splat[1..-1].join(", ").strip
-              value = value.empty? ? nil : value
-              case value
-              when "yes"
-                value = true
-              when "no"
-                value = false
-              end
-              wpars[wpar_name][title][key] = value
-            end
-          end
-        end
-        top_level = [
-          "general.directory",
-          "general.hostname",
-          "general.private /usr",
-          "general.type",
-          "general.uuid",
-          "resource controls.active",
-          "network.en0.address",
-        ]
-
-        top_level.each do |attribute|
-          evalstr = "wpars['#{wpar_name}']"
-          breadcrumb = attribute.split(".")
-          breadcrumb.each do |node|
-            evalstr << "[\'#{node}\']"
-          end
-          wpars[wpar_name][breadcrumb[-1]] = eval evalstr # rubocop: disable Security/Eval
-        end
-      end
-      virtualization[:wpars] = wpars unless wpars.empty?
-    end
-  end
-end
+#
+# Author:: Julian C. Dunn (<jdunn@chef.io>)
+# Author:: Isa Farnik (<isa@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(:Virtualization) do
+  provides "virtualization", "virtualization/wpars"
+
+  collect_data(:aix) do
+    virtualization Mash.new
+
+    lpar_no, lpar_name = shell_out("uname -L").stdout.split(nil, 2)
+    lpar_no = lpar_no.to_i
+
+    unless lpar_no == -1 || (lpar_no == 1 && lpar_name == "NULL")
+      virtualization[:lpar_no] = lpar_no
+      virtualization[:lpar_name] = lpar_name
+    end
+
+    wpar_no = shell_out("uname -W").stdout.strip.to_i
+    if wpar_no > 0
+      virtualization[:wpar_no] = wpar_no
+    else
+      # the below parses the output of lswpar in the long format
+      so = shell_out("lswpar -L").stdout.scan(/={65}.*?(?:EXPORTED\n\n)+/m)
+      wpars = Mash.new
+      so.each do |wpar|
+        wpar_heading = wpar.lines[1].split
+        wpar_name = wpar_heading[0]
+
+        wpars[wpar_name] = Mash.new
+        wpars[wpar_name][:state] = wpar_heading[2].downcase
+
+        wpar.scan(/^[A-Z]{4,}.*?[A-Z\:0-9]$.*?\n\n/m).each do |section|
+
+          # retrieve title of section
+          title = section.lines.first[0..-2].downcase
+          wpars[wpar_name][title] = Mash.new
+
+          # discard trailing section newline+title
+          # and save as array
+          sections = section.lines[1..-2]
+
+          sections.each do |line|
+            case title
+            when "network"
+              next if /^Interface|^---/.match?(line)
+
+              splat = line.strip.split
+              key   = splat[0].downcase
+              value = {
+                        "address" => splat[1],
+                        "netmask" => splat[2],
+                        "broadcast" => splat[3],
+                      }
+              wpars[wpar_name][title][key] = value
+            when "user-specified routes"
+              next if /^Type|^---/.match?(line)
+
+              splat = line.strip.split
+              key   = splat[2].downcase
+              value = {
+                        "destination" => splat[0],
+                        "gateway" => splat[1],
+                      }
+              wpars[wpar_name][title][key] = value
+            when "file systems"
+              next if /^MountPoint|^---/.match?(line)
+
+              splat = line.strip.split
+              key = splat[1].downcase
+              value = {
+                        "mountpoint" => splat[0],
+                        "device" => splat[1],
+                        "vfs" => splat[2],
+                        "options" => splat[3].split(","),
+                      }
+              wpars[wpar_name][title][key] = value
+            when "security settings"
+              privileges ||= ""
+              wpars[wpar_name][title]["Privileges"] ||= []
+
+              if /^Privileges/.match?(line)
+                privileges << line.split(":")[1].strip
+              else
+                privileges << line.strip
+              end
+
+              wpars[wpar_name][title]["Privileges"] += privileges.split(",")
+            when "device exports"
+              next if /^Name|^---/.match?(line)
+
+              splat = line.strip.split
+              key = splat[0].downcase
+              value = {
+                        "type" => splat[1],
+                        "status" => splat[2],
+                      }
+              wpars[wpar_name][title][key] = value
+            else
+              # key-value pairs are handled here
+              # such as GENERAL and RESOURCE-
+              # CONTROL
+              splat = line.strip.split(":")
+              key   = splat[0].downcase
+              value = splat[1..-1].join(", ").strip
+              value = value.empty? ? nil : value
+              case value
+              when "yes"
+                value = true
+              when "no"
+                value = false
+              end
+              wpars[wpar_name][title][key] = value
+            end
+          end
+        end
+        top_level = [
+          "general.directory",
+          "general.hostname",
+          "general.private /usr",
+          "general.type",
+          "general.uuid",
+          "resource controls.active",
+          "network.en0.address",
+        ]
+
+        top_level.each do |attribute|
+          evalstr = "wpars['#{wpar_name}']"
+          breadcrumb = attribute.split(".")
+          breadcrumb.each do |node|
+            evalstr << "[\'#{node}\']"
+          end
+          wpars[wpar_name][breadcrumb[-1]] = eval evalstr # rubocop: disable Security/Eval
+        end
+      end
+      virtualization[:wpars] = wpars unless wpars.empty?
+    end
+  end
+end

data/lib/ohai/plugins/alibaba.rb

@@ -1,72 +1,72 @@
-# 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.
-
-# How we detect Alibaba from easiest to hardest & least reliable
-# 1. Ohai alibaba hint exists. This always works
-# 2. DMI sys_vendor data mentions alibaba.
-
-Ohai.plugin(:Alibaba) do
-  require_relative "../mixin/alibaba_metadata"
-  require_relative "../mixin/http_helper"
-
-  include Ohai::Mixin::AlibabaMetadata
-  include Ohai::Mixin::HttpHelper
-
-  provides "alibaba"
-
-  # look for alibaba string in dmi sys_vendor data within the sys tree.
-  # this works even if the system lacks dmidecode use by the Dmi plugin
-  # @return [Boolean] do we have Alibaba DMI data?
-  def has_ali_dmi?
-    if /Alibaba/.match?(file_val_if_exists("/sys/class/dmi/id/sys_vendor"))
-      logger.trace("Plugin Alibaba: has_ali_dmi? == true")
-      true
-    else
-      logger.trace("Plugin Alibaba: has_ali_dmi? == false")
-      false
-    end
-  end
-
-  # return the contents of a file if the file exists
-  # @param path[String] abs path to the file
-  # @return [String] contents of the file if it exists
-  def file_val_if_exists(path)
-    if file_exist?(path)
-      file_read(path)
-    end
-  end
-
-  # a single check that combines all the various detection methods for Alibaba
-  # @return [Boolean] Does the system appear to be on Alibaba
-  def looks_like_alibaba?
-    return true if hint?("alibaba") || has_ali_dmi?
-  end
-
-  collect_data do
-    if looks_like_alibaba?
-      logger.trace("Plugin Alibaba: looks_like_alibaba? == true")
-      alibaba Mash.new
-      fetch_metadata.each do |k, v|
-        alibaba[k] = v
-      end
-    else
-      logger.trace("Plugin Alibaba: looks_like_alibaba? == false")
-      false
-    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.
+
+# How we detect Alibaba from easiest to hardest & least reliable
+# 1. Ohai alibaba hint exists. This always works
+# 2. DMI sys_vendor data mentions alibaba.
+
+Ohai.plugin(:Alibaba) do
+  require_relative "../mixin/alibaba_metadata"
+  require_relative "../mixin/http_helper"
+
+  include Ohai::Mixin::AlibabaMetadata
+  include Ohai::Mixin::HttpHelper
+
+  provides "alibaba"
+
+  # look for alibaba string in dmi sys_vendor data within the sys tree.
+  # this works even if the system lacks dmidecode use by the Dmi plugin
+  # @return [Boolean] do we have Alibaba DMI data?
+  def has_ali_dmi?
+    if /Alibaba/.match?(file_val_if_exists("/sys/class/dmi/id/sys_vendor"))
+      logger.trace("Plugin Alibaba: has_ali_dmi? == true")
+      true
+    else
+      logger.trace("Plugin Alibaba: has_ali_dmi? == false")
+      false
+    end
+  end
+
+  # return the contents of a file if the file exists
+  # @param path[String] abs path to the file
+  # @return [String] contents of the file if it exists
+  def file_val_if_exists(path)
+    if file_exist?(path)
+      file_read(path)
+    end
+  end
+
+  # a single check that combines all the various detection methods for Alibaba
+  # @return [Boolean] Does the system appear to be on Alibaba
+  def looks_like_alibaba?
+    return true if hint?("alibaba") || has_ali_dmi?
+  end
+
+  collect_data do
+    if looks_like_alibaba?
+      logger.trace("Plugin Alibaba: looks_like_alibaba? == true")
+      alibaba Mash.new
+      fetch_metadata.each do |k, v|
+        alibaba[k] = v
+      end
+    else
+      logger.trace("Plugin Alibaba: looks_like_alibaba? == false")
+      false
+    end
+  end
+end