[Container Registry] Acr delete artifact

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

@@ -4,7 +4,9 @@
 # Licensed under the MIT License.
 # ------------------------------------
 from typing import TYPE_CHECKING
+
 from azure.core.paging import ItemPaged
+from azure.core.tracing.decorator import distributed_trace
 
 from ._base_client import ContainerRegistryBaseClient
 from ._container_repository_client import ContainerRepositoryClient
@@ -33,6 +35,7 @@ def __init__(self, endpoint, credential, **kwargs):
         self._credential = credential
         super(ContainerRegistryClient, self).__init__(endpoint=endpoint, credential=credential, **kwargs)
 
+    @distributed_trace
     def delete_repository(self, repository, **kwargs):
         # type: (str, Dict[str, Any]) -> DeletedRepositoryResult
         """Delete a repository
@@ -42,11 +45,11 @@ def delete_repository(self, repository, **kwargs):
         :returns: None
         :raises: :class:~azure.core.exceptions.ResourceNotFoundError
         """
-        # NOTE: DELETE `/acr/v1/{name}`
         return DeletedRepositoryResult._from_generated(  # pylint: disable=protected-access
             self._client.container_registry.delete_repository(repository, **kwargs)
         )
 
+    @distributed_trace
     def list_repositories(self, **kwargs):
         # type: (Dict[str, Any]) -> ItemPaged[str]
         """List all repositories
@@ -62,12 +65,14 @@ def list_repositories(self, **kwargs):
             last=kwargs.pop("last", None), n=kwargs.pop("max", None), **kwargs
         )
 
+    @distributed_trace
     def get_repository_client(self, repository, **kwargs):
         # type: (str, Dict[str, Any]) -> ContainerRepositoryClient
         """Get a repository client
 
         :param repository: The repository to create a client for
         :type repository: str
         :returns: :class:~azure.containerregistry.ContainerRepositoryClient
+        :raises: None
         """
         return ContainerRepositoryClient(self._endpoint, repository, credential=self._credential, **kwargs)

sdk/containerregistry/azure-containerregistry/azure/containerregistry/_container_repository_client.py

@@ -5,6 +5,8 @@
 # ------------------------------------
 from typing import TYPE_CHECKING
 
+from azure.core.tracing.decorator import distributed_trace
+
 from ._base_client import ContainerRegistryBaseClient
 from ._helpers import _is_tag
 from ._models import RepositoryProperties, TagProperties, RegistryArtifactProperties
@@ -41,6 +43,7 @@ def _get_digest_from_tag(self, tag):
         tag_props = self.get_tag_properties(tag)
         return tag_props.digest
 
+    @distributed_trace
     def delete(self, **kwargs):
         # type: (...) -> None
         """Delete a repository
@@ -50,17 +53,19 @@ def delete(self, **kwargs):
         """
         self._client.container_registry.delete_repository(self.repository, **kwargs)
 
+    @distributed_trace
     def delete_registry_artifact(self, digest, **kwargs):
         # type: (str) -> None
-        """Delete a registry artifact
+        """Delete a registry artifact. A registry artifact can only be deleted from the digest
 
         :param digest: The digest of the artifact to be deleted
         :type digest: str
         :returns: None
         :raises: :class:~azure.core.exceptions.ResourceNotFoundError
         """
-        raise NotImplementedError("Has not been implemented")
+        self._client.container_registry_repository.delete_manifest(self.repository, digest, **kwargs)
 
+    @distributed_trace
     def delete_tag(self, tag, **kwargs):
         # type: (str) -> None
         """Delete a tag from a repository
@@ -72,6 +77,7 @@ def delete_tag(self, tag, **kwargs):
         """
         self._client.container_registry_repository.delete_tag(self.repository, tag, **kwargs)
 
+    @distributed_trace
     def get_properties(self, **kwargs):
         # type: (...) -> RepositoryProperties
         """Get the properties of a repository
@@ -84,6 +90,7 @@ def get_properties(self, **kwargs):
             self._client.container_registry_repository.get_properties(self.repository, **kwargs)
         )
 
+    @distributed_trace
     def get_registry_artifact_properties(self, tag_or_digest, **kwargs):
         # type: (str, Dict[str, Any]) -> RegistryArtifactProperties
         """Get the properties of a registry artifact
@@ -102,6 +109,7 @@ def get_registry_artifact_properties(self, tag_or_digest, **kwargs):
             )
         )
 
+    @distributed_trace
     def get_tag_properties(self, tag, **kwargs):
         # type: (str, Dict[str, Any]) -> TagProperties
         """Get the properties for a tag
@@ -115,6 +123,7 @@ def get_tag_properties(self, tag, **kwargs):
             self._client.container_registry_repository.get_tag_properties(self.repository, tag, **kwargs)
         )
 
+    @distributed_trace
     def list_registry_artifacts(self, **kwargs):
         # type: (...) -> ItemPaged[RegistryArtifactProperties]
         """List the artifacts for a repository
@@ -142,6 +151,7 @@ def list_registry_artifacts(self, **kwargs):
             ],
         )
 
+    @distributed_trace
     def list_tags(self, **kwargs):
         # type: (...) -> ItemPaged[TagProperties]
         """List the tags for a repository
@@ -163,6 +173,7 @@ def list_tags(self, **kwargs):
             **kwargs
         )
 
+    @distributed_trace
     def set_manifest_properties(self, digest, permissions, **kwargs):
         # type: (str, ContentPermissions) -> None
         """Set the properties for a manifest
@@ -179,6 +190,7 @@ def set_manifest_properties(self, digest, permissions, **kwargs):
             self.repository, digest, value=permissions._to_generated(), **kwargs  # pylint: disable=protected-access
         )
 
+    @distributed_trace
     def set_tag_properties(self, tag_or_digest, permissions, **kwargs):
         # type: (str, ContentPermissions) -> None
         """Set the properties for a tag

sdk/containerregistry/azure-containerregistry/azure/containerregistry/_models.py

@@ -61,10 +61,10 @@ def __init__(self, **kwargs):
         self.digest = kwargs.get("digest", None)
         self.last_updated_on = kwargs.get("last_updated_on", None)
         self.operating_system = kwargs.get("operating_system", None)
-        self.registry_artifacts = kwargs.get("registry_artifacts", None)
+        self.references = kwargs.get("references", None)
         self.size = kwargs.get("size", None)
         self.tags = kwargs.get("tags", None)
-        self.content_permissions = kwargs.get("manifest_properties", None)
+        self.content_permissions = kwargs.get("content_permissions", None)
         if self.content_permissions:
             self.content_permissions = ContentPermissions._from_generated(self.content_permissions)
 

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

@@ -6,6 +6,8 @@
 from typing import Any, Dict, TYPE_CHECKING
 
 from azure.core.async_paging import AsyncItemPaged
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
 
 from ._async_base_client import ContainerRegistryBaseClient
 from ._async_container_repository_client import ContainerRepositoryClient
@@ -32,6 +34,7 @@ def __init__(self, endpoint: str, credential: "AsyncTokenCredential", **kwargs:
         self._credential = credential
         super(ContainerRegistryClient, self).__init__(endpoint=endpoint, credential=credential, **kwargs)
 
+    @distributed_trace_async
     async def delete_repository(self, repository: str, **kwargs: Dict[str, Any]) -> DeletedRepositoryResult:
         """Delete a repository
 
@@ -43,12 +46,14 @@ async def delete_repository(self, repository: str, **kwargs: Dict[str, Any]) ->
         result = await self._client.container_registry.delete_repository(repository, **kwargs)
         return DeletedRepositoryResult._from_generated(result)  # pylint: disable=protected-access
 
+    @distributed_trace
     def list_repositories(self, **kwargs) -> AsyncItemPaged[str]:
 
         return self._client.container_registry.get_repositories(
             last=kwargs.pop("last", None), n=kwargs.pop("page_size", None), **kwargs
         )
 
+    @distributed_trace_async
     def get_repository_client(self, name: str, **kwargs) -> ContainerRepositoryClient:
 
         return ContainerRepositoryClient(self._endpoint, name, self._credential, **kwargs)

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

@@ -6,6 +6,8 @@
 from typing import TYPE_CHECKING, Dict, Any
 
 from azure.core.async_paging import AsyncItemPaged
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
 
 from ._async_base_client import ContainerRegistryBaseClient
 from .._helpers import _is_tag
@@ -44,6 +46,7 @@ async def _get_digest_from_tag(self, tag: str) -> None:
         tag_props = await self.get_tag_properties(tag)
         return tag_props.digest
 
+    @distributed_trace_async
     async def delete(self, **kwargs: Dict[str, Any]) -> None:
         """Delete a repository
 
@@ -52,6 +55,7 @@ async def delete(self, **kwargs: Dict[str, Any]) -> None:
         """
         await self._client.container_registry.delete_repository(self.repository, **kwargs)
 
+    @distributed_trace_async
     async def delete_registry_artifact(self, digest: str, **kwargs) -> None:
         """Delete a registry artifact
 
@@ -60,8 +64,9 @@ async def delete_registry_artifact(self, digest: str, **kwargs) -> None:
         :returns: None
         :raises: :class:~azure.core.exceptions.ResourceNotFoundError
         """
-        raise NotImplementedError("Has not been implemented")
+        await self._client.container_registry_repository.delete_manifest(self.repository, digest, **kwargs)
 
+    @distributed_trace_async
     async def delete_tag(self, tag: str, **kwargs) -> None:
         """Delete a tag from a repository
 
@@ -72,6 +77,7 @@ async def delete_tag(self, tag: str, **kwargs) -> None:
         """
         await self._client.container_registry_repository.delete_tag(self.repository, tag, **kwargs)
 
+    @distributed_trace_async
     async def get_properties(self, **kwargs) -> RepositoryProperties:
         """Get the properties of a repository
 
@@ -82,6 +88,7 @@ async def get_properties(self, **kwargs) -> RepositoryProperties:
             await self._client.container_registry_repository.get_properties(self.repository, **kwargs)
         )
 
+    @distributed_trace_async
     async def get_registry_artifact_properties(self, tag_or_digest: str, **kwargs) -> RegistryArtifactProperties:
         """Get the properties of a registry artifact
 
@@ -99,6 +106,7 @@ async def get_registry_artifact_properties(self, tag_or_digest: str, **kwargs) -
             )
         )
 
+    @distributed_trace_async
     async def get_tag_properties(self, tag: str, **kwargs) -> TagProperties:
         """Get the properties for a tag
 
@@ -111,7 +119,8 @@ async def get_tag_properties(self, tag: str, **kwargs) -> TagProperties:
             await self._client.container_registry_repository.get_tag_properties(self.repository, tag, **kwargs)
         )
 
-    async def list_registry_artifacts(self, **kwargs) -> AsyncItemPaged[RegistryArtifactProperties]:
+    @distributed_trace
+    def list_registry_artifacts(self, **kwargs) -> AsyncItemPaged[RegistryArtifactProperties]:
         """List the artifacts for a repository
 
         :keyword last: Query parameter for the last item in the previous query
@@ -126,7 +135,7 @@ async def list_registry_artifacts(self, **kwargs) -> AsyncItemPaged[RegistryArti
         last = kwargs.pop("last", None)
         n = kwargs.pop("page_size", None)
         orderby = kwargs.pop("order_by", None)
-        return await self._client.container_registry_repository.get_manifests(
+        return self._client.container_registry_repository.get_manifests(
             self.repository,
             last=last,
             n=n,
@@ -137,7 +146,8 @@ async def list_registry_artifacts(self, **kwargs) -> AsyncItemPaged[RegistryArti
             **kwargs
         )
 
-    async def list_tags(self, **kwargs) -> AsyncItemPaged[TagProperties]:
+    @distributed_trace
+    def list_tags(self, **kwargs) -> AsyncItemPaged[TagProperties]:
         """List the tags for a repository
 
         :param last: Query parameter for the last item in the previous call. Ensuing
@@ -147,7 +157,7 @@ async def list_tags(self, **kwargs) -> AsyncItemPaged[TagProperties]:
         :returns: ~azure.core.paging.AsyncItemPaged[TagProperties]
         :raises: None
         """
-        return await self._client.container_registry_repository.get_tags(
+        return self._client.container_registry_repository.get_tags(
             self.repository,
             last=kwargs.pop("last", None),
             n=kwargs.pop("top", None),
@@ -157,6 +167,7 @@ async def list_tags(self, **kwargs) -> AsyncItemPaged[TagProperties]:
             **kwargs
         )
 
+    @distributed_trace_async
     async def set_manifest_properties(self, digest: str, permissions: ContentPermissions, **kwargs) -> None:
         """Set the properties for a manifest
 
@@ -172,6 +183,7 @@ async def set_manifest_properties(self, digest: str, permissions: ContentPermiss
             self.repository, digest, value=permissions._to_generated(), **kwargs  # pylint: disable=protected-access
         )
 
+    @distributed_trace_async
     async def set_tag_properties(self, tag_or_digest: str, permissions: ContentPermissions, **kwargs) -> None:
         """Set the properties for a tag
 

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

@@ -0,0 +1,8 @@
+# coding=utf-8
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+
+TO_BE_DELETED = "to_be_deleted"
+DOES_NOT_EXIST = "does_not_exist"