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: fix mTLS logic #374

Merged
merged 2 commits into from
Apr 10, 2020
Merged

fix: fix mTLS logic #374

merged 2 commits into from
Apr 10, 2020

Conversation

arithmetic1728
Copy link
Collaborator

@arithmetic1728 arithmetic1728 commented Apr 9, 2020 •
edited
Loading

new logic for client_options:

  1. api_endpoint: yes, client_cert_source: yes => use as it is (same as before)
  2. api_endpoint: yes, client_cert_source: no => no adc (previously try to load adc SSL cred)
  3. api_endpoint: whatever, client_cert_source: yes => use cert from client_cert_source, use provided api_endpoint or default mTLS endpoint (same as before)
  4. api_endpoint: no, client_cert_source: no => do nothing (same as before)

#360

@arithmetic1728
fix: fix mTLS logic
ef64560 
previous PR triggers mTLS if client_options.api_endpoint is different 
from the default one, in this PR, we change the logic, mTLS is triggered 
if client_options.api_endpoint is provided
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Apr 9, 2020
software-dov
software-dov approved these changes Apr 10, 2020
View reviewed changes
Copy link
Contributor

@software-dov software-dov left a comment

Choose a reason for hiding this comment

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

Looks good, just one small (nonblocking) question and one (optional) judgement call code nit.

gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 Outdated Show resolved Hide resolved
gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 Show resolved Hide resolved
@software-dov software-dov merged commit e3c079b into master Apr 10, 2020
@software-dov software-dov deleted the sijun/update_mtls branch April 10, 2020 22:14
This was referenced Jan 18, 2022
Merged
Closed
This was referenced Jan 26, 2022
Closed
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@software-dov software-dov software-dov approved these changes

Assignees
No one assigned
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@arithmetic1728 @software-dov @googlebot