Merge pull request #569 from jajreidy/fix-clouds-json-parse

Fixes parsing of clouds.json file.
release-engineering · Aug 20, 2024 · 795bcf5 · 795bcf5
2 parents 18f8c60 + 4c17cd3
commit 795bcf5
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/pushsource/_impl/model/ami.py b/src/pushsource/_impl/model/ami.py
@@ -218,6 +218,7 @@ def _from_data(cls, data):
         kwargs = {
             # base push item fields
             "name": data["name"],
+            "build": data.get("build") or None,
             "state": "PENDING",
             "src": data.get("src") or None,
             "dest": data.get("dest") or [],
@@ -241,7 +242,7 @@ def _from_data(cls, data):
                 if data.get("billing_codes")
                 else None
             ),
-            "image_id": data.get("ami") or None,
+            "image_id": data.get("ami") or data.get("image_id") or None,
             "public_image": data.get("public_image"),
             "release_notes": data.get("release_notes") or None,
             "usage_instructions": data.get("usage_instructions") or None,

diff --git a/tests/pub/test_pub_amis.py b/tests/pub/test_pub_amis.py
@@ -12,6 +12,7 @@
     AmiRelease,
     Source,
     AmiSecurityGroup,
+    KojiBuildInfo,
 )
 
 DATAPATH = os.path.join(os.path.dirname(__file__), "data")
@@ -131,6 +132,14 @@ def test_get_ami_push_items_single_task_clouds(requests_mock):
             state="PENDING",
             src="/test/path/packages/rhel-sap-ec2/8.8/2116/images/rhel-sap-ec2-8.8-2116.x86_64.raw.xz",
             dest=["test-dest"],
+            image_id="ami-test",
+            build="rhel-sap-ec2-8.8-2116",
+            build_info=KojiBuildInfo(
+                name="rhel-sap-ec2",
+                version="8.8",
+                release="2116",
+                id=None,
+            ),
             release=AmiRelease(
                 product="RHEL-SAP",
                 date="20240717",
@@ -194,6 +203,14 @@ def test_get_ami_push_items_rhcos_task_cloud(requests_mock):
             state="PENDING",
             src="/test/path/packages/rhel-sap-ec2/8.8/2116/images/rhel-sap-ec2-8.8-2116.x86_64.raw.xz",
             dest=["test-dest"],
+            image_id="ami-test",
+            build="rhel-sap-ec2-8.8-2116",
+            build_info=KojiBuildInfo(
+                name="rhel-sap-ec2",
+                version="8.8",
+                release="2116",
+                id=None,
+            ),
             release=AmiRelease(
                 product="RHEL-SAP",
                 date="20240717",
@@ -224,6 +241,14 @@ def test_get_ami_push_items_rhcos_task_cloud(requests_mock):
             state="PENDING",
             src="/test/path/packages/rhel-sap-ec2/8.8/2116/images/rhel-sap-ec2-8.8-2116.x86_64.raw.xz",
             dest=["test-dest2"],
+            build="rhel-sap-ec2-8.8-2116",
+            build_info=KojiBuildInfo(
+                name="rhel-sap-ec2",
+                version="8.8",
+                release="2116",
+                id=None,
+            ),
+            image_id="ami-test",
             release=AmiRelease(
                 product="RHEL-SAP",
                 date="20240717",
@@ -254,6 +279,14 @@ def test_get_ami_push_items_rhcos_task_cloud(requests_mock):
             state="PENDING",
             src="/test/path/packages/rhel-ec2/8.8/2175/images/rhel-ec2-8.8-2175.x86_64.raw.xz",
             dest=["testb"],
+            build="rhel-ec2-8.8-2175",
+            build_info=KojiBuildInfo(
+                name="rhel-ec2",
+                version="8.8",
+                release="2175",
+                id=None,
+            ),
+            image_id="ami-test",
             release=AmiRelease(
                 product="RHEL",
                 date="20240717",