[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/pushsource/_impl/backend/staged/staged_cloud.py

@@ -2,13 +2,24 @@
 import os
 import yaml
 
+from datetime import datetime, timezone
+
 from .staged_base import StagedBaseMixin, handles_type
-from ...model import VHDPushItem, AmiPushItem, AmiRelease, BootMode, KojiBuildInfo
+from ...model import VHDPushItem, VMIRelease, AmiPushItem, AmiRelease, BootMode, KojiBuildInfo
 
 LOG = logging.getLogger("pushsource")
 
 
 class StagedCloudMixin(StagedBaseMixin):
+    def __get_product_name(self, base_name):
+        splitted_name = base_name.split("-")
+        if len(splitted_name) > 1:
+            product = "-".join(splitted_name[:-1])
+        else:
+            product = splitted_name[0]
+        return product
+
+
     def __build_ami_push_item(self, resources, origin, image, dest):
         build_resources = resources.get("build")
         release_resources = resources.get("release") or {}
@@ -38,24 +49,23 @@ def __build_ami_push_item(self, resources, origin, image, dest):
             }
         )
 
-        release_required = ["product", "date", "arch", "respin"]
-        if all(x in release_resources.keys() for x in release_required):
-            release_attrs = [
-                "product",
-                "date",
-                "arch",
-                "respin",
-                "version",
-                "base_product",
-                "base_version",
-                "variant",
-                "type",
-            ]
-            release_kwargs = {}
-            for key in release_attrs:
-                release_kwargs[key] = release_resources.get(key)
-
-            image_kwargs["release"] = AmiRelease(**release_kwargs)
+        release_kwargs = {
+            "product": self.__get_product_name(build_resources.get("name")),
+            "date": datetime.now(timezone.utc).strftime("%Y%m%d"),
+            "arch": image.get("architecture"),
+            "respin": int(build_resources.get("respin")) or 0
+        }
+        release_attrs = [
+            "version",
+            "base_product",
+            "base_version",
+            "variant",
+            "type",
+        ]
+        for key in release_attrs:
+            release_kwargs[key] = release_resources.get(key)
+
+        image_kwargs["release"] = AmiRelease(**release_kwargs)
 
         image_attrs = [
             "type",
@@ -95,6 +105,14 @@ def __build_azure_push_item(self, resources, origin, image, dest):
             version=build_resources.get("version"),
             release=build_resources.get("respin"),
         )
+
+        release_kwargs = {
+            "product": self.__get_product_name(build_resources.get("name")),
+            "date": datetime.now(timezone.utc).strftime("%Y%m%d"),
+            "arch": image.get("architecture"),
+            "respin": int(build_resources.get("respin")) or 0
+        }
+
         image_kwargs = {
             "name": name,
             "src": src,
@@ -103,6 +121,7 @@ def __build_azure_push_item(self, resources, origin, image, dest):
             "origin": origin,
             "dest": [dest],
             "sha256sum": image.get("sha256sum"),
+            "release": VMIRelease(**release_kwargs)
         }
         return VHDPushItem(**image_kwargs)
 
@@ -127,14 +146,10 @@ def __cloud_push_item(self, leafdir, _, entry):
                 return
             if image_type == "AMI":
                 out.append(
-                    self.__build_ami_push_item(
-                        raw, entry.path, image, leafdir.dest
-                    )
+                    self.__build_ami_push_item(raw, entry.path, image, leafdir.dest)
                 )
             elif image_type == "VHD":
                 out.append(
-                    self.__build_azure_push_item(
-                        raw, entry.path, image, leafdir.dest
-                    )
+                    self.__build_azure_push_item(raw, entry.path, image, leafdir.dest)
                 )
         return out

tests/baseline/cases/staged-simple-cloud.yml

@@ -32,7 +32,16 @@ items:
     public_image: null
     recommended_instance_type: null
     region: null
-    release: null
+    release:
+      arch: x86_64
+      base_product: null
+      base_version: null
+      date: 2024-10-31
+      product: rhel
+      respin: 1
+      type: null
+      variant: null
+      version: null
     release_notes: null
     root_device: null
     scanning_port: null
@@ -73,7 +82,16 @@ items:
     public_image: null
     recommended_instance_type: null
     region: null
-    release: null
+    release:
+      arch: arm64
+      base_product: null
+      base_version: null
+      date: 2024-10-31
+      product: rhel
+      respin: 1
+      type: null
+      variant: null
+      version: null
     release_notes: null
     root_device: null
     scanning_port: null
@@ -118,8 +136,8 @@ items:
       arch: x86_64
       base_product: null
       base_version: null
-      date: 2020-05-11
-      product: Fake-Product
+      date: 2024-10-31
+      product: rhel
       respin: 1
       type: ga
       variant: Fake-Variant
@@ -160,7 +178,16 @@ items:
     name: something1.raw.xz
     origin: {{ src_dir }}/tests/staged/data/simple_cloud/starmap/CLOUD_IMAGES/build1
     recommended_sizes: []
-    release: null
+    release:
+      arch: x86_64
+      base_product: null
+      base_version: null
+      date: 2024-10-31
+      product: rhel
+      respin: 1
+      type: null
+      variant: null
+      version: null
     sas_uri: null
     sha256sum: 04db0c39efb31518ff79bf98d1c27256d46cdc72b967a5b2094a6efec3166df2
     signing_key: null
@@ -188,7 +215,16 @@ items:
     name: something2.raw.xz
     origin: {{ src_dir }}/tests/staged/data/simple_cloud/starmap/CLOUD_IMAGES/build1
     recommended_sizes: []
-    release: null
+    release:
+      arch: arm64
+      base_product: null
+      base_version: null
+      date: 2024-10-31
+      product: rhel
+      respin: 1
+      type: null
+      variant: null
+      version: null
     sas_uri: null
     sha256sum: 04db0c39efb31518ff79bf98d1c27256d46cdc72b967a5b2094a6efec3166df2
     signing_key: null