Update beta mentions in Provider docs (#5667) (#11547)

Co-authored-by: upodroid <[email protected]>
Co-authored-by: Riley Karson <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Co-authored-by: upodroid <[email protected]>
Co-authored-by: Riley Karson <[email protected]>

Author: 3 people

.changelog/5667.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

website/docs/guides/provider_reference.html.markdown

@@ -96,7 +96,7 @@ authentication options [documented for Google Cloud](https://cloud.google.com/do
 
 Place your credentials in a Terraform Cloud [environment variable](https://www.terraform.io/docs/cloud/workspaces/variables.html):
 1. Create an environment variable called `GOOGLE_CREDENTIALS` in your Terraform Cloud workspace.
-2. Remove the newline characters from your JSON key file and then paste the credentials into the environment variable value field.
+2. Remove the newline characters from your JSON key file and then paste the credentials into the environment variable value field. You can use the tr command to strip newline characters. `cat key.json  | tr -s '\n' ' '`
 3. Mark the variable as **Sensitive** and click **Save variable**.
 
 All runs within the workspace will use the `GOOGLE_CREDENTIALS` variable to authenticate with Google Cloud Platform.

website/docs/guides/provider_versions.html.markdown

@@ -8,7 +8,7 @@ description: |-
 
 # Google Provider Versions
 
-Starting with the `1.19.0` release, there are two versions of the Google
+Starting with the `1.19.0` release, there are two versions of the Google Cloud Platform
 provider:
 
 * `google`
@@ -19,18 +19,13 @@ This documentation (https://registry.terraform.io/providers/hashicorp/google/lat
 between both providers, and all generally available (GA) products and features
 are available in both versions of the provider.
 
-The `google-beta` provider is distinct from the `google` provider in that it
-supports GCP products and features that are in beta, while `google` does not.
-Fields and resources that are only present in `google-beta` will be marked as
-such in the shared provider documentation.
+You may see beta features referenced as Preview since Google simplified the [product launch stages](https://cloud.google.com/blog/products/gcp/google-cloud-gets-simplified-product-launch-stages) in late 2020.
 
-`1.X` series releases of the `google` provider supported beta features; from
-`2.0.0` onwards, beta features are only supported in `google-beta`.
+The `google-beta` provider is distinct from the `google` provider in that it
+supports GCP products and features that are in Preview, while `google` does not.
+Fields and resources that are only present in `google-beta` are clearly marked in the provider documentation.
 
-Beta GCP features have no deprecation policy and no SLA, but are otherwise considered to be feature-complete
-with only minor outstanding issues after their Alpha period. Beta is when GCP
-features are publicly announced, and is when they generally become publicly
-available. For more information see [the official documentation on GCP launch stages](https://cloud.google.com/terms/launch-stages).
+Pre-GA products and features might have limited support, and changes to pre-GA products and features might not be compatible with other pre-GA versions. For more information, see the [launch stage descriptions](https://cloud.google.com/products#product-launch-stages).
 
 The `google-beta` provider sends all requests to the beta endpoint for GCP if
 one exists for that product, regardless of whether the request contains any beta
@@ -39,7 +34,7 @@ features.
 -> In short, using `google-beta` over `google` is similar to using `gcloud beta`
 over `gcloud`. Features that are exclusively available in `google-beta` are GCP
 features that are not yet GA, and they will be made available in `google` after
-their GA launch.
+they go to GA.
 
 ## Using the `google-beta` provider
 
@@ -58,7 +53,6 @@ provider block, which accepts the same arguments as the `google` provider block.
 
 ```hcl
 provider "google-beta" {
-  credentials = "${file("account.json")}"
   project     = "my-project-id"
   region      = "us-central1"
 }
@@ -93,13 +87,11 @@ You can define parallel provider blocks - they will not interfere with each othe
 
 ```hcl
 provider "google" {
-  credentials = "${file("account.json")}"
   project     = "my-project-id"
   region      = "us-central1"
 }
 
 provider "google-beta" {
-  credentials = "${file("account.json")}"
   project     = "my-project-id"
   region      = "us-central1"
 }
@@ -126,4 +118,4 @@ To go from beta to GA, do the reverse. If you were previously using beta fields
 1. (Optional) Explicitly set the fields back to their default values in your Terraform config file, and run `terraform apply`.
 1. Change the `provider` field to `"google"`.
 1. Remove any beta fields from your Terraform config.
-1. Run  `terraform plan` or `terraform refresh`+`terraform show` to see that the beta fields are no longer in state.
+1. Run `terraform plan` or `terraform refresh`+`terraform show` to see that the beta fields are no longer in state.