Fix bug preventing to upload RHCOS images

This commit fixes an issue with the `tags` param on `AWSService` which was sending it to `cloudimg.copy_ami` that doesn't support it.
release-engineering · Jul 15, 2024 · ddc10b5 · ddc10b5
1 parent 9cf1a8f
commit ddc10b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/pubtools/_marketplacesvm/cloud_providers/aws.py b/src/pubtools/_marketplacesvm/cloud_providers/aws.py
@@ -18,6 +18,7 @@
 from .base import UPLOAD_CONTAINER_NAME, CloudCredentials, CloudProvider, register_provider
 
 LOG = logging.getLogger("pubtools.marketplacesvm")
+UploadResult = namedtuple("UploadResult", "id")  # NOSONAR
 
 
 def name_from_push_item(push_item: AmiPushItem) -> str:
@@ -270,8 +271,6 @@ def _copy_image_from_ami_catalog(self, push_item: AmiPushItem, tags: Dict[str, s
         img = upload_svc.get_image_from_ami_catalog(push_item.src)
         if img is None:
             raise RuntimeError("AMI not found.")
-        # Create a named tuple to store the ami-id of image
-        UploadResult = namedtuple("UploadResult", "id")  # NOSONAR
 
         # Search if the AMI is already in the Account
         ami = upload_svc.get_image_by_name(push_item.build)
@@ -285,9 +284,9 @@ def _copy_image_from_ami_catalog(self, push_item: AmiPushItem, tags: Dict[str, s
                 image_id=push_item.src,
                 image_name=push_item.build,
                 image_region=push_item.region,
-                tags=tags,
             )
             result = UploadResult(copy_result["ImageId"])
+        upload_svc.tag_image(result.id, tags)
         return result
 
     def _upload(

diff --git a/tests/cloud_providers/test_provider_aws.py b/tests/cloud_providers/test_provider_aws.py
@@ -256,8 +256,8 @@ def test_upload_of_rhcos_image(
     fake_aws_provider.upload_svc_partial.return_value.get_image_from_ami_catalog.assert_called_once()  # type: ignore [attr-defined] # noqa: E501
     fake_aws_provider.upload_svc_partial.return_value.get_image_by_name.assert_called_once()  # type: ignore [attr-defined] # noqa: E501
     fake_aws_provider.upload_svc_partial.return_value.copy_ami.assert_called_once()  # type: ignore [attr-defined] # noqa: E501
-    assert (
-        tags == fake_aws_provider.upload_svc_partial.return_value.copy_ami.call_args.kwargs["tags"]
+    fake_aws_provider.upload_svc_partial.return_value.tag_image.assert_called_once_with(
+        "fake-ami-02", tags
     )