From ac1a67bd2cdfb7c2afb5564d1517bf3c80f73e6f Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Fri, 21 Feb 2025 19:10:58 +0000 Subject: [PATCH] Revert "bugfix improve provider credentials docs. Fixes hashicorp#21471" (#13142) [upstream:db1efcbace7f1357543c304a407b4b1119d975ea] Signed-off-by: Modular Magician --- .changelog/13142.txt | 2 ++ .../docs/guides/provider_reference.html.markdown | 14 ++------------ 2 files changed, 4 insertions(+), 12 deletions(-) create mode 100644 .changelog/13142.txt diff --git a/.changelog/13142.txt b/.changelog/13142.txt new file mode 100644 index 0000000000..126505bd3f --- /dev/null +++ b/.changelog/13142.txt @@ -0,0 +1,2 @@ +```release-note:none +``` \ No newline at end of file diff --git a/website/docs/guides/provider_reference.html.markdown b/website/docs/guides/provider_reference.html.markdown index 3c6a959833..221c87b69e 100644 --- a/website/docs/guides/provider_reference.html.markdown +++ b/website/docs/guides/provider_reference.html.markdown @@ -116,8 +116,8 @@ impersonated service account regardless of the primary identity in use. ## Authentication Configuration -* `credentials` - (Optional) Either the path (as returned by the [file terraform function]) -to or the contents of a [service account key file] in JSON format. You can +* `credentials` - (Optional) Either the path to or the contents of a +[service account key file] in JSON format. You can [manage key files using the Cloud Console]. Your service account key file is used to complete a two-legged OAuth 2.0 flow to obtain access tokens to authenticate with the GCP API as needed; Terraform will use it to reauthenticate @@ -136,15 +136,6 @@ by precedence. the path of your service account key file in the `GOOGLE_APPLICATION_CREDENTIALS` environment variable, or configure authentication through one of the following; - - ```hcl - provider "google" { - alias = "other" - project = var.my_other_project_id - region = var.region - credentials = file(pathexpand(var.gcloud_other_dac_file)) - } - ``` * If you're running Terraform from a GCE instance, default credentials are automatically available. See @@ -423,4 +414,3 @@ See [RFC 9110](https://www.rfc-editor.org/rfc/rfc9110#field.user-agent) for form [gcloud adc]: https://cloud.google.com/sdk/gcloud/reference/auth/application-default/login [service accounts]: https://cloud.google.com/docs/authentication/getting-started [scopes]: https://developers.google.com/identity/protocols/googlescopes -[file terraform function]: https://developer.hashicorp.com/terraform/language/functions/file