ohai 18.1.0 → 18.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6704f249d63eb6abebd08dd48e408fee70bd50d5ca2304471bdcc53b80941c
-  data.tar.gz: f761a02520c31d96e8a8bab3853f5a432d0fb9460b2901dd1a0abe4efdcdcc6b
+  metadata.gz: 62cb983e4564cb9d15a8eb0b74bbdfdbf2c515fc2906a46718ad71f8e54fa663
+  data.tar.gz: 1b5157e0f291485d13ef5ee96d5b0aa90e274f19d259d1ac15897ea9a9a3bb33
 SHA512:
-  metadata.gz: a58f353ea899d897e4fc3cd8aa5dabe9737b8002ceda5483482ac7fceded93d40ef5581ca4e403edaa049e6f43587932945e8f1f125cb88162e31ae424a80865
-  data.tar.gz: a58f4b0a239f206e2194abacbdbf137931057980745f0b5b9eee528ff314c21a042ae1b88a0325b12a68fc928c77817778d53d89e952bbd9d88410df35a93865
+  metadata.gz: 815bce3ce6a1a8b83d0bdcd702581331632fc2239f7eea243261db411c951145bdbdc0c45802acae14ad514bcb390ce7f65fc8c2ef61d9e16b672cdb550e53fe
+  data.tar.gz: 98a13a200478051a2898b7d210f944bbdad9fecab0b39ecf7fa54ea0a3104027bcfcced0b22d9b17bf25383830a0386bd5a3cad5cf2ca202adf36a4fd19ffafb

data/lib/ohai/mixin/alibaba_metadata.rb

@@ -18,6 +18,9 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     #
@@ -40,44 +43,28 @@ module Ohai
 
       def fetch_metadata(id = "")
         response = http_get(id)
-        return nil unless response.code == "200"
-
-        if json?(response.body)
-          data = String(response.body)
-          parser = FFI_Yajl::Parser.new
-          parser.parse(data)
-        elsif response.body.include?("\n")
-          temp = {}
-          response.body.split("\n").each do |sub_attr|
-            temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}/#{sub_attr}")
+        if response.code == "200"
+          json_data = parse_json(response.body)
+          if json_data.nil?
+            logger.warn("Mixin AlibabaMetadata: Metadata response is NOT valid JSON for id='#{id}'")
+            if response.body.include?("\n")
+              temp = {}
+              response.body.split("\n").each do |sub_attr|
+                temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}/#{sub_attr}")
+              end
+              temp
+            else
+              response.body
+            end
+          else
+            json_data
           end
-          temp
         else
-          response.body
+          logger.warn("Mixin AlibabaMetadata: Received response code #{response.code} requesting metadata for id='#{id}'")
+          nil
         end
       end
 
-      # @param [String] data that might be JSON
-      #
-      # @return [Boolean] is the data JSON or not?
-      def json?(data)
-        data = String(data)
-        parser = FFI_Yajl::Parser.new
-        begin
-          parser.parse(data)
-          true
-        rescue FFI_Yajl::ParseError
-          false
-        end
-      end
-
-      # @param data [String]
-      #
-      # @return [Boolean] is there a trailing /?
-      def has_trailing_slash?(data)
-        !!( data =~ %r{/$} )
-      end
-
       def sanitize_key(key)
         key.gsub(%r{\-|/}, "_")
       end

data/lib/ohai/mixin/azure_metadata.rb

@@ -18,6 +18,9 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     #
@@ -81,26 +84,16 @@ module Ohai
         conn.get(uri, { "Metadata" => "true" })
       end
 
-      # parse JSON data from a String to a Hash
-      #
-      # @param [String] response_body json as string to parse
-      #
-      # @return [Hash]
-      def parse_json(response_body)
-        data = String(response_body)
-        parser = FFI_Yajl::Parser.new
-        parser.parse(data)
-      rescue FFI_Yajl::ParseError
-        logger.warn("Mixin AzureMetadata: Metadata response is NOT valid JSON")
-        nil
-      end
-
-      def fetch_metadata(api_version = nil)
+      def fetch_metadata(_api_version = nil)
         metadata_url = "/metadata/instance?api-version=#{best_api_version}"
         logger.trace("Mixin AzureMetadata: Fetching metadata from host #{AZURE_METADATA_ADDR} at #{metadata_url}")
         response = http_get(metadata_url)
         if response.code == "200"
-          parse_json(response.body)
+          json_data = parse_json(response.body)
+          if json_data.nil?
+            logger.warn("Mixin AzureMetadata: Metadata response is NOT valid JSON")
+          end
+          json_data
         else
           logger.warn("Mixin AzureMetadata: Received response code #{response.code} requesting metadata")
           nil

data/lib/ohai/mixin/ec2_metadata.rb

@@ -20,6 +20,9 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     ##
@@ -229,9 +232,14 @@ module Ohai
         @fetch_dynamic_data ||= begin
           response = http_client.get("/#{best_api_version}/dynamic/instance-identity/document/", { 'X-aws-ec2-metadata-token': v2_token })
 
-          if json?(response.body) && response.code == "200"
-            FFI_Yajl::Parser.parse(response.body)
+          if response.code == "200"
+            json_data = parse_json(response.body, {})
+            if json_data.nil?
+              logger.warn("Mixin Ec2Metadata: Metadata response is NOT valid JSON")
+            end
+            json_data
           else
+            logger.warn("Mixin Ec2Metadata: Received response code #{response.code} requesting metadata")
             {}
           end
         end

data/lib/ohai/mixin/gce_metadata.rb

@@ -17,6 +17,9 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     module GCEMetadata
@@ -37,34 +40,25 @@ module Ohai
 
       def fetch_metadata(id = "")
         response = http_get("#{GCE_METADATA_URL}/#{id}")
-        return nil unless response.code == "200"
-
-        if json?(response.body)
-          data = String(response.body)
-          parser = FFI_Yajl::Parser.new
-          parser.parse(data)
-        elsif has_trailing_slash?(id) || (id == "")
-          temp = {}
-          response.body.split("\n").each do |sub_attr|
-            temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}#{sub_attr}")
+        if response.code == "200"
+          json_data = parse_json(response.body)
+          if json_data.nil?
+            logger.warn("Mixin GCEMetadata: Metadata response is NOT valid JSON for id='#{id}'")
+            if has_trailing_slash?(id) || (id == "")
+              temp = {}
+              response.body.split("\n").each do |sub_attr|
+                temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}#{sub_attr}")
+              end
+              temp
+            else
+              response.body
+            end
+          else
+            json_data
           end
-          temp
         else
-          response.body
-        end
-      end
-
-      # @param [String] data that might be JSON
-      #
-      # @return [Boolean] is the data JSON or not?
-      def json?(data)
-        data = String(data)
-        parser = FFI_Yajl::Parser.new
-        begin
-          parser.parse(data)
-          true
-        rescue FFI_Yajl::ParseError
-          false
+          logger.warn("Mixin GCEMetadata: Received response code #{response.code} requesting metadata for id='#{id}'")
+          nil
         end
       end
 

data/lib/ohai/mixin/json_helper.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+#
+# Author:: Renato Covarrubias (<rnt@rnt.cl>)
+# 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.
+
+module Ohai
+  module Mixin
+    module JsonHelper
+      # parse JSON data from a String to a Hash
+      #
+      # @param [String] response_body json as string to parse
+      # @param [Object] return_on_parse_error value to return if parsing fails
+      #
+      # @return [Hash]
+      def parse_json(response_body, return_on_parse_error = nil)
+        data = String(response_body)
+        parser = FFI_Yajl::Parser.new
+        parser.parse(data)
+      rescue FFI_Yajl::ParseError
+        return_on_parse_error
+      end
+    end
+  end
+end

data/lib/ohai/mixin/oci_metadata.rb

@@ -18,6 +18,9 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     module OCIMetadata
@@ -38,27 +41,15 @@ module Ohai
         )
       end
 
-      # parse JSON data from a String to a Hash
-      #
-      # @param [String] response_body json as string to parse
-      #
-      # @return [Hash]
-      def parse_json(response_body)
-        data = String(response_body)
-        parser = FFI_Yajl::Parser.new
-        parser.parse(data)
-      rescue FFI_Yajl::ParseError
-        logger.warn("Mixin OciMetadata: Metadata response is NOT valid JSON")
-        nil
-      end
-
       # Fetch metadata from api
       def fetch_metadata(metadata = "instance")
         response = http_get("#{OCI_METADATA_URL}/#{metadata}")
-        return nil unless response.code == "200"
-
         if response.code == "200"
-          parse_json(response.body)
+          json_data = parse_json(response.body)
+          if json_data.nil?
+            logger.warn("Mixin OciMetadata: Metadata response is NOT valid JSON")
+          end
+          json_data
         else
           logger.warn("Mixin OciMetadata: Received response code #{response.code} requesting metadata")
           nil

data/lib/ohai/plugins/linux/block_device.rb

@@ -31,7 +31,7 @@ Ohai.plugin(:BlockDevice) do
             file_open("/sys/block/#{dir}/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end
         end
-        %w{model rev state timeout vendor queue_depth}.each do |check|
+        %w{model rev state timeout vendor queue_depth firmware_rev}.each do |check|
           if file_exist?("/sys/block/#{dir}/device/#{check}")
             file_open("/sys/block/#{dir}/device/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "18.1.0"
+  VERSION = "18.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 18.1.0
+  version: 18.1.3
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -240,6 +240,7 @@ files:
 - lib/ohai/mixin/ec2_metadata.rb
 - lib/ohai/mixin/gce_metadata.rb
 - lib/ohai/mixin/http_helper.rb
+- lib/ohai/mixin/json_helper.rb
 - lib/ohai/mixin/network_helper.rb
 - lib/ohai/mixin/oci_metadata.rb
 - lib/ohai/mixin/os.rb