Skip to content

Commit

Permalink
feat!: migrate to use microgen (#38)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
2 people authored and dandhlee committed Nov 17, 2022
1 parent 26dd3b7 commit 9e1636e
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 38 deletions.
10 changes: 6 additions & 4 deletions cloud_tasks/snippets/create_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
10 changes: 5 additions & 5 deletions cloud_tasks/snippets/create_queue_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
6 changes: 4 additions & 2 deletions cloud_tasks/snippets/delete_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
23 changes: 10 additions & 13 deletions cloud_tasks/snippets/delete_queue_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 8 additions & 4 deletions cloud_tasks/snippets/list_queues.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
19 changes: 9 additions & 10 deletions cloud_tasks/snippets/list_queues_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9e1636e

Please sign in to comment.