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

fix: move to using insecure grpc channels with emulator #402

Merged
merged 13 commits into from Jul 22, 2021
Merged

fix: move to using insecure grpc channels with emulator #402

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
18ec702
fix: move to using insecure grpc channels with emulator
crwilcox Jul 21, 2021
5a703f3
chore: format
crwilcox Jul 21, 2021
6140ba5
fix: add code to manually inject the id token on an insecure channel
crwilcox Jul 21, 2021
935bfee
chore: add line for comment
crwilcox Jul 21, 2021
e0cdd18
test: use the correct credentials object in mock
crwilcox Jul 21, 2021
e29fda8
chore: black
crwilcox Jul 21, 2021
83fc86b
chore: unused var
crwilcox Jul 21, 2021
bf334ba
always configure the bearer token, even if not available
crwilcox Jul 21, 2021
bec5c82
test: test the path populating an id token
crwilcox Jul 21, 2021
4699a1b
chore: remove unused code and testing of unused code
crwilcox Jul 21, 2021
b2af8b2
chore: remove some code repetition
crwilcox Jul 21, 2021
ae185e1
chore: feedback
crwilcox Jul 21, 2021
edd9bd4
Merge branch 'master' into use-insecure-channels-emulator
crwilcox Jul 22, 2021
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
8 changes: 2 additions & 6 deletions google/cloud/firestore_v1/base_client.py
View file
Open in desktop
Expand Up @@ -178,13 +178,9 @@ def _emulator_channel(self, transport):
# "transport.create_channel" to create gRPC channels once google-auth
# extends it's allowed credentials types.
if "GrpcAsyncIOTransport" in str(transport.__name__):
return grpc.aio.secure_channel(
self._emulator_host, self._local_composite_credentials()
)
return grpc.aio.insecure_channel(self._emulator_host)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we possibly have our cake and eat it too by introducing another environment variable for these custom credentials?

else:
return grpc.secure_channel(
self._emulator_host, self._local_composite_credentials()
)
return grpc.insecure_channel(self._emulator_host)

def _local_composite_credentials(self):
"""
Expand Down