Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs(samples): Update Region Tags #1128

Merged
merged 1 commit into from
Mar 21, 2024
+27 −27
Merged

docs(samples): Update Region Tags #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 23 additions & 23 deletions samples/snippets/publisher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def create_topic(project_id: str, topic_id: str) -> None:
# [END pubsub_create_topic]


def create_topic_kinesis_ingestion(
def create_topic_with_kinesis_ingestion(
project_id: str,
topic_id: str,
stream_arn: str,
Expand All @@ -69,7 +69,7 @@ def create_topic_kinesis_ingestion(
gcp_service_account: str,
) -> None:
"""Create a new Pub/Sub topic with AWS Kinesis Ingestion Settings."""
# [START pubsub_create_topic_kinesis_ingestion]
# [START pubsub_create_topic_with_kinesis_ingestion]
from google.cloud import pubsub_v1
from google.pubsub_v1.types import Topic
from google.pubsub_v1.types import IngestionDataSourceSettings
Expand Down Expand Up @@ -100,10 +100,10 @@ def create_topic_kinesis_ingestion(
topic = publisher.create_topic(request=request)

print(f"Created topic: {topic.name} with AWS Kinesis Ingestion Settings")
# [END pubsub_create_topic_kinesis_ingestion]
# [END pubsub_create_topic_with_kinesis_ingestion]


def update_topic_kinesis_ingestion(
def update_topic_type(
project_id: str,
topic_id: str,
stream_arn: str,
Expand All @@ -112,7 +112,7 @@ def update_topic_kinesis_ingestion(
gcp_service_account: str,
) -> None:
"""Update Pub/Sub topic with AWS Kinesis Ingestion Settings."""
# [START pubsub_update_topic_kinesis_ingestion]
# [START pubsub_update_topic_type]
from google.cloud import pubsub_v1
from google.pubsub_v1.types import Topic
from google.pubsub_v1.types import IngestionDataSourceSettings
Expand Down Expand Up @@ -149,7 +149,7 @@ def update_topic_kinesis_ingestion(
print(f"Updated topic: {topic.name} with AWS Kinesis Ingestion Settings")


# [END pubsub_update_topic_kinesis_ingestion]
# [END pubsub_update_topic_type]


def delete_topic(project_id: str, topic_id: str) -> None:
Expand Down Expand Up @@ -522,23 +522,23 @@ def detach_subscription(project_id: str, subscription_id: str) -> None:
create_parser = subparsers.add_parser("create", help=create_topic.__doc__)
create_parser.add_argument("topic_id")

create_topic_kinesis_ingestion_parser = subparsers.add_parser(
"create_kinesis_ingestion", help=create_topic_kinesis_ingestion.__doc__
create_topic_with_kinesis_ingestion_parser = subparsers.add_parser(
"create_kinesis_ingestion", help=create_topic_with_kinesis_ingestion.__doc__
)
create_topic_kinesis_ingestion_parser.add_argument("topic_id")
create_topic_kinesis_ingestion_parser.add_argument("stream_arn")
create_topic_kinesis_ingestion_parser.add_argument("consumer_arn")
create_topic_kinesis_ingestion_parser.add_argument("aws_role_arn")
create_topic_kinesis_ingestion_parser.add_argument("gcp_service_account")

update_topic_kinesis_ingestion_parser = subparsers.add_parser(
"update_kinesis_ingestion", help=update_topic_kinesis_ingestion.__doc__
create_topic_with_kinesis_ingestion_parser.add_argument("topic_id")
create_topic_with_kinesis_ingestion_parser.add_argument("stream_arn")
create_topic_with_kinesis_ingestion_parser.add_argument("consumer_arn")
create_topic_with_kinesis_ingestion_parser.add_argument("aws_role_arn")
create_topic_with_kinesis_ingestion_parser.add_argument("gcp_service_account")

update_topic_type_parser = subparsers.add_parser(
"update_kinesis_ingestion", help=update_topic_type.__doc__
)
update_topic_kinesis_ingestion_parser.add_argument("topic_id")
update_topic_kinesis_ingestion_parser.add_argument("stream_arn")
update_topic_kinesis_ingestion_parser.add_argument("consumer_arn")
update_topic_kinesis_ingestion_parser.add_argument("aws_role_arn")
update_topic_kinesis_ingestion_parser.add_argument("gcp_service_account")
update_topic_type_parser.add_argument("topic_id")
update_topic_type_parser.add_argument("stream_arn")
update_topic_type_parser.add_argument("consumer_arn")
update_topic_type_parser.add_argument("aws_role_arn")
update_topic_type_parser.add_argument("gcp_service_account")

delete_parser = subparsers.add_parser("delete", help=delete_topic.__doc__)
delete_parser.add_argument("topic_id")
Expand Down Expand Up @@ -601,7 +601,7 @@ def detach_subscription(project_id: str, subscription_id: str) -> None:
elif args.command == "create":
create_topic(args.project_id, args.topic_id)
elif args.command == "create_kinesis_ingestion":
create_topic_kinesis_ingestion(
create_topic_with_kinesis_ingestion(
args.project_id,
args.topic_id,
args.stream_arn,
Expand All @@ -610,7 +610,7 @@ def detach_subscription(project_id: str, subscription_id: str) -> None:
args.gcp_service_account,
)
elif args.command == "update_kinesis_ingestion":
update_topic_kinesis_ingestion(
update_topic_type(
args.project_id,
args.topic_id,
args.stream_arn,
Expand Down
8 changes: 4 additions & 4 deletions samples/snippets/publisher_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def test_create(
publisher_client.delete_topic(request={"topic": topic_path})


def test_create_kinesis_ingestion(
def test_create_topic_with_kinesis_ingestion(
publisher_client: pubsub_v1.PublisherClient, capsys: CaptureFixture[str]
) -> None:
# The scope of `topic_path` is limited to this function.
Expand All @@ -146,7 +146,7 @@ def test_create_kinesis_ingestion(
except NotFound:
pass

publisher.create_topic_kinesis_ingestion(
publisher.create_topic_with_kinesis_ingestion(
PROJECT_ID,
TOPIC_ID,
stream_arn,
Expand All @@ -162,7 +162,7 @@ def test_create_kinesis_ingestion(
publisher_client.delete_topic(request={"topic": topic_path})


def test_update_kinesis_ingestion(
def test_update_topic_type(
publisher_client: pubsub_v1.PublisherClient, capsys: CaptureFixture[str]
) -> None:
# The scope of `topic_path` is limited to this function.
Expand All @@ -186,7 +186,7 @@ def test_update_kinesis_ingestion(
out, _ = capsys.readouterr()
assert f"Created topic: {topic_path}" in out

publisher.update_topic_kinesis_ingestion(
publisher.update_topic_type(
PROJECT_ID,
TOPIC_ID,
stream_arn,
Expand Down