lib/facter/facts/linux/ec2_userdata.rb in facter-4.0.35 vs lib/facter/facts/linux/ec2_userdata.rb in facter-4.0.36
- old
+ new
@@ -4,17 +4,19 @@
module Linux
class Ec2Userdata
FACT_NAME = 'ec2_userdata'
def call_the_resolver
- return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws?
+ return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws_hypervisors?
fact_value = Facter::Resolvers::Ec2.resolve(:userdata)
- Facter::ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value)
+ Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
end
- def aws?
+ private
+
+ def aws_hypervisors?
virtual = check_virt_what || check_xen || check_product_name || check_bios_vendor || check_lspci
virtual == 'kvm' || virtual =~ /xen/
end