Resolve new chefstyle warnings

Signed-off-by: Tim Smith <tsmith@chef.io>
chef · Aug 25, 2020 · fe80025 · fe80025
1 parent 654df04
commit fe80025
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/ohai/plugins/ec2.rb b/lib/ohai/plugins/ec2.rb
@@ -114,7 +114,7 @@ def looks_like_ec2?
   end
 
   collect_data do
-    require "base64"
+    require "base64" unless defined?(Base64)
 
     if looks_like_ec2?
       logger.trace("Plugin EC2: looks_like_ec2? == true")

diff --git a/lib/ohai/plugins/shard.rb b/lib/ohai/plugins/shard.rb
@@ -52,7 +52,7 @@ def default_digest_algorithm
   def digest_algorithm
     case Ohai.config[:plugin][:shard_seed][:digest_algorithm] || default_digest_algorithm
     when "md5"
-      require "digest/md5"
+      require "digest/md5" unless defined?(Digest::MD5)
       Digest::MD5
     when "sha256"
       require "openssl/digest"