From fb9747d111b7b50619b15fb4d05764befa6518d9 Mon Sep 17 00:00:00 2001 From: Sean Kane <68240067+seankane-msft@users.noreply.github.com> Date: Mon, 17 May 2021 14:18:55 -0400 Subject: [PATCH] updating sample for beta2 api (#18711) --- .../containerregistry/_registry_artifact.py | 9 ------ .../sample_create_client_async.py | 31 ++++++------------- .../samples/sample_create_client.py | 27 ++++++---------- sdk/containerregistry/tests.yml | 2 +- 4 files changed, 19 insertions(+), 50 deletions(-) diff --git a/sdk/containerregistry/azure-containerregistry/azure/containerregistry/_registry_artifact.py b/sdk/containerregistry/azure-containerregistry/azure/containerregistry/_registry_artifact.py index 809d4d27040c..5258ccf2f788 100644 --- a/sdk/containerregistry/azure-containerregistry/azure/containerregistry/_registry_artifact.py +++ b/sdk/containerregistry/azure-containerregistry/azure/containerregistry/_registry_artifact.py @@ -44,15 +44,6 @@ def __init__(self, endpoint, repository, tag_or_digest, credential, **kwargs): :type credential: :class:`~azure.core.credentials.TokenCredential` :returns: None :raises: None - - .. admonition:: Example: - - .. literalinclude:: ../samples/sample_create_client.py - :start-after: [START create_repository_client] - :end-before: [END create_repository_client] - :language: python - :dedent: 8 - :caption: Instantiate an instance of `ContainerRepositoryClient` """ if not endpoint.startswith("https://") and not endpoint.startswith("http://"): endpoint = "https://" + endpoint diff --git a/sdk/containerregistry/azure-containerregistry/samples/async_samples/sample_create_client_async.py b/sdk/containerregistry/azure-containerregistry/samples/async_samples/sample_create_client_async.py index 2d2ea9477eae..8b2745401afe 100644 --- a/sdk/containerregistry/azure-containerregistry/samples/async_samples/sample_create_client_async.py +++ b/sdk/containerregistry/azure-containerregistry/samples/async_samples/sample_create_client_async.py @@ -27,53 +27,40 @@ class CreateClients(object): def __init__(self): load_dotenv(find_dotenv()) - self.account_url = os.environ["CONTAINERREGISTRY_ENDPOINT"] async def create_registry_client(self): # Instantiate the ContainerRegistryClient # [START create_registry_client] from azure.containerregistry.aio import ContainerRegistryClient from azure.identity.aio import DefaultAzureCredential + account_url = os.environ["CONTAINERREGISTRY_ENDPOINT"] - client = ContainerRegistryClient(self.account_url, DefaultAzureCredential()) + client = ContainerRegistryClient(account_url, DefaultAzureCredential()) # [END create_registry_client] - async def create_repository_client(self): - # Instantiate the ContainerRegistryClient - # [START create_repository_client] - from azure.containerregistry.aio import ContainerRepository - from azure.identity.aio import DefaultAzureCredential - - client = ContainerRepository(self.account_url, "my_repository", DefaultAzureCredential()) - # [END create_repository_client] - async def basic_sample(self): from azure.containerregistry.aio import ContainerRegistryClient from azure.identity.aio import DefaultAzureCredential + account_url = os.environ["CONTAINERREGISTRY_ENDPOINT"] # Instantiate the client - client = ContainerRegistryClient(self.account_url, DefaultAzureCredential()) + client = ContainerRegistryClient(account_url, DefaultAzureCredential()) async with client: # Iterate through all the repositories async for repository_name in client.list_repository_names(): if repository_name == "hello-world": - # Create a repository client from the registry client - repository_client = client.get_repository(repository_name) + # Create a repository object from the registry client + container_repository = client.get_repository(repository_name) - async with repository_client: + async with container_repository: # Show all tags - async for tag in repository_client.list_tags(): - print(tag.digest) - - # [START delete_repository] - await client.delete_repository("hello-world") - # [END delete_repository] + async for manifest in container_repository.list_manifests(): + print(manifest.tags) async def main(): sample = CreateClients() await sample.create_registry_client() - await sample.create_repository_client() await sample.basic_sample() diff --git a/sdk/containerregistry/azure-containerregistry/samples/sample_create_client.py b/sdk/containerregistry/azure-containerregistry/samples/sample_create_client.py index 72a8b9daad8c..13b762826aad 100644 --- a/sdk/containerregistry/azure-containerregistry/samples/sample_create_client.py +++ b/sdk/containerregistry/azure-containerregistry/samples/sample_create_client.py @@ -26,44 +26,36 @@ class CreateClients(object): def __init__(self): load_dotenv(find_dotenv()) - self.account_url = os.environ["CONTAINERREGISTRY_ENDPOINT"] def create_registry_client(self): # Instantiate the ContainerRegistryClient # [START create_registry_client] from azure.containerregistry import ContainerRegistryClient from azure.identity import DefaultAzureCredential + account_url = os.environ["CONTAINERREGISTRY_ENDPOINT"] - client = ContainerRegistryClient(self.account_url, DefaultAzureCredential()) + client = ContainerRegistryClient(account_url, DefaultAzureCredential()) # [END create_registry_client] - def create_repository_client(self): - # Instantiate the ContainerRegistryClient - # [START create_repository_client] - from azure.containerregistry import ContainerRepository - from azure.identity import DefaultAzureCredential - - client = ContainerRepository(self.account_url, "my_repository", DefaultAzureCredential()) - # [END create_repository_client] - def basic_sample(self): from azure.containerregistry import ContainerRegistryClient from azure.identity import DefaultAzureCredential + account_url = os.environ["CONTAINERREGISTRY_ENDPOINT"] # Instantiate the client - client = ContainerRegistryClient(self.account_url, DefaultAzureCredential()) + client = ContainerRegistryClient(account_url, DefaultAzureCredential()) with client: # Iterate through all the repositories for repository_name in client.list_repository_names(): if repository_name == "hello-world": - # Create a repository client from the registry client - repository_client = client.get_repository(repository_name) + # Create a repository object from the registry client + container_repository = client.get_repository(repository_name) - with repository_client: + with container_repository: # Show all tags - for tag in repository_client.list_tags(): - print(tag.digest) + for manifest in container_repository.list_manifests(): + print(manifest.tags) # [START delete_repository] client.delete_repository("hello-world") @@ -73,5 +65,4 @@ def basic_sample(self): if __name__ == "__main__": sample = CreateClients() sample.create_registry_client() - sample.create_repository_client() sample.basic_sample() diff --git a/sdk/containerregistry/tests.yml b/sdk/containerregistry/tests.yml index 234c50fd7bdc..9bfdcbc5f25a 100644 --- a/sdk/containerregistry/tests.yml +++ b/sdk/containerregistry/tests.yml @@ -6,7 +6,7 @@ stages: AllocateResourceGroup: false BuildTargetingString: azure-containerregistry ServiceDirectory: containerregistry - TestSamples: false + TestSamples: true DeployArmTemplate: true EnvVars: AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)