mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-06 10:41:07 +00:00
provider/google: read credentials as contents instead of path
Building on the work in #3846, shifting the Google provider's configuration option from `account_file` to `credentials`.
This commit is contained in:
parent
ac6dd0ca81
commit
a2e2f84495
@ -19,14 +19,14 @@ Use the navigation to the left to read about the available resources.
|
||||
```
|
||||
# Configure the Google Cloud provider
|
||||
provider "google" {
|
||||
account_file = "${file("account.json")}"
|
||||
project = "my-gce-project"
|
||||
region = "us-central1"
|
||||
credentials = "${file("account.json")}"
|
||||
project = "my-gce-project"
|
||||
region = "us-central1"
|
||||
}
|
||||
|
||||
# Create a new instance
|
||||
resource "google_compute_instance" "default" {
|
||||
...
|
||||
...
|
||||
}
|
||||
```
|
||||
|
||||
@ -34,12 +34,12 @@ resource "google_compute_instance" "default" {
|
||||
|
||||
The following keys can be used to configure the provider.
|
||||
|
||||
* `account_file` - (Required) Contents of the JSON file used to describe your
|
||||
* `credentials` - (Optional) Contents of the JSON file used to describe your
|
||||
account credentials, downloaded from Google Cloud Console. More details on
|
||||
retrieving this file are below. The `account file` can be "" if you are running
|
||||
terraform from a GCE instance with a properly-configured [Compute Engine
|
||||
retrieving this file are below. Credentials may be blank if you are running
|
||||
Terraform from a GCE instance with a properly-configured [Compute Engine
|
||||
Service Account](https://cloud.google.com/compute/docs/authentication). This
|
||||
can also be specified with the `GOOGLE_ACCOUNT_FILE` shell environment
|
||||
can also be specified with the `GOOGLE_CREDENTIALS` shell environment
|
||||
variable.
|
||||
|
||||
* `project` - (Required) The ID of the project to apply any resources to. This
|
||||
@ -48,6 +48,19 @@ The following keys can be used to configure the provider.
|
||||
* `region` - (Required) The region to operate under. This can also be specified
|
||||
with the `GOOGLE_REGION` shell environment variable.
|
||||
|
||||
The following keys are supported for backwards compatibility, and may be
|
||||
removed in a future version:
|
||||
|
||||
* `account_file` - __Deprecated: please use `credentials` instead.__
|
||||
Path to or contents of the JSON file used to describe your
|
||||
account credentials, downloaded from Google Cloud Console. More details on
|
||||
retrieving this file are below. The `account file` can be "" if you are running
|
||||
terraform from a GCE instance with a properly-configured [Compute Engine
|
||||
Service Account](https://cloud.google.com/compute/docs/authentication). This
|
||||
can also be specified with the `GOOGLE_ACCOUNT_FILE` shell environment
|
||||
variable.
|
||||
|
||||
|
||||
## Authentication JSON File
|
||||
|
||||
Authenticating with Google Cloud services requires a JSON
|
||||
|
Loading…
Reference in New Issue
Block a user