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.

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

switch to use MultiEnvDefault #14238

Conversation

modular-magician
Copy link
Collaborator

Fixes #14201

In the past these defaults would be set on the schema, however now that they can't be we have to check if they're set and, if not, set them to the defaults manually.

We have 2 functions MultiEnvSearch which assumes its a string and MultiEnvDefault which returns an interface and allows a default value to be set in the case the env var isn't set.

All of these were using MultiEnvSearch - most are strings except USER_PROJECT_OVERRIDE - in this case we need it to be a bool.

On top of that we were checking d.Get() == "", but in this case d.Get was false so we have to check d.GetOk, from here we need to make it a bool rather than a string, so added in the ParseBool.

I checked the rest of these defaults that moved from the schema to here and they indeed are all strings, so I put the logic on this individual case rather than in the MultiEnvDefault function

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Generated Terraform providers, and ran make test and make lint in the generated providers to ensure it passes unit and linter tests.
  • Ran relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

provider: fixed an issue where the `USER_PROJECT_OVERRIDE` environment variable was not being read

Derived from GoogleCloudPlatform/magic-modules#7644

Signed-off-by: Modular Magician <magic-modules@google.com>
@modular-magician modular-magician merged commit 651c1bc into hashicorp:main Apr 5, 2023
rileykarson pushed a commit that referenced this pull request Apr 5, 2023
Signed-off-by: Modular Magician <magic-modules@google.com>
@github-actions
Copy link

github-actions bot commented May 6, 2023

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Provider version v4.60.0 appears to omit X-Goog-User-Project header for some resources
1 participant