Merge pull request #555 from Alex-Izquierdo/fix-digest

fix: move digest label to the repository instead of tag

Author: openshift-merge-bot[bot]

podman/api/parse_utils.py

@@ -13,17 +13,12 @@
 
 
 def parse_repository(name: str) -> tuple[str, Optional[str]]:
-    """Parse repository image name from tag or digest
+    """Parse repository image name from tag.
 
     Returns:
         item 1: repository name
-        item 2: Either digest and tag, tag, or None
+        item 2: Either tag or None
     """
-    # split image name and digest
-    elements = name.split("@", 1)
-    if len(elements) == 2:
-        return elements[0], elements[1]
-
     # split repository and image name from tag
     # tags need to be split from the right since
     # a port number might increase the split list len by 1

podman/domain/registry_data.py

@@ -40,7 +40,7 @@ def pull(self, platform: Optional[str] = None) -> Image:
         Args:
             platform: Platform for which to pull Image. Default: None (all platforms.)
         """
-        repository = api.parse_repository(self.image_name)
+        repository, _ = api.parse_repository(self.image_name)
         return self.manager.pull(repository, tag=self.id, platform=platform)
 
     def has_platform(self, platform: Union[str, Mapping[str, Any]]) -> bool:

podman/tests/unit/test_parse_utils.py

@@ -29,29 +29,39 @@ class TestCase:
             ),
             TestCase(
                 name="@digest",
-                input="quay.io/libpod/testimage@71f1b47263fc",
-                expected=("quay.io/libpod/testimage", "71f1b47263fc"),
+                input="quay.io/libpod/testimage@sha256:71f1b47263fc",
+                expected=("quay.io/libpod/testimage@sha256", "71f1b47263fc"),
             ),
             TestCase(
                 name=":tag",
                 input="quay.io/libpod/testimage:latest",
                 expected=("quay.io/libpod/testimage", "latest"),
             ),
+            TestCase(
+                name=":tag@digest",
+                input="quay.io/libpod/testimage:latest@sha256:71f1b47263fc",
+                expected=("quay.io/libpod/testimage:latest@sha256", "71f1b47263fc"),
+            ),
             TestCase(
                 name=":port",
                 input="quay.io:5000/libpod/testimage",
                 expected=("quay.io:5000/libpod/testimage", None),
             ),
             TestCase(
                 name=":port@digest",
-                input="quay.io:5000/libpod/testimage@71f1b47263fc",
-                expected=("quay.io:5000/libpod/testimage", "71f1b47263fc"),
+                input="quay.io:5000/libpod/testimage@sha256:71f1b47263fc",
+                expected=("quay.io:5000/libpod/testimage@sha256", "71f1b47263fc"),
             ),
             TestCase(
                 name=":port:tag",
                 input="quay.io:5000/libpod/testimage:latest",
                 expected=("quay.io:5000/libpod/testimage", "latest"),
             ),
+            TestCase(
+                name=":port:tag:digest",
+                input="quay.io:5000/libpod/testimage:latest@sha256:71f1b47263fc",
+                expected=("quay.io:5000/libpod/testimage:latest@sha256", "71f1b47263fc"),
+            ),
         ]
 
         for case in cases: