Skip to content

fix: update GOOGLE_API_USE_MTLS values #940

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

Merged
arithmetic1728 merged 1 commit into from
Jun 10, 2020
Merged

fix: update GOOGLE_API_USE_MTLS values #940

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions googleapiclient/discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,17 +471,17 @@ def build_from_document(
not client_options or not client_options.api_endpoint
):
mtls_endpoint = urljoin(service["mtlsRootUrl"], service["servicePath"])
use_mtls_env = os.getenv("GOOGLE_API_USE_MTLS", "Never")
use_mtls_env = os.getenv("GOOGLE_API_USE_MTLS", "never")

if not use_mtls_env in ("Never", "Auto", "Always"):
if not use_mtls_env in ("never", "auto", "always"):
raise MutualTLSChannelError(
"Unsupported GOOGLE_API_USE_MTLS value. Accepted values: Never, Auto, Always"
"Unsupported GOOGLE_API_USE_MTLS value. Accepted values: never, auto, always"
)

# Switch to mTLS endpoint, if environment variable is "Always", or
# environment varibable is "Auto" and client cert exists.
if use_mtls_env == "Always" or (
use_mtls_env == "Auto" and client_cert_to_use
# Switch to mTLS endpoint, if environment variable is "always", or
# environment varibable is "auto" and client cert exists.
if use_mtls_env == "always" or (
use_mtls_env == "auto" and client_cert_to_use
):
base = mtls_endpoint

Expand Down
20 changes: 10 additions & 10 deletions tests/test_discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,9 +590,9 @@ def test_exception_with_client_cert_source(self):

@parameterized.expand(
[
("Never", REGULAR_ENDPOINT),
("Auto", MTLS_ENDPOINT),
("Always", MTLS_ENDPOINT),
("never", REGULAR_ENDPOINT),
("auto", MTLS_ENDPOINT),
("always", MTLS_ENDPOINT),
]
)
def test_mtls_with_provided_client_cert(self, use_mtls_env, base_url):
Expand All @@ -610,7 +610,7 @@ def test_mtls_with_provided_client_cert(self, use_mtls_env, base_url):
self.check_http_client_cert(plus, has_client_cert=True)
self.assertEqual(plus._baseUrl, base_url)

@parameterized.expand(["Never", "Auto", "Always"])
@parameterized.expand(["never", "auto", "always"])
def test_endpoint_not_switch(self, use_mtls_env):
# Test endpoint is not switched if user provided api endpoint
discovery = open(datafile("plus.json")).read()
Expand All @@ -630,9 +630,9 @@ def test_endpoint_not_switch(self, use_mtls_env):

@parameterized.expand(
[
("Never", REGULAR_ENDPOINT),
("Auto", MTLS_ENDPOINT),
("Always", MTLS_ENDPOINT),
("never", REGULAR_ENDPOINT),
("auto", MTLS_ENDPOINT),
("always", MTLS_ENDPOINT),
]
)
@mock.patch(
Expand Down Expand Up @@ -667,9 +667,9 @@ def test_mtls_with_default_client_cert(

@parameterized.expand(
[
("Never", REGULAR_ENDPOINT),
("Auto", REGULAR_ENDPOINT),
("Always", MTLS_ENDPOINT),
("never", REGULAR_ENDPOINT),
("auto", REGULAR_ENDPOINT),
("always", MTLS_ENDPOINT),
]
)
@mock.patch(
Expand Down