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: detect correct auth when ADC env var is set but empty #1374

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: detect correct auth when ADC env var is set but empty #1374

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34849ed
fix: detect correct auth when ADC env var set but empty
mbrancato Aug 22, 2023
5486f43
Merge branch 'main' into support_adc_set_empty
mbrancato Aug 16, 2024
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
10 changes: 5 additions & 5 deletions google/auth/_default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,23 +250,23 @@ def _get_explicit_environ_credentials(quota_project_id=None):
from google.auth import _cloud_sdk

cloud_sdk_adc_path = _cloud_sdk.get_application_default_credentials_path()
explicit_file = os.environ.get(environment_vars.CREDENTIALS)
explicit_file = os.environ.get(environment_vars.CREDENTIALS, "")

_LOGGER.debug(
"Checking %s for explicit credentials as part of auth process...", explicit_file
"Checking '%s' for explicit credentials as part of auth process...", explicit_file
)

if explicit_file is not None and explicit_file == cloud_sdk_adc_path:
if explicit_file != "" and explicit_file == cloud_sdk_adc_path:
# Cloud sdk flow calls gcloud to fetch project id, so if the explicit
# file path is cloud sdk credentials path, then we should fall back
# to cloud sdk flow, otherwise project id cannot be obtained.
_LOGGER.debug(
"Explicit credentials path %s is the same as Cloud SDK credentials path, fall back to Cloud SDK credentials flow...",
"Explicit credentials path '%s' is the same as Cloud SDK credentials path, fall back to Cloud SDK credentials flow...",
explicit_file,
)
return _get_gcloud_sdk_credentials(quota_project_id=quota_project_id)

if explicit_file is not None:
if explicit_file != "":
credentials, project_id = load_credentials_from_file(
os.environ[environment_vars.CREDENTIALS], quota_project_id=quota_project_id
)
Expand Down