summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-08-25 15:50:23 -0700
committerTim Smith <tsmith84@gmail.com>2020-08-25 15:50:23 -0700
commitfe800255fda66386c3ea96b2120b62d13a6abd69 (patch)
tree44d3e3f36cb7634960d2c30b09fd411f31bf1975
parent654df0481f3c35c027a9afc313c74583f3d4112f (diff)
downloadohai-fe800255fda66386c3ea96b2120b62d13a6abd69.tar.gz
Resolve new chefstyle warnings
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/ohai/plugins/ec2.rb2
-rw-r--r--lib/ohai/plugins/shard.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ohai/plugins/ec2.rb b/lib/ohai/plugins/ec2.rb
index b4fb735e..c526a37b 100644
--- a/lib/ohai/plugins/ec2.rb
+++ b/lib/ohai/plugins/ec2.rb
@@ -114,7 +114,7 @@ Ohai.plugin(:EC2) do
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
index cf7641b0..bfd07212 100644
--- a/lib/ohai/plugins/shard.rb
+++ b/lib/ohai/plugins/shard.rb
@@ -52,7 +52,7 @@ Ohai.plugin(:ShardSeed) do
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"