Merge pull request #2106 from nwops/ec2

(FACT-2816) - Fix ec2 fact issues when on non ec2 systems
puppetlabs · Sep 28, 2020 · 0a2f78f · 0a2f78f
2 parents cc54da5 + f69c181
commit 0a2f78f
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/lib/facter/facts/linux/ec2_metadata.rb b/lib/facter/facts/linux/ec2_metadata.rb
@@ -35,7 +35,8 @@ def check_product_name
         product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
         return unless product_name
 
-        Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+        _, value = Facter::FactsUtils::HYPERVISORS_HASH.find { |key, _value| product_name.include?(key) }
+        value
       end
 
       def check_bios_vendor

diff --git a/lib/facter/facts/linux/ec2_userdata.rb b/lib/facter/facts/linux/ec2_userdata.rb
@@ -33,7 +33,8 @@ def check_product_name
         product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
         return unless product_name
 
-        Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+        _, value = Facter::FactsUtils::HYPERVISORS_HASH.find { |key, _value| product_name.include?(key) }
+        value
       end
 
       def check_bios_vendor

diff --git a/spec/facter/facts/linux/ec2_metadata_spec.rb b/spec/facter/facts/linux/ec2_metadata_spec.rb
@@ -13,6 +13,25 @@
       allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
     end
 
+    context 'when physical machine with no hypervisor' do
+      let(:hypervisor) { nil }
+      let(:value) { nil }
+
+      before do
+        allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:product_name).and_return('MS-7A71')
+      end
+
+      it 'returns ec2 metadata fact as nil' do
+        expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
+          have_attributes(name: 'ec2_metadata', value: nil)
+      end
+
+      it "doesn't call Ec2 resolver" do
+        fact.call_the_resolver
+        expect(Facter::Resolvers::Ec2).not_to have_received(:resolve).with(:metadata)
+      end
+    end
+
     context 'when hypervisor is not kvm or xen' do
       let(:hypervisor) { nil }
       let(:value) { nil }

diff --git a/spec/facter/facts/linux/ec2_userdata_spec.rb b/spec/facter/facts/linux/ec2_userdata_spec.rb
@@ -13,6 +13,25 @@
       allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
     end
 
+    context 'when physical machine with no hypervisor' do
+      let(:hypervisor) { nil }
+      let(:value) { nil }
+
+      before do
+        allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:product_name).and_return('MS-7A71')
+      end
+
+      it 'returns ec2 metadata fact as nil' do
+        expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
+          have_attributes(name: 'ec2_userdata', value: nil)
+      end
+
+      it "doesn't call Ec2 resolver" do
+        fact.call_the_resolver
+        expect(Facter::Resolvers::Ec2).not_to have_received(:resolve).with(:userdata)
+      end
+    end
+
     context 'when hypervisor is not kvm or xen' do
       let(:hypervisor) { nil }
       let(:value) { nil }