Fix universe_domain for ADC and access token auth cases #18272
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
GoogleCloudPlatform/magic-modules#9799 was too heavy handed and completely broke ADC and auth token access when
universe_domain
was configured in Terraform.This PR sets the universe domain based the following logic:
Pre-auth
Auth
universe_domain
in file, unset if not founduniverse_domain
in JSON, unset if not foundPost-auth
Release Note Template for Downstream PRs (will be copied)
Derived from GoogleCloudPlatform/magic-modules#10517