Skip to content

Commit

Permalink
Make misc. cleanups around the docs (hashicorp#4613) (hashicorp#3073)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Mar 19, 2021
1 parent da4678d commit 923b0c0
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .changelog/4613.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
3 changes: 1 addition & 2 deletions google-beta/resource_dataproc_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

"google.golang.org/api/googleapi"

dataproc "google.golang.org/api/dataproc/v1beta2"
"google.golang.org/api/googleapi"
)

func TestDataprocExtractInitTimeout(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions website/docs/guides/getting_started.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ First, authenticate with GCP. The easiest way to do this is to run
`gcloud auth application-default login`, if you already have gcloud
installed. If you don't already have it, gcloud can be installed with
`apt-get install google-cloud-sdk` on Debian-based machines. For a
production use-case, you will want to use service account authentication,
which you can learn about further down in this doc, but for experimenting,
production use-case you will want to use service account authentication,
which you can learn about further down in this doc, but for experimenting
gcloud authentication will work fine.

Next, create a Terraform config file named `"main.tf"`. Inside, you'll
Expand Down
6 changes: 2 additions & 4 deletions website/docs/guides/provider_reference.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ description: |-

# Google Provider Configuration Reference

-> Try out Terraform 0.12 with the Google provider! `google` and `google-beta` are 0.12-compatible from `2.5.0` onwards.

The `google` and `google-beta` provider blocks are used to configure the
credentials you use to authenticate with GCP, as well as a default project and
location (`zone` and/or `region`) for your resources.
Expand Down Expand Up @@ -65,15 +63,15 @@ provider "google-beta" {}
### Running Terraform on your workstation.

If you are using terraform on your workstation, you will need to install the Google Cloud SDK and authenticate using [User Application Default
Credentials](https://cloud.google.com/sdk/gcloud/reference/auth/application-default).
Credentials](https://cloud.google.com/sdk/gcloud/reference/auth/application-default) by running the command `gcloud auth application-default login`.

A quota project must be set which gcloud automatically reads from the `core/project` value. You can override this project by specifying `--project` flag when running `gcloud auth application-default login`. The SDK should return this message if you have set the correct billing project. `Quota project "your-project" was added to ADC which can be used by Google client libraries for billing and quota.`

### Running Terraform on Google Cloud

If you are running terraform on Google Cloud, you can configure that instance or cluster to use a [Google Service
Account](https://cloud.google.com/compute/docs/authentication). This will allow Terraform to authenticate to Google Cloud without having to bake in a separate
credential/authentication file. Make sure that the scope of the VM/Cluster is set to cloud-platform.
credential/authentication file. Ensure that the scope of the VM/Cluster is set to or includes `https://www.googleapis.com/auth/cloud-platform`.

### Running Terraform outside of Google Cloud

Expand Down
2 changes: 0 additions & 2 deletions website/docs/index.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ description: |-

# Google Cloud Platform Provider

-> Try out Terraform 0.12 with the Google provider! `google` and `google-beta` are 0.12-compatible from `2.5.0` onwards.

The Google provider is used to configure your [Google Cloud Platform](https://cloud.google.com/) infrastructure.
See the [Getting Started](/docs/providers/google/guides/getting_started.html) page for an introduction to using the provider.

Expand Down

0 comments on commit 923b0c0

Please sign in to comment.