ohai 18.0.26 → 18.1.0

data/lib/ohai/mixin/dmi_decode.rb

@@ -1,54 +1,54 @@
-# 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.
-
-# http://www.dmo.ca/blog/detecting-virtualization-on-linux
-module ::Ohai::Mixin::DmiDecode
-  def guest_from_dmi_data(manufacturer, product, version)
-    case manufacturer
-    when /OpenStack/
-      return "openstack"
-    when /Xen/
-      return "xen"
-    when /VMware/
-      return "vmware"
-    when /Microsoft/
-      return "hyperv" if /Virtual Machine/.match?(product)
-    when /Amazon EC2/
-      return "amazonec2"
-    when /QEMU/
-      return "kvm"
-    when /Veertu/
-      return "veertu"
-    when /Parallels/
-      return "parallels"
-    end
-
-    case product
-    when /VirtualBox/
-      return "vbox"
-    when /OpenStack/ # yes this is here twice. Product catches Red Hat's version
-      return "openstack"
-    when /(KVM|RHEV)/
-      return "kvm"
-    when /BHYVE/
-      return "bhyve"
-    end
-
-    nil # doesn't look like a virt
-  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.
+
+# http://www.dmo.ca/blog/detecting-virtualization-on-linux
+module ::Ohai::Mixin::DmiDecode
+  def guest_from_dmi_data(manufacturer, product, version)
+    case manufacturer
+    when /OpenStack/
+      return "openstack"
+    when /Xen/
+      return "xen"
+    when /VMware/
+      return "vmware"
+    when /Microsoft/
+      return "hyperv" if product.include?("Virtual Machine")
+    when /Amazon EC2/
+      return "amazonec2"
+    when /QEMU/
+      return "kvm"
+    when /Veertu/
+      return "veertu"
+    when /Parallels/
+      return "parallels"
+    end
+
+    case product
+    when /VirtualBox/
+      return "vbox"
+    when /OpenStack/ # yes this is here twice. Product catches Red Hat's version
+      return "openstack"
+    when /(KVM|RHEV)/
+      return "kvm"
+    when /BHYVE/
+      return "bhyve"
+    end
+
+    nil # doesn't look like a virt
+  end
+end

data/lib/ohai/mixin/do_metadata.rb

@@ -1,48 +1,48 @@
-# frozen_string_literal: true
-
-# Author:: Dylan Page (<dpage@digitalocean.com>)
-# 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.
-
-require "net/http" unless defined?(Net::HTTP)
-
-module Ohai
-  module Mixin
-    module DOMetadata
-
-      DO_METADATA_ADDR ||= "169.254.169.254"
-      DO_METADATA_URL ||= "/metadata/v1.json"
-
-      def http_client
-        Net::HTTP.start(DO_METADATA_ADDR).tap { |h| h.read_timeout = 6 }
-      end
-
-      def fetch_metadata
-        uri = DO_METADATA_URL.to_s
-        response = http_client.get(uri)
-        case response.code
-        when "200"
-          parser = FFI_Yajl::Parser.new
-          parser.parse(response.body)
-        when "404"
-          logger.trace("Mixin DOMetadata: Encountered 404 response retrieving Digital Ocean metadata: #{uri} ; continuing.")
-          {}
-        else
-          raise "Mixin DOMetadata: Encountered error retrieving Digital Ocean metadata (#{uri} returned #{response.code} response)"
-        end
-      end
-
-    end
-  end
-end
+# frozen_string_literal: true
+
+# Author:: Dylan Page (<dpage@digitalocean.com>)
+# 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.
+
+require "net/http" unless defined?(Net::HTTP)
+
+module Ohai
+  module Mixin
+    module DOMetadata
+
+      DO_METADATA_ADDR ||= "169.254.169.254"
+      DO_METADATA_URL ||= "/metadata/v1.json"
+
+      def http_client
+        Net::HTTP.start(DO_METADATA_ADDR).tap { |h| h.read_timeout = 6 }
+      end
+
+      def fetch_metadata
+        uri = DO_METADATA_URL.to_s
+        response = http_client.get(uri)
+        case response.code
+        when "200"
+          parser = FFI_Yajl::Parser.new
+          parser.parse(response.body)
+        when "404"
+          logger.trace("Mixin DOMetadata: Encountered 404 response retrieving Digital Ocean metadata: #{uri} ; continuing.")
+          {}
+        else
+          raise "Mixin DOMetadata: Encountered error retrieving Digital Ocean metadata (#{uri} returned #{response.code} response)"
+        end
+      end
+
+    end
+  end
+end