Merge pull request #1553 from chef/memory

Signed-off-by: Tim Smith <[email protected]>
chef · Nov 2, 2020 · e0253e8 · e0253e8
2 parents 7557513 + 459a00a
commit e0253e8
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 17 deletions.
diff --git a/lib/ohai/plugins/elixir.rb b/lib/ohai/plugins/elixir.rb
@@ -15,7 +15,7 @@
 
 Ohai.plugin(:Elixir) do
   provides "languages/elixir"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/eucalyptus.rb b/lib/ohai/plugins/eucalyptus.rb
@@ -29,6 +29,8 @@
   provides "eucalyptus"
   depends "network/interfaces"
 
+  MAC_MATCH = /^[dD]0:0[dD]:/.freeze
+
   # returns the mac address from the collection of all address types
   def get_mac_address(addresses)
     detected_addresses = addresses.detect { |address, keypair| keypair == { "family" => "lladdr" } }
@@ -43,7 +45,7 @@ def get_mac_address(addresses)
   def has_euca_mac?
     network[:interfaces].each_value do |iface|
       mac = get_mac_address(iface[:addresses])
-      if /^[dD]0:0[dD]:/.match?(mac)
+      if MAC_MATCH.match?(mac)
         logger.trace("Plugin Eucalyptus: has_euca_mac? == true (#{mac})")
         return true
       end

diff --git a/lib/ohai/plugins/filesystem.rb b/lib/ohai/plugins/filesystem.rb
@@ -24,7 +24,7 @@
 #
 
 Ohai.plugin(:Filesystem) do
-  provides "filesystem"
+  provides "filesystem".freeze
 
   def find_device(name)
     %w{/dev /dev/mapper}.each do |dir|

diff --git a/lib/ohai/plugins/go.rb b/lib/ohai/plugins/go.rb
@@ -15,7 +15,7 @@
 
 Ohai.plugin(:Go) do
   provides "languages/go"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/groovy.rb b/lib/ohai/plugins/groovy.rb
@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Groovy) do
   provides "languages/groovy"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/lua.rb b/lib/ohai/plugins/lua.rb
@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Lua) do
   provides "languages/lua"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/mono.rb b/lib/ohai/plugins/mono.rb
@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Mono) do
   provides "languages/mono"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/nodejs.rb b/lib/ohai/plugins/nodejs.rb
@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Nodejs) do
   provides "languages/nodejs"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/perl.rb b/lib/ohai/plugins/perl.rb
@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Perl) do
   provides "languages/perl"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/php.rb b/lib/ohai/plugins/php.rb
@@ -20,7 +20,7 @@
 
 Ohai.plugin(:PHP) do
   provides "languages/php"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/powershell.rb b/lib/ohai/plugins/powershell.rb
@@ -17,7 +17,7 @@
 
 Ohai.plugin(:Powershell) do
   provides "languages/powershell"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data(:windows) do
 

diff --git a/lib/ohai/plugins/python.rb b/lib/ohai/plugins/python.rb
@@ -19,7 +19,7 @@
 Ohai.plugin(:Python) do
   provides "languages/python"
 
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/rackspace.rb b/lib/ohai/plugins/rackspace.rb
@@ -26,7 +26,7 @@
   # true:: If kernel name matches
   # false:: Otherwise
   def has_rackspace_kernel?
-    kernel[:release].split("-").last.eql?("rscloud")
+    kernel[:release].end_with?("-rscloud")
   end
 
   # Checks for rackspace provider attribute

diff --git a/lib/ohai/plugins/ruby.rb b/lib/ohai/plugins/ruby.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<[email protected]>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -48,13 +49,13 @@ def run_ruby(command)
     }
 
     # Create a query string from above hash
-    env_string = ""
+    env_string = []
     values.each_key do |v|
       env_string << "#{v}=\#{#{values[v]}},"
     end
 
     # Query the system ruby
-    result = run_ruby "require 'rubygems'; puts %Q(#{env_string})"
+    result = run_ruby "require 'rubygems'; puts %Q(#{env_string.join})"
 
     # Parse results to plugin hash
     result.split(",").each do |entry|

diff --git a/lib/ohai/plugins/rust.rb b/lib/ohai/plugins/rust.rb
@@ -15,7 +15,7 @@
 
 Ohai.plugin(:Rust) do
   provides "languages/rust"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

diff --git a/lib/ohai/plugins/shard.rb b/lib/ohai/plugins/shard.rb
@@ -18,7 +18,7 @@
 
 Ohai.plugin(:ShardSeed) do
   depends "hostname", "dmi", "machine_id", "machinename", "fips", "hardware", "kernel"
-  provides "shard_seed"
+  provides "shard_seed".freeze
 
   def get_dmi_property(dmi, thing)
     %w{system base_board chassis}.each do |section|