[ACR] Just accept digest in delete_blob() (Azure#29548)

Author: Yalin Li

sdk/containerregistry/azure-containerregistry/CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Features Added
 
 ### Breaking Changes
+- Suppress the response error with status code `404` in `delete_blob()`. 
 
 ### Bugs Fixed
 
@@ -17,11 +18,11 @@
 - Fixed a `TypeError` when call `list_manifest()` in an empty repository. ([#28432](https://github.com/Azure/azure-sdk-for-python/issues/28432))
 
 ### Other Changes
-* Added default value `"https://management.azure.com"` to kwarg `audience` in `ContainerRegistryClient`. ([#22229](https://github.com/Azure/azure-sdk-for-python/issues/22229))
-* Python 3.6 is no longer supported. Please use Python version 3.7 or later.
-* Bumped minimum dependency on `azure-core` to `>=1.24.0`
-* Dropped `msrest` requirement.
-* Added dependency `isodate` with version range `>=0.6.0`(`isodate` was required by `msrest`).
+- Added default value `"https://management.azure.com"` to kwarg `audience` in `ContainerRegistryClient`. ([#22229](https://github.com/Azure/azure-sdk-for-python/issues/22229))
+- Python 3.6 is no longer supported. Please use Python version 3.7 or later.
+- Bumped minimum dependency on `azure-core` to `>=1.24.0`
+- Dropped `msrest` requirement.
+- Added dependency `isodate` with version range `>=0.6.0`(`isodate` was required by `msrest`).
 
 ## 1.1.0b1 (2022-05-10)
 

sdk/containerregistry/azure-containerregistry/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/containerregistry/azure-containerregistry",
-  "Tag": "python/containerregistry/azure-containerregistry_ea5ba77c3e"
+  "Tag": "python/containerregistry/azure-containerregistry_b29296432a"
 }

sdk/containerregistry/azure-containerregistry/azure/containerregistry/_container_registry_client.py

@@ -1020,14 +1020,13 @@ def delete_manifest(self, repository: str, tag_or_digest: str, **kwargs) -> None
         self._client.container_registry.delete_manifest(repository, tag_or_digest, **kwargs)
 
     @distributed_trace
-    def delete_blob(self, repository: str, tag_or_digest: str, **kwargs) -> None:
+    def delete_blob(self, repository: str, digest: str, **kwargs) -> None:
         """Delete a blob. If the blob cannot be found or a response status code of
         404 is returned an error will not be raised.
 
         :param str repository: Name of the repository the manifest belongs to
-        :param str tag_or_digest: Tag or digest of the blob to be deleted
+        :param str digest: Digest of the blob to be deleted
         :returns: None
-        :raises: ~azure.core.exceptions.HttpResponseError
 
         Example
 
@@ -1037,9 +1036,11 @@ def delete_blob(self, repository: str, tag_or_digest: str, **kwargs) -> None:
             from azure.identity import DefaultAzureCredential
             endpoint = os.environ["CONTAINERREGISTRY_ENDPOINT"]
             client = ContainerRegistryClient(endpoint, DefaultAzureCredential(), audience="my_audience")
-            client.delete_blob("my_repository", "my_tag_or_digest")
+            client.delete_blob("my_repository", "my_digest")
         """
-        if _is_tag(tag_or_digest):
-            tag_or_digest = self._get_digest_from_tag(repository, tag_or_digest)
-
-        self._client.container_registry_blob.delete_blob(repository, tag_or_digest, **kwargs)
+        try:
+            self._client.container_registry_blob.delete_blob(repository, digest, **kwargs)
+        except HttpResponseError as error:
+            if error.status_code == 404:
+                return
+            raise

sdk/containerregistry/azure-containerregistry/azure/containerregistry/aio/_async_container_registry_client.py

@@ -864,3 +864,29 @@ async def delete_manifest(self, repository: str, tag_or_digest: str, **kwargs) -
             tag_or_digest = await self._get_digest_from_tag(repository, tag_or_digest)
 
         await self._client.container_registry.delete_manifest(repository, tag_or_digest, **kwargs)
+
+    @distributed_trace_async
+    async def delete_blob(self, repository: str, digest: str, **kwargs) -> None:
+        """Delete a blob. If the blob cannot be found or a response status code of
+        404 is returned an error will not be raised.
+
+        :param str repository: Name of the repository the manifest belongs to
+        :param str digest: Digest of the blob to be deleted
+        :returns: None
+
+        Example
+
+        .. code-block:: python
+
+            from azure.containerregistry.aio import ContainerRegistryClient
+            from azure.identity.aio import DefaultAzureCredential
+            endpoint = os.environ["CONTAINERREGISTRY_ENDPOINT"]
+            client = ContainerRegistryClient(endpoint, DefaultAzureCredential(), audience="my_audience")
+            await client.delete_blob("my_repository", "my_digest")
+        """
+        try:
+            await self._client.container_registry_blob.delete_blob(repository, digest, **kwargs)
+        except HttpResponseError as error:
+            if error.status_code == 404:
+                return
+            raise

sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client.py

@@ -7,7 +7,7 @@
 import os
 import pytest
 import six
-
+import hashlib
 from azure.containerregistry import (
     RepositoryProperties,
     ArtifactManifestProperties,
@@ -568,6 +568,15 @@ def test_upload_blob(self, containerregistry_endpoint):
 
             # Cleanup
             client.delete_repository(repo)
+    
+    @acr_preparer()
+    @recorded_by_proxy
+    def test_delete_blob_does_not_exist(self, containerregistry_endpoint):
+        repo = self.get_resource_name("repo")
+        hash_value = hashlib.sha256(b"test").hexdigest()
+        digest = f"sha256:{hash_value}"
+        with self.create_registry_client(containerregistry_endpoint) as client:
+            client.delete_blob(repo, digest)
 
     @acr_preparer()
     @recorded_by_proxy

sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client_async.py

@@ -6,7 +6,7 @@
 from datetime import datetime
 import pytest
 import six
-
+import hashlib
 from azure.containerregistry import (
     RepositoryProperties,
     ArtifactManifestProperties,
@@ -451,6 +451,15 @@ async def test_get_misspell_property(self, containerregistry_endpoint):
             last_updated_on = properties.last_updated_on
             assert last_udpated_on == last_updated_on
 
+    @acr_preparer()
+    @recorded_by_proxy_async
+    async def test_delete_blob_does_not_exist(self, containerregistry_endpoint):
+        repo = self.get_resource_name("repo")
+        hash_value = hashlib.sha256(b"test").hexdigest()
+        digest = f"sha256:{hash_value}"
+        async with self.create_registry_client(containerregistry_endpoint) as client:
+            await client.delete_blob(repo, digest)
+    
     @acr_preparer()
     @recorded_by_proxy_async
     async def test_set_audience(self, containerregistry_endpoint):