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

fix: set creds only if transport not provided #1348

Merged
merged 9 commits into from
Jan 29, 2025
Merged

fix: set creds only if transport not provided #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0f09432
fix: set creds only if transport not provided
ohmayr Jan 23, 2025
7099d5e
link issue to move emulator code
ohmayr Jan 24, 2025
8f75047
address PR feedback
ohmayr Jan 24, 2025
88c4bc8
remove whitespace
ohmayr Jan 24, 2025
0ac094a
add whitespace
ohmayr Jan 24, 2025
361cacb
move todo statement
ohmayr Jan 27, 2025
2dfe399
add whitespace
ohmayr Jan 27, 2025
91b5b66
revert autogenerated changes
ohmayr Jan 27, 2025
222a181
Merge branch 'main' into set-creds-to-transport
mukund-ananthu Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion google/cloud/pubsub_v1/publisher/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,15 @@ def __init__(
# Sanity check: Is our goal to use the emulator?
# If so, create a grpc insecure channel with the emulator host
# as the target.
# TODO(https://github.com/googleapis/python-pubsub/issues/1349): Move the emulator
# code below to test files.
if os.environ.get("PUBSUB_EMULATOR_HOST"):
kwargs["client_options"] = {
"api_endpoint": os.environ.get("PUBSUB_EMULATOR_HOST")
}
kwargs["credentials"] = AnonymousCredentials()
# Configure credentials directly to transport, if provided.
parthea marked this conversation as resolved.
Show resolved Hide resolved
if "transport" not in kwargs:
kwargs["credentials"] = AnonymousCredentials()

# For a transient failure, retry publishing the message infinitely.
self.publisher_options = types.PublisherOptions(*publisher_options)
Expand Down
6 changes: 5 additions & 1 deletion google/cloud/pubsub_v1/subscriber/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,15 @@ def __init__(
# Sanity check: Is our goal to use the emulator?
# If so, create a grpc insecure channel with the emulator host
# as the target.
# TODO(https://github.com/googleapis/python-pubsub/issues/1349): Move the emulator
# code below to test files.
if os.environ.get("PUBSUB_EMULATOR_HOST"):
kwargs["client_options"] = {
"api_endpoint": os.environ.get("PUBSUB_EMULATOR_HOST")
}
kwargs["credentials"] = AnonymousCredentials()
# Configure credentials directly to transport, if provided.
if "transport" not in kwargs:
kwargs["credentials"] = AnonymousCredentials()

# Instantiate the underlying GAPIC client.
super().__init__(**kwargs)
Expand Down
2 changes: 2 additions & 0 deletions owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@
if count < len(clients_to_patch):
raise Exception(err_msg)

# TODO(https://github.com/googleapis/python-pubsub/issues/1349): Move the emulator
# code below to test files.
count = s.replace(
clients_to_patch,
r"# initialize with the provided callable or the passed in class",
Expand Down
Loading