public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-05 17:52:38 +00:00
Code Issues Projects Releases Wiki Activity

providers/google: Change account_file to JSON

Browse Source 
If JSON fails to parse, treat it as a file path
This commit is contained in:
Justin Campbell 2015-07-27 15:35:52 -04:00
parent c3866535fe
commit 4b50d79fec
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
index.html.markdown
View File

@ -19,7 +19,7 @@ Use the navigation to the left to read about the available resources.
``` ```
# Configure the Google Cloud provider # Configure the Google Cloud provider
provider "google" { provider "google" {
account_file = "account.json" account_file = "${file("account.json")}"
project = "my-gce-project" project = "my-gce-project"
region = "us-central1" region = "us-central1"
} }
@ -34,19 +34,13 @@ resource "google_compute_instance" "default" {
The following keys can be used to configure the provider. The following keys can be used to configure the provider.
* `account_file` - (Required, unless `account_file_contents` is present) Path * `account_file` - (Required) Contents of the JSON file used to describe your
to the JSON file used to describe your account credentials, downloaded from account credentials, downloaded from Google Cloud Console. More details on
Google Cloud Console. More details on retrieving this file are below. The retrieving this file are below. The `account file` can be "" if you are running
_account file_ can be "" if you are running terraform from a GCE instance with terraform from a GCE instance with a properly-configured [Compute Engine
a properly-configured [Compute Engine Service Service Account](https://cloud.google.com/compute/docs/authentication). This
Account](https://cloud.google.com/compute/docs/authentication). This can also can also be specified with the `GOOGLE_ACCOUNT_FILE` shell environment
be specified with the `GOOGLE_ACCOUNT_FILE` shell environment variable. variable.
* `account_file_contents` - (Required, unless `account_file` is present) The
contents of `account_file`. This can be used to pass the account credentials
with a Terraform var or environment variable if the account file is not
accessible. This can also be specified with the `GOOGLE_ACCOUNT_FILE_CONTENTS`
shell environment variable.
* `project` - (Required) The ID of the project to apply any resources to. This * `project` - (Required) The ID of the project to apply any resources to. This
can also be specified with the `GOOGLE_PROJECT` shell environment variable. can also be specified with the `GOOGLE_PROJECT` shell environment variable.