lib/ohai/mixin/ec2_metadata.rb in ohai-15.1.5 vs lib/ohai/mixin/ec2_metadata.rb in ohai-15.2.5

@@ -66,10 +66,11 @@
           end
           logger.trace("Mixin EC2: Latest supported EC2 metadata version: #{versions.last}")
           if versions.empty?
             raise "Mixin EC2: Unable to determine EC2 metadata version (no supported entries found)"
           end
+
           versions.last
         end
       end
 
       # a net/http client with a timeout of 10s and a keepalive of 10s
@@ -132,11 +133,11 @@
           metadata
         end
       end
 
       def fetch_dir_metadata(id, api_version)
-        metadata = Hash.new
+        metadata = {}
         retrieved_metadata = metadata_get(id, api_version)
         if retrieved_metadata
           retrieved_metadata.split("\n").each do |o|
             key = expand_path(o)
             if key[-1..-1] != "/"
@@ -193,14 +194,14 @@
       def expand_path(file_name)
         path = file_name.gsub(/\=.*$/, "/")
         # ignore "./" and "../"
         path.gsub(%r{/\.\.?(?:/|$)}, "/")
           .sub(%r{^\.\.?(?:/|$)}, "")
-          .sub(%r{^$}, "/")
+          .sub(/^$/, "/")
       end
 
       def metadata_key(key)
-        key.gsub(/\-|\//, "_")
+        key.gsub(%r{\-|/}, "_")
       end
 
     end
   end
 end