changing ContainerRepositoryClient to ContainerRepository

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

@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 
 from ._container_registry_client import ContainerRegistryClient
-from ._container_repository_client import ContainerRepositoryClient
+from ._container_repository_client import ContainerRepository
 from ._models import (
     ContentPermissions,
     DeletedRepositoryResult,
@@ -23,7 +23,7 @@
 
 __all__ = [
     "ContainerRegistryClient",
-    "ContainerRepositoryClient",
+    "ContainerRepository",
     "ContentPermissions",
     "DeletedRepositoryResult",
     "RegistryArtifactOrderBy",

sdk/containerregistry/azure-containerregistry/azure/containerregistry/_base_client.py

@@ -23,7 +23,7 @@ class ContainerRegistryApiVersion(str, Enum):
 
 
 class ContainerRegistryBaseClient(object):
-    """Base class for ContainerRegistryClient and ContainerRepositoryClient
+    """Base class for ContainerRegistryClient and ContainerRepository
 
     :param str endpoint: Azure Container Registry endpoint
     :param credential: AAD Token for authenticating requests with Azure

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

@@ -16,7 +16,7 @@
 from azure.core.tracing.decorator import distributed_trace
 
 from ._base_client import ContainerRegistryBaseClient, TransportWrapper
-from ._container_repository_client import ContainerRepositoryClient
+from ._container_repository_client import ContainerRepository
 from ._generated.models import AcrErrors
 from ._helpers import _parse_next_link
 from ._models import DeletedRepositoryResult
@@ -166,17 +166,17 @@ def get_next(next_link=None):
 
     @distributed_trace
     def get_repository_client(self, repository, **kwargs):
-        # type: (str, Dict[str, Any]) -> ContainerRepositoryClient
+        # type: (str, Dict[str, Any]) -> ContainerRepository
         """Get a repository client
 
         :param str repository: The repository to create a client for
-        :returns: :class:`~azure.containerregistry.ContainerRepositoryClient`
+        :returns: :class:`~azure.containerregistry.ContainerRepository`
         :raises: None
         """
         _pipeline = Pipeline(
             transport=TransportWrapper(self._client._client._pipeline._transport),  # pylint: disable=protected-access
             policies=self._client._client._pipeline._impl_policies,  # pylint: disable=protected-access
         )
-        return ContainerRepositoryClient(
+        return ContainerRepository(
             self._endpoint, repository, credential=self._credential, pipeline=_pipeline, **kwargs
         )

sdk/containerregistry/azure-containerregistry/azure/containerregistry/_exchange_client.py

@@ -64,13 +64,14 @@ def __init__(self, endpoint, credential, **kwargs):
     def get_acr_access_token(self, challenge, **kwargs):
         # type: (str, Dict[str, Any]) -> str
         parsed_challenge = _parse_challenge(challenge)
-        refresh_token = self.get_refresh_token(parsed_challenge["service"], **kwargs)
+        # refresh_token = self.get_refresh_token(parsed_challenge["service"], **kwargs) # TODO: This is interfering with recordings
+        refresh_token = self.exchange_aad_token_for_refresh_token(parsed_challenge["service"], **kwargs)
         return self.exchange_refresh_token_for_access_token(
             refresh_token, service=parsed_challenge["service"], scope=parsed_challenge["scope"], **kwargs
         )
 
     def get_refresh_token(self, service, **kwargs):
-        # type: (str, **Any) -> str
+        # type: (str, Dict[str, Any]) -> str
         if not self._refresh_token or time.time() - self._last_refresh_time > 300:
             self._refresh_token = self.exchange_aad_token_for_refresh_token(service, **kwargs)
             self._last_refresh_time = time.time()

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

@@ -7,10 +7,10 @@
 from enum import Enum
 from typing import TYPE_CHECKING
 from ._generated.models import ContentProperties
+from ._generated.models import RepositoryProperties as GeneratedRepositoryProperties
 
 if TYPE_CHECKING:
     from ._generated.models import ManifestAttributesBase
-    from ._generated.models import RepositoryProperties as GeneratedRepositoryProperties
     from ._generated.models import ArtifactTagProperties as GeneratedTagProperties
 
 
@@ -152,6 +152,17 @@ def _from_generated(cls, generated):
             registry=generated.additional_properties.get("registry", None),
         )
 
+    def _to_generated(self):
+        # type: () -> GeneratedRepositoryProperties
+        return GeneratedRepositoryProperties(
+            name=self.name,
+            created_on=self.created_on,
+            last_updated_on=self.last_updated_on,
+            manifest_count=self.manifest_count,
+            tag_count=self.tag_count,
+            writeable_propertie=self.content_permissions._to_generated()
+        )
+
 
 class RegistryArtifactOrderBy(str, Enum):
     """Enum for ordering registry artifacts"""

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

@@ -7,9 +7,9 @@
 # --------------------------------------------------------------------------
 
 from ._async_container_registry_client import ContainerRegistryClient
-from ._async_container_repository_client import ContainerRepositoryClient
+from ._async_container_repository_client import ContainerRepository
 
 __all__ = [
     "ContainerRegistryClient",
-    "ContainerRepositoryClient",
+    "ContainerRepository",
 ]

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

@@ -22,7 +22,7 @@ class ContainerRegistryApiVersion(str, Enum):
 
 
 class ContainerRegistryBaseClient(object):
-    """Base class for ContainerRegistryClient and ContainerRepositoryClient
+    """Base class for ContainerRegistryClient and ContainerRepository
 
     :param endpoint: Azure Container Registry endpoint
     :type endpoint: str

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

@@ -18,7 +18,7 @@
 from azure.core.tracing.decorator_async import distributed_trace_async
 
 from ._async_base_client import ContainerRegistryBaseClient, AsyncTransportWrapper
-from ._async_container_repository_client import ContainerRepositoryClient
+from ._async_container_repository_client import ContainerRepository
 from .._generated.models import AcrErrors
 from .._helpers import _parse_next_link
 from .._models import RepositoryProperties, DeletedRepositoryResult
@@ -162,19 +162,19 @@ async def get_next(next_link=None):
         return AsyncItemPaged(get_next, extract_data)
 
     @distributed_trace
-    def get_repository_client(self, repository: str, **kwargs: Dict[str, Any]) -> ContainerRepositoryClient:
+    def get_repository_client(self, repository: str, **kwargs: Dict[str, Any]) -> ContainerRepository:
         """Get a repository client
 
         :param repository: The repository to create a client for
         :type repository: str
-        :returns: :class:`~azure.containerregistry.aio.ContainerRepositoryClient`
+        :returns: :class:`~azure.containerregistry.aio.ContainerRepository`
         """
         _pipeline = AsyncPipeline(
             transport=AsyncTransportWrapper(
                 self._client._client._pipeline._transport  # pylint: disable=protected-access
             ),
             policies=self._client._client._pipeline._impl_policies,  # pylint: disable=protected-access
         )
-        return ContainerRepositoryClient(
+        return ContainerRepository(
             self._endpoint, repository, credential=self._credential, pipeline=_pipeline, **kwargs
         )

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

@@ -31,11 +31,11 @@
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class ContainerRepositoryClient(ContainerRegistryBaseClient):
+class ContainerRepository(ContainerRegistryBaseClient):
     def __init__(
         self, endpoint: str, repository: str, credential: "AsyncTokenCredential", **kwargs: Dict[str, Any]
     ) -> None:
-        """Create a ContainerRepositoryClient from an endpoint, repository name, and credential
+        """Create a ContainerRepository from an endpoint, repository name, and credential
 
         :param endpoint: An ACR endpoint
         :type endpoint: str
@@ -51,7 +51,7 @@ def __init__(
         self._endpoint = endpoint
         self._credential = credential
         self.repository = repository
-        super(ContainerRepositoryClient, self).__init__(endpoint=self._endpoint, credential=credential, **kwargs)
+        super(ContainerRepository, self).__init__(endpoint=self._endpoint, credential=credential, **kwargs)
 
     async def _get_digest_from_tag(self, tag: str) -> None:
         tag_props = await self.get_tag_properties(tag)
@@ -405,3 +405,15 @@ async def set_tag_properties(
                 self.repository, tag, value=permissions._to_generated(), **kwargs  # pylint: disable=protected-access
             )
         )
+
+    @distributed_trace_async
+    async def set_properties(self, properties, **kwargs):
+        # type: (RepositoryProperties, Dict[str, Any]) -> RepositoryProperties
+        """Set the properties of a repository
+
+        :returns: :class:`~azure.containerregistry.RepositoryProperties`
+        :raises: :class:`~azure.core.exceptions.ResourceNotFoundError`
+        """
+        return RepositoryProperties._from_generated(  # pylint: disable=protected-access
+            await self._client.container_registry.set_properties(self.repository, properties._to_generated(), **kwargs)
+        )

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

@@ -61,7 +61,8 @@ def __init__(
 
     async def get_acr_access_token(self, challenge: str, **kwargs: Dict[str, Any]) -> str:
         parsed_challenge = _parse_challenge(challenge)
-        refresh_token = await self.get_refresh_token(parsed_challenge["service"], **kwargs)
+        # refresh_token = await self.get_refresh_token(parsed_challenge["service"], **kwargs)  # TODO: This is interfering with recordings
+        refresh_token = await self.exchange_aad_token_for_refresh_token(parsed_challenge["service"], **kwargs)
         return await self.exchange_refresh_token_for_access_token(
             refresh_token, service=parsed_challenge["service"], scope=parsed_challenge["scope"], **kwargs
         )

sdk/containerregistry/azure-containerregistry/samples/async_samples/sample_create_client_async.py

@@ -10,7 +10,7 @@
 FILE: sample_create_client_async.py
 
 DESCRIPTION:
-    These samples demonstrate creating a ContainerRegistryClient and a ContainerRepositoryClient
+    These samples demonstrate creating a ContainerRegistryClient and a ContainerRepository
 
 USAGE:
     python sample_create_client_async.py
@@ -40,10 +40,10 @@ def create_registry_client(self):
     def create_repository_client(self):
         # Instantiate the ContainerRegistryClient
         # [START create_repository_client]
-        from azure.containerregistry.aio import ContainerRepositoryClient
+        from azure.containerregistry.aio import ContainerRepository
         from azure.identity.aio import DefaultAzureCredential
 
-        client = ContainerRepositoryClient(self.account_url, "my_repository", DefaultAzureCredential())
+        client = ContainerRepository(self.account_url, "my_repository", DefaultAzureCredential())
         # [END create_repository_client]
 
     async def basic_sample(self):

sdk/containerregistry/azure-containerregistry/samples/sample_create_client.py

@@ -10,7 +10,7 @@
 FILE: sample_create_client.py
 
 DESCRIPTION:
-    These samples demonstrate creating a ContainerRegistryClient and a ContainerRepositoryClient
+    These samples demonstrate creating a ContainerRegistryClient and a ContainerRepository
 
 USAGE:
     python sample_create_client.py
@@ -40,10 +40,10 @@ def create_registry_client(self):
     def create_repository_client(self):
         # Instantiate the ContainerRegistryClient
         # [START create_repository_client]
-        from azure.containerregistry import ContainerRepositoryClient
+        from azure.containerregistry import ContainerRepository
         from azure.identity import DefaultAzureCredential
 
-        client = ContainerRepositoryClient(self.account_url, "my_repository", DefaultAzureCredential())
+        client = ContainerRepository(self.account_url, "my_repository", DefaultAzureCredential())
         # [END create_repository_client]
 
     def basic_sample(self):

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

@@ -10,7 +10,7 @@
 import six
 
 from azure.containerregistry.aio import (
-    ContainerRepositoryClient,
+    ContainerRepository,
     ContainerRegistryClient,
 )
 from azure.containerregistry import (
@@ -56,8 +56,8 @@ def create_registry_client(self, endpoint, **kwargs):
             **kwargs,
         )
 
-    def create_repository_client(self, endpoint, name, **kwargs):
-        return ContainerRepositoryClient(
+    def create_container_repository(self, endpoint, name, **kwargs):
+        return ContainerRepository(
             endpoint=endpoint,
             repository=name,
             credential=self.get_credential(),

sdk/containerregistry/azure-containerregistry/tests/recordings/test_container_repository_client.test_get_properties.yaml

@@ -31,7 +31,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 13 Apr 2021 15:59:17 GMT
+      - Tue, 27 Apr 2021 21:52:55 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -72,53 +72,15 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 13 Apr 2021 15:59:19 GMT
+      - Tue, 27 Apr 2021 21:52:57 GMT
       server:
       - openresty
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-ms-ratelimit-remaining-calls-per-second:
-      - '165.883333'
-    status:
-      code: 200
-      message: OK
-- request:
-    body: grant_type=refresh_token&service=fake_url.azurecr.io&scope=repository%3Alibrary%2Fhello-world%3Ametadata_read&refresh_token=REDACTED
-    headers:
-      Accept:
-      - application/json
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '1089'
-      Content-Type:
-      - application/x-www-form-urlencoded
-      User-Agent:
-      - azsdk-python-azure-containerregistry/1.0.0b1 Python/3.9.0rc1 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://fake_url.azurecr.io/oauth2/token
-  response:
-    body:
-      string: '{"access_token": "REDACTED"}'
-    headers:
-      connection:
-      - keep-alive
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Tue, 13 Apr 2021 15:59:19 GMT
-      server:
-      - openresty
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-ms-ratelimit-remaining-calls-per-second:
-      - '165.766667'
+      - '166.65'
     status:
       code: 200
       message: OK
@@ -138,9 +100,10 @@ interactions:
   response:
     body:
       string: '{"registry": "fake_url.azurecr.io", "imageName": "library/hello-world",
-        "createdTime": "2021-04-13T15:10:43.6788287Z", "lastUpdateTime": "2021-04-13T15:26:48.3839908Z",
-        "manifestCount": 10, "tagCount": 5, "changeableAttributes": {"deleteEnabled":
-        true, "writeEnabled": true, "readEnabled": true, "listEnabled": true}}'
+        "createdTime": "2021-04-13T15:10:43.6788287Z", "lastUpdateTime": "2021-04-20T12:50:15.1385136Z",
+        "manifestCount": 12, "tagCount": 5, "changeableAttributes": {"deleteEnabled":
+        false, "writeEnabled": false, "readEnabled": false, "listEnabled": false,
+        "teleportEnabled": false}}'
     headers:
       access-control-expose-headers:
       - Docker-Content-Digest
@@ -150,11 +113,11 @@ interactions:
       connection:
       - keep-alive
       content-length:
-      - '298'
+      - '326'
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 13 Apr 2021 15:59:19 GMT
+      - Tue, 27 Apr 2021 21:52:57 GMT
       docker-distribution-api-version:
       - registry/2.0
       server: