From 9e1636e0eb26da15c2722286a47e63bd3585640f Mon Sep 17 00:00:00 2001 From: arithmetic1728 <58957152+arithmetic1728@users.noreply.github.com> Date: Wed, 2 Sep 2020 12:54:12 -0700 Subject: [PATCH] feat!: migrate to use microgen (#38) * feat!: migrate to use microgen * Update UPGRADING.md Co-authored-by: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Co-authored-by: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> --- cloud_tasks/snippets/create_queue.py | 10 ++++++---- cloud_tasks/snippets/create_queue_test.py | 10 +++++----- cloud_tasks/snippets/delete_queue.py | 6 ++++-- cloud_tasks/snippets/delete_queue_test.py | 23 ++++++++++------------- cloud_tasks/snippets/list_queues.py | 12 ++++++++---- cloud_tasks/snippets/list_queues_test.py | 19 +++++++++---------- 6 files changed, 42 insertions(+), 38 deletions(-) diff --git a/cloud_tasks/snippets/create_queue.py b/cloud_tasks/snippets/create_queue.py index d8d4dfaea263..2192daffaa6d 100644 --- a/cloud_tasks/snippets/create_queue.py +++ b/cloud_tasks/snippets/create_queue.py @@ -22,14 +22,16 @@ def create_queue(project, queue_name, location): client = tasks_v2.CloudTasksClient() # Construct the fully qualified location path. - parent = client.location_path(project, location) + parent = f"projects/{project}/locations/{location}" # Construct the create queue request. - queue = {'name': client.queue_path(project, location, queue_name)} + queue = {"name": client.queue_path(project, location, queue_name)} # Use the client to create the queue. - response = client.create_queue(parent, queue) + response = client.create_queue(request={"parent": parent, "queue": queue}) - print('Created queue {}'.format(response.name)) + print("Created queue {}".format(response.name)) return response + + # [END cloud_tasks_create_queue] diff --git a/cloud_tasks/snippets/create_queue_test.py b/cloud_tasks/snippets/create_queue_test.py index 1f623a2aa6cd..64ee05970a0e 100644 --- a/cloud_tasks/snippets/create_queue_test.py +++ b/cloud_tasks/snippets/create_queue_test.py @@ -20,9 +20,9 @@ import create_queue -TEST_PROJECT_ID = os.environ['GOOGLE_CLOUD_PROJECT'] -TEST_LOCATION = os.getenv('TEST_QUEUE_LOCATION', 'us-central1') -TEST_QUEUE_NAME = f'my-queue-{uuid.uuid4().hex}' +TEST_PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"] +TEST_LOCATION = os.getenv("TEST_QUEUE_LOCATION", "us-central1") +TEST_QUEUE_NAME = f"my-queue-{uuid.uuid4().hex}" @pytest.fixture() @@ -32,9 +32,9 @@ def test_queue(): yield q - client.delete_queue(q.name) + client.delete_queue(request={"name": q.name}) def test_create_queue(capsys, test_queue): out, _ = capsys.readouterr() - assert 'Created queue' in out + assert "Created queue" in out diff --git a/cloud_tasks/snippets/delete_queue.py b/cloud_tasks/snippets/delete_queue.py index d69514249a17..0c76a962f748 100644 --- a/cloud_tasks/snippets/delete_queue.py +++ b/cloud_tasks/snippets/delete_queue.py @@ -25,6 +25,8 @@ def delete_queue(project, queue_name, location): queue = client.queue_path(project, location, queue_name) # Use the client to delete the queue. - client.delete_queue(queue) - print('Deleted queue') + client.delete_queue(request={"name": queue}) + print("Deleted queue") + + # [END cloud_tasks_delete_queue] diff --git a/cloud_tasks/snippets/delete_queue_test.py b/cloud_tasks/snippets/delete_queue_test.py index 4e1acf403dac..e814c910c169 100644 --- a/cloud_tasks/snippets/delete_queue_test.py +++ b/cloud_tasks/snippets/delete_queue_test.py @@ -22,35 +22,32 @@ import delete_queue -TEST_PROJECT_ID = os.environ['GOOGLE_CLOUD_PROJECT'] -TEST_LOCATION = os.getenv('TEST_QUEUE_LOCATION', 'us-central1') -TEST_QUEUE_NAME = f'my-queue-{uuid.uuid4().hex}' +TEST_PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"] +TEST_LOCATION = os.getenv("TEST_QUEUE_LOCATION", "us-central1") +TEST_QUEUE_NAME = f"my-queue-{uuid.uuid4().hex}" @pytest.fixture() def test_queue(): client = tasks_v2.CloudTasksClient() - parent = client.location_path(TEST_PROJECT_ID, TEST_LOCATION) + parent = f"projects/{TEST_PROJECT_ID}/locations/{TEST_LOCATION}" queue = { # The fully qualified path to the queue - 'name': client.queue_path( - TEST_PROJECT_ID, TEST_LOCATION, TEST_QUEUE_NAME), + "name": client.queue_path(TEST_PROJECT_ID, TEST_LOCATION, TEST_QUEUE_NAME), } - q = client.create_queue(parent, queue) + q = client.create_queue(request={"parent": parent, "queue": queue}) yield q try: # Attempt to delete the queue in case the sample failed. - client.delete_queue(q.name) + client.delete_queue(request={"name": q.name}) except exceptions.NotFound: # The queue was already successfully deleted. - print('Queue already deleted successfully') + print("Queue already deleted successfully") def test_delete_queue(capsys, test_queue): - delete_queue.delete_queue( - TEST_PROJECT_ID, TEST_QUEUE_NAME, TEST_LOCATION - ) + delete_queue.delete_queue(TEST_PROJECT_ID, TEST_QUEUE_NAME, TEST_LOCATION) out, _ = capsys.readouterr() - assert 'Deleted queue' in out + assert "Deleted queue" in out diff --git a/cloud_tasks/snippets/list_queues.py b/cloud_tasks/snippets/list_queues.py index fa48907fad17..17b7886cd138 100644 --- a/cloud_tasks/snippets/list_queues.py +++ b/cloud_tasks/snippets/list_queues.py @@ -22,15 +22,19 @@ def list_queues(project, location): client = tasks_v2.CloudTasksClient() # Construct the fully qualified location path. - parent = client.location_path(project, location) + parent = f"projects/{project}/locations/{location}" # Use the client to obtain the queues. - response = client.list_queues(parent) + response = client.list_queues(request={"parent": parent}) # Print the results. + num_results = 0 for queue in response: + num_results = num_results + 1 print(queue.name) - if response.num_results == 0: - print('No queues found!') + if num_results == 0: + print("No queues found!") + + # [END cloud_tasks_list_queues] diff --git a/cloud_tasks/snippets/list_queues_test.py b/cloud_tasks/snippets/list_queues_test.py index df11d0bd4f9b..2f1d07d9e5d5 100644 --- a/cloud_tasks/snippets/list_queues_test.py +++ b/cloud_tasks/snippets/list_queues_test.py @@ -20,36 +20,35 @@ import list_queues -TEST_PROJECT_ID = os.environ['GOOGLE_CLOUD_PROJECT'] -TEST_LOCATION = os.getenv('TEST_QUEUE_LOCATION', 'us-central1') -TEST_QUEUE_NAME = f'my-queue-{uuid.uuid4().hex}' +TEST_PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"] +TEST_LOCATION = os.getenv("TEST_QUEUE_LOCATION", "us-central1") +TEST_QUEUE_NAME = f"my-queue-{uuid.uuid4().hex}" @pytest.fixture() def test_queue(): client = tasks_v2.CloudTasksClient() - parent = client.location_path(TEST_PROJECT_ID, TEST_LOCATION) + parent = f"projects/{TEST_PROJECT_ID}/locations/{TEST_LOCATION}" queue = { # The fully qualified path to the queue - 'name': client.queue_path( - TEST_PROJECT_ID, TEST_LOCATION, TEST_QUEUE_NAME), + "name": client.queue_path(TEST_PROJECT_ID, TEST_LOCATION, TEST_QUEUE_NAME), } - q = client.create_queue(parent, queue) + q = client.create_queue(request={"parent": parent, "queue": queue}) yield q - client.delete_queue(q.name) + client.delete_queue(request={"name": q.name}) def test_list_queues_not_present(capsys): list_queues.list_queues(TEST_PROJECT_ID, TEST_LOCATION) out, _ = capsys.readouterr() - assert(TEST_QUEUE_NAME not in out) + assert TEST_QUEUE_NAME not in out def test_list_queues_present(capsys, test_queue): list_queues.list_queues(TEST_PROJECT_ID, TEST_LOCATION) out, _ = capsys.readouterr() - assert(TEST_QUEUE_NAME in out) + assert TEST_QUEUE_NAME in out