added async anon client

Azure · seankane-msft · May 11, 2021 · Apr 27, 2021 · Apr 27, 2021 · Apr 27, 2021
commit 7c316937348113b38320b5cb7cc629f6043f9bfe
diff --git a/...y/azure-containerregistry/azure/containerregistry/aio/_async_anonymous_exchange_client.py b/...y/azure-containerregistry/azure/containerregistry/aio/_async_anonymous_exchange_client.py
@@ -7,9 +7,7 @@
 import time
 from typing import TYPE_CHECKING, Dict, List, Any
 
-from azure.core.pipeline import PipelineRequest, PipelineResponse
-from azure.core.pipeline.policies import SansIOHTTPPolicy
-
+from ._async_exchange_client import ExchangeClientAuthenticationPolicy
 from .._generated.aio import ContainerRegistry
 from .._helpers import _parse_challenge
 from .._user_agent import USER_AGENT
@@ -21,17 +19,8 @@
 PASSWORD = u"password"
 
 
-class ExchangeClientAuthenticationPolicy(SansIOHTTPPolicy):
-    """Authentication policy for exchange client that does not modify the request"""
-
-    def on_request(self, request: PipelineRequest) -> None:
-        pass
-
-    def on_response(self, request: PipelineRequest, response: PipelineResponse) -> None:
-        pass
 
-
-class ACRExchangeClient(object):
+class AnonymousACRExchangeClient(object):
     """Class for handling oauth authentication requests
 
     :param endpoint: Azure Container Registry endpoint
@@ -57,6 +46,7 @@ def __init__(self, endpoint: str, credential: "AsyncTokencredential"=None, **kwa
             **kwargs
         )
         self._credential = credential
+
     async def get_acr_access_token(self, challenge: str, **kwargs: Dict[str, Any]) -> str:
         parsed_challenge = _parse_challenge(challenge)
         parsed_challenge["grant_type"] = PASSWORD
@@ -68,15 +58,15 @@ async def get_acr_access_token(self, challenge: str, **kwargs: Dict[str, Any]) -
             **kwargs
         )
 
-    def exchange_refresh_token_for_access_token(
+    async def exchange_refresh_token_for_access_token(
         self,
         refresh_token: str = None,
         service: str = None,
         scope: str = None,
         grant_type: str = PASSWORD,
         **kwargs: Any
     ) -> str:
-        access_token = self._client.authentication.exchange_acr_refresh_token_for_acr_access_token(
+        access_token = await self._client.authentication.exchange_acr_refresh_token_for_acr_access_token(
             service=service, scope=scope, refresh_token=refresh_token, grant_type=grant_type, **kwargs
         )
         return access_token.access_token

diff --git a/...istry/azure-containerregistry/azure/containerregistry/aio/_async_authentication_policy.py b/...istry/azure-containerregistry/azure/containerregistry/aio/_async_authentication_policy.py
@@ -6,6 +6,7 @@
 
 from azure.core.pipeline.policies import AsyncHTTPPolicy
 
+from ._async_anonymous_exchange_client import AnonymousACRExchangeClient
 from ._async_exchange_client import ACRExchangeClient
 from .._helpers import _enforce_https
 
@@ -21,7 +22,10 @@ class ContainerRegistryChallengePolicy(AsyncHTTPPolicy):
     def __init__(self, credential: "AsyncTokenCredential", endpoint: str) -> None:
         super().__init__()
         self._credential = credential
-        self._exchange_client = ACRExchangeClient(endpoint, self._credential)
+        if not self._credential:
+            self._exchange_client = AnonymousACRExchangeClient(endpoint)
+        else:
+            self._exchange_client = ACRExchangeClient(endpoint, self._credential)
 
     async def on_request(self, request):
         # type: (PipelineRequest) -> None

diff --git a/...gistry/azure-containerregistry/tests/recordings/test_anon_access.test_get_properties.yaml b/...gistry/azure-containerregistry/tests/recordings/test_anon_access.test_get_properties.yaml
@@ -30,7 +30,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:53 GMT
+      - Thu, 06 May 2021 18:11:24 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -71,7 +71,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:54 GMT
+      - Thu, 06 May 2021 18:11:26 GMT
       server:
       - openresty
       strict-transport-security:
@@ -114,7 +114,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:54 GMT
+      - Thu, 06 May 2021 18:11:26 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:

diff --git a/...gistry/azure-containerregistry/tests/recordings/test_anon_access.test_list_manifests.yaml b/...gistry/azure-containerregistry/tests/recordings/test_anon_access.test_list_manifests.yaml
@@ -30,7 +30,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:54 GMT
+      - Thu, 06 May 2021 18:11:27 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -71,7 +71,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:55 GMT
+      - Thu, 06 May 2021 18:11:29 GMT
       server:
       - openresty
       strict-transport-security:
@@ -158,7 +158,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:55 GMT
+      - Thu, 06 May 2021 18:11:29 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:

diff --git a/...azure-containerregistry/tests/recordings/test_anon_access.test_list_repository_names.yaml b/...azure-containerregistry/tests/recordings/test_anon_access.test_list_repository_names.yaml
@@ -30,7 +30,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:56 GMT
+      - Thu, 06 May 2021 18:11:31 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -71,7 +71,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:56 GMT
+      - Thu, 06 May 2021 18:11:32 GMT
       server:
       - openresty
       strict-transport-security:
@@ -110,7 +110,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:56 GMT
+      - Thu, 06 May 2021 18:11:33 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:

diff --git a/...ntainerregistry/tests/recordings/test_anon_access.test_list_repository_names_by_page.yaml b/...ntainerregistry/tests/recordings/test_anon_access.test_list_repository_names_by_page.yaml
@@ -30,7 +30,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:57 GMT
+      - Thu, 06 May 2021 18:11:34 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -71,7 +71,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:57 GMT
+      - Thu, 06 May 2021 18:11:35 GMT
       server:
       - openresty
       strict-transport-security:
@@ -110,7 +110,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:57 GMT
+      - Thu, 06 May 2021 18:11:36 GMT
       docker-distribution-api-version:
       - registry/2.0
       link:
@@ -156,7 +156,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:57 GMT
+      - Thu, 06 May 2021 18:11:36 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -197,7 +197,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:57 GMT
+      - Thu, 06 May 2021 18:11:36 GMT
       server:
       - openresty
       strict-transport-security:
@@ -236,7 +236,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:58 GMT
+      - Thu, 06 May 2021 18:11:37 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:

diff --git a/...nerregistry/azure-containerregistry/tests/recordings/test_anon_access.test_list_tags.yaml b/...nerregistry/azure-containerregistry/tests/recordings/test_anon_access.test_list_tags.yaml
@@ -30,7 +30,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:58 GMT
+      - Thu, 06 May 2021 18:11:38 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -71,7 +71,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:58 GMT
+      - Thu, 06 May 2021 18:11:39 GMT
       server:
       - openresty
       strict-transport-security:
@@ -130,7 +130,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:58 GMT
+      - Thu, 06 May 2021 18:11:40 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:

diff --git a/...-containerregistry/tests/recordings/test_anon_access.test_transport_closed_only_once.yaml b/...-containerregistry/tests/recordings/test_anon_access.test_transport_closed_only_once.yaml
@@ -30,7 +30,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:59 GMT
+      - Thu, 06 May 2021 18:11:41 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -71,7 +71,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:59 GMT
+      - Thu, 06 May 2021 18:11:42 GMT
       server:
       - openresty
       strict-transport-security:
@@ -110,7 +110,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:59 GMT
+      - Thu, 06 May 2021 18:11:43 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -154,7 +154,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:30:59 GMT
+      - Thu, 06 May 2021 18:11:43 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:
@@ -195,7 +195,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:31:00 GMT
+      - Thu, 06 May 2021 18:11:44 GMT
       server:
       - openresty
       strict-transport-security:
@@ -234,7 +234,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 05 May 2021 20:31:00 GMT
+      - Thu, 06 May 2021 18:11:44 GMT
       docker-distribution-api-version:
       - registry/2.0
       server:

diff --git a/.../azure-containerregistry/tests/recordings/test_anon_access_async.test_get_properties.yaml b/.../azure-containerregistry/tests/recordings/test_anon_access_async.test_get_properties.yaml
@@ -0,0 +1,87 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-azure-containerregistry/1.0.0b1 Python/3.9.0rc1 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://seankaneanon.azurecr.io/acr/v1/library%2Fhello-world
+  response:
+    body:
+      string: '{"errors": [{"code": "UNAUTHORIZED", "message": "authentication required,
+        visit https://aka.ms/acr/authorization for more information.", "detail": [{"Type":
+        "repository", "Name": "library/hello-world", "Action": "metadata_read"}]}]}'
+    headers:
+      access-control-expose-headers: X-Ms-Correlation-Request-Id
+      connection: keep-alive
+      content-length: '222'
+      content-type: application/json; charset=utf-8
+      date: Thu, 06 May 2021 18:24:19 GMT
+      docker-distribution-api-version: registry/2.0
+      server: openresty
+      strict-transport-security: max-age=31536000; includeSubDomains
+      www-authenticate: Bearer realm="https://fake_url.azurecr.io/oauth2/token",service="fake_url.azurecr.io",scope="fake_scope",error="invalid_token"
+      x-content-type-options: nosniff
+    status:
+      code: 401
+      message: Unauthorized
+    url: https://fake_url.azurecr.io/acr/v1/library%2Fhello-world
+- request:
+    body:
+      grant_type: password
+      scope: repository:library/hello-world:metadata_read
+      service: fake_url.azurecr.io
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-azure-containerregistry/1.0.0b1 Python/3.9.0rc1 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://seankaneanon.azurecr.io/oauth2/token
+  response:
+    body:
+      string: '{"access_token": "REDACTED"}'
+    headers:
+      connection: keep-alive
+      content-type: application/json; charset=utf-8
+      date: Thu, 06 May 2021 18:24:20 GMT
+      server: openresty
+      strict-transport-security: max-age=31536000; includeSubDomains
+      transfer-encoding: chunked
+    status:
+      code: 200
+      message: OK
+    url: https://fake_url.azurecr.io/oauth2/token
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - azsdk-python-azure-containerregistry/1.0.0b1 Python/3.9.0rc1 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://seankaneanon.azurecr.io/acr/v1/library%2Fhello-world
+  response:
+    body:
+      string: '{"registry": "seankaneanon.azurecr.io", "imageName": "library/hello-world",
+        "createdTime": "2021-05-05T18:00:19.7101132Z", "lastUpdateTime": "2021-05-05T18:00:17.5345755Z",
+        "manifestCount": 10, "tagCount": 5, "changeableAttributes": {"deleteEnabled":
+        true, "writeEnabled": true, "readEnabled": true, "listEnabled": true, "teleportEnabled":
+        false}}'
+    headers:
+      access-control-expose-headers: X-Ms-Correlation-Request-Id
+      connection: keep-alive
+      content-length: '326'
+      content-type: application/json; charset=utf-8
+      date: Thu, 06 May 2021 18:24:20 GMT
+      docker-distribution-api-version: registry/2.0
+      server: openresty
+      strict-transport-security: max-age=31536000; includeSubDomains
+      x-content-type-options: nosniff
+    status:
+      code: 200
+      message: OK
+    url: https://fake_url.azurecr.io/acr/v1/library%2Fhello-world
+version: 1