[Container Registry] DeleteRepositoryResult Changed (#18443)

* renaming of delete repo result

* changelog

Author: seankane-msft

sdk/containerregistry/azure-containerregistry/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Release History
 
 ## 1.0.0b2 (Unreleased)
+* Rename `DeletedRepositoryResult` to `DeleteRepositoryResult`
+* Rename `DeletedRepositoryResult.deleted_registry_artifact_digests` to `deleted_manifests`
 * Rename `TagProperties` to `ArtifactTagProperties`
 * Rename `ContentPermissions` to `ContentProperties`
 * Rename `content_permissions` attributes on `TagProperties`, `RepositoryProperties`, and `RegistryArtifactProperties` to `writeable_properties`.

sdk/containerregistry/azure-containerregistry/azure/containerregistry/__init__.py

@@ -9,8 +9,8 @@
 from ._container_registry_client import ContainerRegistryClient
 from ._container_repository_client import ContainerRepositoryClient
 from ._models import (
+    DeleteRepositoryResult,
     ContentProperties,
-    DeletedRepositoryResult,
     RegistryArtifactOrderBy,
     RegistryArtifactProperties,
     RepositoryProperties,
@@ -24,8 +24,8 @@
 __all__ = [
     "ContainerRegistryClient",
     "ContainerRepositoryClient",
+    "DeleteRepositoryResult",
     "ContentProperties",
-    "DeletedRepositoryResult",
     "RegistryArtifactOrderBy",
     "RegistryArtifactProperties",
     "RepositoryProperties",

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

@@ -19,7 +19,7 @@
 from ._container_repository_client import ContainerRepositoryClient
 from ._generated.models import AcrErrors
 from ._helpers import _parse_next_link
-from ._models import DeletedRepositoryResult
+from ._models import DeleteRepositoryResult
 
 if TYPE_CHECKING:
     from typing import Any, Dict
@@ -45,15 +45,15 @@ def __init__(self, endpoint, credential, **kwargs):
 
     @distributed_trace
     def delete_repository(self, repository, **kwargs):
-        # type: (str, Dict[str, Any]) -> DeletedRepositoryResult
+        # type: (str, Dict[str, Any]) -> DeleteRepositoryResult
         """Delete a repository
 
         :param str repository: The repository to delete
         :returns: Object containing information about the deleted repository
-        :rtype: :class:`~azure.containerregistry.DeletedRepositoryResult`
+        :rtype: :class:`~azure.containerregistry.DeleteRepositoryResult`
         :raises: :class:`~azure.core.exceptions.ResourceNotFoundError`
         """
-        return DeletedRepositoryResult._from_generated(  # pylint: disable=protected-access
+        return DeleteRepositoryResult._from_generated(  # pylint: disable=protected-access
             self._client.container_registry.delete_repository(repository, **kwargs)
         )
 

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

@@ -19,7 +19,7 @@
 from ._generated.models import AcrErrors
 from ._helpers import _is_tag, _parse_next_link
 from ._models import (
-    DeletedRepositoryResult,
+    DeleteRepositoryResult,
     RegistryArtifactProperties,
     RepositoryProperties,
     ArtifactTagProperties,
@@ -61,10 +61,10 @@ def delete(self, **kwargs):
         """Delete a repository
 
         :returns: Object containing information about the deleted repository
-        :rtype: :class:`~azure.containerregistry.DeletedRepositoryResult`
+        :rtype: :class:`~azure.containerregistry.DeleteRepositoryResult`
         :raises: :class:`~azure.core.exceptions.ResourceNotFoundError`
         """
-        return DeletedRepositoryResult._from_generated(  # pylint: disable=protected-access
+        return DeleteRepositoryResult._from_generated(  # pylint: disable=protected-access
             self._client.container_registry.delete_repository(self.repository, **kwargs)
         )
 

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

@@ -56,22 +56,22 @@ def _to_generated(self):
         )
 
 
-class DeletedRepositoryResult(object):
+class DeleteRepositoryResult(object):
     """Represents the digests and tags deleted when a repository is deleted
 
-    :ivar List[str] deleted_registry_artifact_digests: Registry artifact digests that were deleted
+    :ivar List[str] deleted_manifests: Registry artifact digests that were deleted
     :ivar List[str] deleted_tags: Tags that were deleted
     """
 
     def __init__(self, **kwargs):
-        self.deleted_registry_artifact_digests = kwargs.get("deleted_registry_artifact_digests", None)
+        self.deleted_manifests = kwargs.get("deleted_manifests", None)
         self.deleted_tags = kwargs.get("deleted_tags", None)
 
     @classmethod
     def _from_generated(cls, gen):
         return cls(
             deleted_tags=gen.deleted_tags,
-            deleted_registry_artifact_digests=gen.deleted_manifests,
+            deleted_manifests=gen.deleted_manifests,
         )
 
 

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

@@ -21,7 +21,7 @@
 from ._async_container_repository_client import ContainerRepositoryClient
 from .._generated.models import AcrErrors
 from .._helpers import _parse_next_link
-from .._models import RepositoryProperties, DeletedRepositoryResult
+from .._models import RepositoryProperties, DeleteRepositoryResult
 
 if TYPE_CHECKING:
     from azure.core.credentials_async import AsyncTokenCredential
@@ -45,17 +45,17 @@ def __init__(self, endpoint: str, credential: "AsyncTokenCredential", **kwargs:
         super(ContainerRegistryClient, self).__init__(endpoint=endpoint, credential=credential, **kwargs)
 
     @distributed_trace_async
-    async def delete_repository(self, repository: str, **kwargs: Dict[str, Any]) -> DeletedRepositoryResult:
+    async def delete_repository(self, repository: str, **kwargs: Dict[str, Any]) -> DeleteRepositoryResult:
         """Delete a repository
 
         :param repository: The repository to delete
         :type repository: str
         :returns: Object containing information about the deleted repository
-        :rtype: :class:`~azure.containerregistry.DeletedRepositoryResult`
+        :rtype: :class:`~azure.containerregistry.DeleteRepositoryResult`
         :raises: :class:`~azure.core.exceptions.ResourceNotFoundError`
         """
         result = await self._client.container_registry.delete_repository(repository, **kwargs)
-        return DeletedRepositoryResult._from_generated(result)  # pylint: disable=protected-access
+        return DeleteRepositoryResult._from_generated(result)  # pylint: disable=protected-access
 
     @distributed_trace
     def list_repositories(self, **kwargs: Dict[str, Any]) -> AsyncItemPaged[str]:

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

@@ -20,8 +20,8 @@
 from .._generated.models import AcrErrors
 from .._helpers import _is_tag, _parse_next_link
 from .._models import (
+    DeleteRepositoryResult,
     ContentProperties,
-    DeletedRepositoryResult,
     RegistryArtifactProperties,
     RepositoryProperties,
     ArtifactTagProperties,
@@ -58,14 +58,14 @@ async def _get_digest_from_tag(self, tag: str) -> None:
         return tag_props.digest
 
     @distributed_trace_async
-    async def delete(self, **kwargs: Dict[str, Any]) -> DeletedRepositoryResult:
+    async def delete(self, **kwargs: Dict[str, Any]) -> DeleteRepositoryResult:
         """Delete a repository
 
         :returns: Object containing information about the deleted repository
-        :rtype: :class:`~azure.containerregistry.DeletedRepositoryResult`
+        :rtype: :class:`~azure.containerregistry.DeleteRepositoryResult`
         :raises: :class:`~azure.core.exceptions.ResourceNotFoundError`
         """
-        return DeletedRepositoryResult._from_generated(  # pylint: disable=protected-access
+        return DeleteRepositoryResult._from_generated(  # pylint: disable=protected-access
             await self._client.container_registry.delete_repository(self.repository, **kwargs)
         )
 

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

@@ -10,7 +10,7 @@
 
 from azure.containerregistry import (
     ContainerRegistryClient,
-    DeletedRepositoryResult,
+    DeleteRepositoryResult,
 )
 from azure.core.exceptions import ResourceNotFoundError
 from azure.core.paging import ItemPaged
@@ -66,8 +66,8 @@ def test_delete_repository(self, containerregistry_endpoint, containerregistry_r
         client = self.create_registry_client(containerregistry_endpoint)
 
         result = client.delete_repository(TO_BE_DELETED)
-        assert isinstance(result, DeletedRepositoryResult)
-        assert result.deleted_registry_artifact_digests is not None
+        assert isinstance(result, DeleteRepositoryResult)
+        assert result.deleted_manifests is not None
         assert result.deleted_tags is not None
 
         for repo in client.list_repositories():

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

@@ -9,7 +9,7 @@
 from devtools_testutils import AzureTestCase
 
 from azure.containerregistry import (
-    DeletedRepositoryResult,
+    DeleteRepositoryResult,
     RepositoryProperties,
 )
 from azure.containerregistry.aio import ContainerRegistryClient, ContainerRepositoryClient
@@ -67,8 +67,8 @@ async def test_delete_repository(self, containerregistry_endpoint, containerregi
         client = self.create_registry_client(containerregistry_endpoint)
 
         result = await client.delete_repository(TO_BE_DELETED)
-        assert isinstance(result, DeletedRepositoryResult)
-        assert result.deleted_registry_artifact_digests is not None
+        assert isinstance(result, DeleteRepositoryResult)
+        assert result.deleted_manifests is not None
         assert result.deleted_tags is not None
 
         async for repo in client.list_repositories():

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

@@ -6,14 +6,9 @@
 from datetime import datetime
 import pytest
 
-from devtools_testutils import AzureTestCase
-
 from azure.containerregistry import (
-    ContainerRepositoryClient,
-    ContainerRegistryClient,
+    DeleteRepositoryResult,
     ContentProperties,
-    DeletedRepositoryResult,
-    RepositoryProperties,
     RegistryArtifactOrderBy,
     RegistryArtifactProperties,
     ArtifactTagProperties,
@@ -22,7 +17,7 @@
 from azure.core.exceptions import ResourceNotFoundError
 from azure.core.paging import ItemPaged
 
-from testcase import ContainerRegistryTestClass, AcrBodyReplacer, FakeTokenCredential
+from testcase import ContainerRegistryTestClass
 from constants import TO_BE_DELETED, DOES_NOT_EXIST, HELLO_WORLD
 from preparer import acr_preparer
 
@@ -294,8 +289,8 @@ def test_delete_repository(self, containerregistry_endpoint, containerregistry_r
 
         repo_client = self.create_repository_client(containerregistry_endpoint, TO_BE_DELETED)
         result = repo_client.delete()
-        assert isinstance(result, DeletedRepositoryResult)
-        assert result.deleted_registry_artifact_digests is not None
+        assert isinstance(result, DeleteRepositoryResult)
+        assert result.deleted_manifests is not None
         assert result.deleted_tags is not None
 
         existing_repos = list(reg_client.list_repositories())

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

@@ -7,8 +7,8 @@
 import pytest
 
 from azure.containerregistry import (
+    DeleteRepositoryResult,
     ArtifactTagProperties,
-    DeletedRepositoryResult,
     ContentProperties,
     RegistryArtifactOrderBy,
     RegistryArtifactProperties,
@@ -116,8 +116,8 @@ async def test_delete_repository(self, containerregistry_endpoint, containerregi
 
         repo_client = self.create_repository_client(containerregistry_endpoint, TO_BE_DELETED)
         result = await repo_client.delete()
-        assert isinstance(result, DeletedRepositoryResult)
-        assert result.deleted_registry_artifact_digests is not None
+        assert isinstance(result, DeleteRepositoryResult)
+        assert result.deleted_manifests is not None
         assert result.deleted_tags is not None
 
         existing_repos = []