From 7cf5af5debad05921bcb9f2d6cba6860e2148145 Mon Sep 17 00:00:00 2001
From: Jiri Hnidek <jhnidek@redhat.com>
Date: Mon, 8 Apr 2024 14:34:09 +0200
Subject: [PATCH] feat: 1.28 Added more AWS cloud facts

* Backport to 1.28 branch
* Original PR: #3387
  * Original commit: df5776aa3debac8fff3fe795ca5701cdbf879aec
* Card Id: CCT-366
* Added two options "aws_region" and "aws_instance_type" to cloud
  facts to be able to provide better business intelligence
* Extended unit tests
---
 src/rhsmlib/facts/cloud_facts.py      | 6 ++++++
 test/rhsmlib_test/test_cloud_facts.py | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/src/rhsmlib/facts/cloud_facts.py b/src/rhsmlib/facts/cloud_facts.py
index 8644bda131..5a7870321d 100644
--- a/src/rhsmlib/facts/cloud_facts.py
+++ b/src/rhsmlib/facts/cloud_facts.py
@@ -102,6 +102,12 @@ def get_aws_facts(self):
                 else:
                     log.debug('AWS metadata attribute marketplaceProductCodes has to be list or null')
 
+            if "instanceType" in values:
+                facts["aws_instance_type"] = values["instanceType"]
+
+            if "region" in values:
+                facts["aws_region"] = values["region"]
+
         return facts
 
     def get_azure_facts(self):
diff --git a/test/rhsmlib_test/test_cloud_facts.py b/test/rhsmlib_test/test_cloud_facts.py
index 50012675bc..3fcbd90728 100644
--- a/test/rhsmlib_test/test_cloud_facts.py
+++ b/test/rhsmlib_test/test_cloud_facts.py
@@ -152,6 +152,9 @@
 AWS_INSTANCE_ID = "i-abcdef01234567890"
 AWS_ACCOUNT_ID = "012345678900"
 AWS_BILLING_PRODUCTS = "bp-0124abcd bp-63a5400a"
+AWS_INSTANCE_TYPE = "m5.large"
+AWS_REGION = "eu-central-1"
+
 # The Azure instance ID has to be the same as "vmId" in AZURE_METADATA
 # values for "sku" an "offer" has to be same as in AZURE_METADATA
 AZURE_INSTANCE_ID = "12345678-1234-1234-1234-123456789abc"
@@ -225,6 +228,10 @@ def test_get_aws_facts(self, mock_session_class):
         self.assertEqual(facts["aws_billing_products"], AWS_BILLING_PRODUCTS)
         self.assertIn("aws_marketplace_product_codes", facts)
         self.assertEqual(facts["aws_marketplace_product_codes"], None)
+        self.assertIn("aws_instance_type", facts)
+        self.assertEqual(facts["aws_instance_type"], AWS_INSTANCE_TYPE)
+        self.assertIn("aws_region", facts)
+        self.assertEqual(facts["aws_region"], AWS_REGION)
 
     @patch('cloud_what.providers.aws.requests.Session', name='mock_session_class')
     def test_get_aws_facts_with_null_billing_products(self, mock_session_class):