calling CName constructor with the commit parameter

Author: vivus-ignis

src/gardenlinux/github/release_notes/helpers.py

@@ -64,7 +64,7 @@ def download_all_metadata_files(version, commitish, s3_bucket_name):
     commitish_short = commitish[:8]
 
     for flavor in flavors:
-        cname = CName(flavor[1], flavor[0], "{0}-{1}".format(version, commitish_short))
+        cname = CName(flavor[1], flavor[0], commitish_short)
         LOGGER.debug(f"{flavor=} {version=} {commitish=}")
         # Filter by image variants - only download if the flavor matches one of the variants
         flavor_matches_variant = False

tests/github/test_download_metadata_files.py

@@ -23,11 +23,7 @@ def test_download_metadata_file(downloads_dir, release_s3_bucket):
     s3_artifacts = S3Artifacts(TEST_GARDENLINUX_RELEASE_BUCKET_NAME)
     s3_artifacts._bucket = release_s3_bucket
 
-    cname = CName(
-        "test-aws-gardener_prod",
-        "amd64",
-        "{0}-{1}".format(TEST_GARDENLINUX_RELEASE, TEST_GARDENLINUX_COMMIT_SHORT),
-    )
+    cname = CName("test-aws-gardener_prod", "amd64", TEST_GARDENLINUX_COMMIT_SHORT)
     download_metadata_file(
         s3_artifacts,
         cname.cname,
@@ -48,7 +44,7 @@ def test_download_metadata_file_no_such_release(downloads_dir, release_s3_bucket
 
     release = "0000.0"
     commit = TEST_GARDENLINUX_COMMIT_SHORT
-    cname = CName("aws-gardener_prod", "amd64", "{0}-{1}".format(release, commit))
+    cname = CName("aws-gardener_prod", "amd64", commit)
 
     with pytest.raises(IndexError):
         download_metadata_file(
@@ -70,7 +66,7 @@ def test_download_metadata_file_no_such_commit(downloads_dir, release_s3_bucket)
 
     release = TEST_GARDENLINUX_RELEASE
     commit = "deadbeef"
-    cname = CName("test-aws-gardener_prod", "amd64", "{0}-{1}".format(release, commit))
+    cname = CName("test-aws-gardener_prod", "amd64", commit)
 
     with pytest.raises(IndexError):
         download_metadata_file(
@@ -94,7 +90,7 @@ def test_download_metadata_file_no_such_release_and_commit(
 
     release = "0000.0"
     commit = "deadbeef"
-    cname = CName("test-aws-gardener_prod", "amd64", "{0}-{1}".format(release, commit))
+    cname = CName("test-aws-gardener_prod", "amd64", commit)
 
     with pytest.raises(IndexError):
         download_metadata_file(