From 04fb42cb05ad0d68f907a87fa99eb9063952a250 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 21 Dec 2021 17:05:09 -0500
Subject: [PATCH 01/15] Update push CLI command page
---
website/docs/cli/commands/push.mdx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/website/docs/cli/commands/push.mdx b/website/docs/cli/commands/push.mdx
index 7eb66776e9..ff34d5c41e 100644
--- a/website/docs/cli/commands/push.mdx
+++ b/website/docs/cli/commands/push.mdx
@@ -1,5 +1,5 @@
---
-page_title: 'Command: push'
+page_title: "Command: push"
description: >-
DISCONTINUED. Terraform Cloud and the modern "remote" backend have replaced
the old `terraform push` command.
@@ -7,7 +7,7 @@ description: >-
# Command: push
-!> **Important:** The `terraform push` command is no longer functional. Its functionality was replaced and surpassed by [the `remote` backend](/language/settings/backends/remote), which works with current versions of Terraform Cloud. The `remote` backend allows you to run remote operations directly from the command line, and displays real-time output from the remote run environment.
+!> **Important:** The `terraform push` command is no longer functional. We recommend the [Terraform Cloud CLI integration](/cli/cloud) instead, which allows you to run remote operations in Terraform Cloud directly from the command line.
The `terraform push` command was an early implementation of remote Terraform runs. It allowed teams to push a configuration to a remote run environment in a discontinued version of Terraform Enterprise.
From f55af420869e12f816e7e62e731853373dd66ea2 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 21 Dec 2021 17:10:29 -0500
Subject: [PATCH 02/15] Update module sources page
---
website/docs/language/modules/sources.mdx | 61 +++++++++++------------
1 file changed, 30 insertions(+), 31 deletions(-)
diff --git a/website/docs/language/modules/sources.mdx b/website/docs/language/modules/sources.mdx
index 1af189b942..8f0b5f417b 100644
--- a/website/docs/language/modules/sources.mdx
+++ b/website/docs/language/modules/sources.mdx
@@ -22,23 +22,23 @@ used by other Terraform commands.
The module installer supports installation from a number of different source
types, as listed below.
-* [Local paths](#local-paths)
+- [Local paths](#local-paths)
-* [Terraform Registry](#terraform-registry)
+- [Terraform Registry](#terraform-registry)
-* [GitHub](#github)
+- [GitHub](#github)
-* [Bitbucket](#bitbucket)
+- [Bitbucket](#bitbucket)
-* Generic [Git](#generic-git-repository), [Mercurial](#generic-mercurial-repository) repositories
+- Generic [Git](#generic-git-repository), [Mercurial](#generic-mercurial-repository) repositories
-* [HTTP URLs](#http-urls)
+- [HTTP URLs](#http-urls)
-* [S3 buckets](#s3-bucket)
+- [S3 buckets](#s3-bucket)
-* [GCS buckets](#gcs-bucket)
+- [GCS buckets](#gcs-bucket)
-* [Modules in Package Sub-directories](#modules-in-package-sub-directories)
+- [Modules in Package Sub-directories](#modules-in-package-sub-directories)
Each of these is described in the following sections. Module source addresses
use a _URL-like_ syntax, but with extensions to support unambiguous selection
@@ -135,7 +135,7 @@ If you are using the SaaS version of Terraform Cloud, its private
registry hostname is `app.terraform.io`. If you use a self-hosted Terraform
Enterprise instance, its private registry hostname is the same as the host
where you'd access the web UI and the host you'd use when configuring
-the `remote` backend.
+the [Terraform Cloud CLI integration](/cli/cloud).
Registry modules support versioning. You can provide a specific version as shown
in the above examples, or use flexible
@@ -323,13 +323,12 @@ optionally return a different result when Terraform is requesting it.
If the response is successful (`200`-range status code), Terraform looks in
the following locations in order for the next address to access:
-* The value of a response header field named `X-Terraform-Get`.
+- The value of a response header field named `X-Terraform-Get`.
-* If the response is an HTML page, a `meta` element with the name `terraform-get`:
+- If the response is an HTML page, a `meta` element with the name `terraform-get`:
```html
-
+
```
In either case, the result is interpreted as another module source address
@@ -354,10 +353,10 @@ module "vpc" {
The extensions that Terraform recognizes for this special behavior are:
-* `zip`
-* `tar.bz2` and `tbz2`
-* `tar.gz` and `tgz`
-* `tar.xz` and `txz`
+- `zip`
+- `tar.bz2` and `tbz2`
+- `tar.gz` and `tgz`
+- `tar.xz` and `txz`
If your URL _doesn't_ have one of these extensions but refers to an archive
anyway, use the `archive` argument to force this interpretation:
@@ -399,9 +398,9 @@ Terraform will extract the archive to obtain the module source tree.
The module installer looks for AWS credentials in the following locations,
preferring those earlier in the list when multiple are available:
-* The `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables.
-* The default profile in the `.aws/credentials` file in your home directory.
-* If running on an EC2 instance, temporary credentials associated with the
+- The `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables.
+- The default profile in the `.aws/credentials` file in your home directory.
+- If running on an EC2 instance, temporary credentials associated with the
instance's IAM Instance Profile.
## GCS Bucket
@@ -412,8 +411,8 @@ prefix, followed by
For example
-* `gcs::https://www.googleapis.com/storage/v1/BUCKET_NAME/PATH_TO_MODULE`
-* `gcs::https://www.googleapis.com/storage/v1/BUCKET_NAME/PATH/TO/module.zip`
+- `gcs::https://www.googleapis.com/storage/v1/BUCKET_NAME/PATH_TO_MODULE`
+- `gcs::https://www.googleapis.com/storage/v1/BUCKET_NAME/PATH/TO/module.zip`
```hcl
module "consul" {
@@ -423,9 +422,9 @@ module "consul" {
The module installer uses Google Cloud SDK to authenticate with GCS. To set credentials you can:
-* Enter the path of your service account key file in the GOOGLE_APPLICATION_CREDENTIALS environment variable, or;
-* If you're running Terraform from a GCE instance, default credentials are automatically available. See [Creating and Enabling Service Accounts](https://cloud.google.com/compute/docs/access/create-enable-service-accounts-for-instances) for Instances for more details
-* On your computer, you can make your Google identity available by running `gcloud auth application-default login`.
+- Enter the path of your service account key file in the GOOGLE_APPLICATION_CREDENTIALS environment variable, or;
+- If you're running Terraform from a GCE instance, default credentials are automatically available. See [Creating and Enabling Service Accounts](https://cloud.google.com/compute/docs/access/create-enable-service-accounts-for-instances) for Instances for more details
+- On your computer, you can make your Google identity available by running `gcloud auth application-default login`.
## Modules in Package Sub-directories
@@ -437,16 +436,16 @@ A special double-slash syntax is interpreted by Terraform to indicate that
the remaining path after that point is a sub-directory within the package.
For example:
-* `hashicorp/consul/aws//modules/consul-cluster`
-* `git::https://example.com/network.git//modules/vpc`
-* `https://example.com/network-module.zip//modules/vpc`
-* `s3::https://s3-eu-west-1.amazonaws.com/examplecorp-terraform-modules/network.zip//modules/vpc`
+- `hashicorp/consul/aws//modules/consul-cluster`
+- `git::https://example.com/network.git//modules/vpc`
+- `https://example.com/network-module.zip//modules/vpc`
+- `s3::https://s3-eu-west-1.amazonaws.com/examplecorp-terraform-modules/network.zip//modules/vpc`
If the source address has arguments, such as the `ref` argument supported for
the version control sources, the sub-directory portion must be _before_ those
arguments:
-* `git::https://example.com/network.git//modules/vpc?ref=v1.2.0`
+- `git::https://example.com/network.git//modules/vpc?ref=v1.2.0`
Terraform will still extract the entire package to local disk, but will read
the module from the subdirectory. As a result, it is safe for a module in
From 3adcc0158c854fb725438e31383ccb77eaa337b2 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 21 Dec 2021 17:19:05 -0500
Subject: [PATCH 03/15] Add cli integration to command pages
---
website/docs/cli/commands/import.mdx | 22 +++++++++----------
website/docs/cli/commands/state/mv.mdx | 11 +++++-----
website/docs/cli/commands/state/push.mdx | 5 ++---
.../cli/commands/state/replace-provider.mdx | 11 +++++-----
website/docs/cli/commands/state/rm.mdx | 11 +++++-----
website/docs/cli/commands/taint.mdx | 20 ++++++++---------
website/docs/cli/commands/untaint.mdx | 13 +++++------
7 files changed, 43 insertions(+), 50 deletions(-)
diff --git a/website/docs/cli/commands/import.mdx b/website/docs/cli/commands/import.mdx
index 42e1eaa609..ec46b1e032 100644
--- a/website/docs/cli/commands/import.mdx
+++ b/website/docs/cli/commands/import.mdx
@@ -1,5 +1,5 @@
---
-page_title: 'Command: import'
+page_title: "Command: import"
description: The terraform import command brings existing resources into Terraform state.
---
@@ -38,36 +38,36 @@ behavior. For more information on this assumption, see
The command-line flags are all optional. The list of available flags are:
-* `-config=path` - Path to directory of Terraform configuration files that
+- `-config=path` - Path to directory of Terraform configuration files that
configure the provider for import. This defaults to your working directory.
If this directory contains no Terraform configuration files, the provider
must be configured via manual input or environmental variables.
-* `-input=true` - Whether to ask for input for provider configuration.
+- `-input=true` - Whether to ask for input for provider configuration.
-* `-lock=false` - Don't hold a state lock during the operation. This is
+- `-lock=false` - Don't hold a state lock during the operation. This is
dangerous if others might concurrently run commands against the same
workspace.
-* `-lock-timeout=0s` - Duration to retry a state lock.
+- `-lock-timeout=0s` - Duration to retry a state lock.
-* `-no-color` - If specified, output won't contain any color.
+- `-no-color` - If specified, output won't contain any color.
-* `-parallelism=n` - Limit the number of concurrent operation as Terraform
+- `-parallelism=n` - Limit the number of concurrent operation as Terraform
[walks the graph](/internals/graph#walking-the-graph). Defaults
to 10.
-* `-provider=provider` - **Deprecated** Override the provider configuration to
+- `-provider=provider` - **Deprecated** Override the provider configuration to
use when importing the object. By default, Terraform uses the provider specified
in the configuration for the target resource, and that is the best behavior in most cases.
-* `-var 'foo=bar'` - Set a variable in the Terraform configuration. This flag
+- `-var 'foo=bar'` - Set a variable in the Terraform configuration. This flag
can be set multiple times. Variable values are interpreted as
[literal expressions](/language/expressions/types) in the
Terraform language, so list and map values can be specified via this flag.
This is only useful with the `-config` flag.
-* `-var-file=foo` - Set variables in the Terraform configuration from
+- `-var-file=foo` - Set variables in the Terraform configuration from
a [variable file](/language/values/variables#variable-definitions-tfvars-files). If
a `terraform.tfvars` or any `.auto.tfvars` files are present in the current
directory, they will be automatically loaded. `terraform.tfvars` is loaded
@@ -77,7 +77,7 @@ The command-line flags are all optional. The list of available flags are:
useful with the `-config` flag.
For configurations using
-[the `remote` backend](/language/settings/backends/remote)
+the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform import`
also accepts the option
[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
diff --git a/website/docs/cli/commands/state/mv.mdx b/website/docs/cli/commands/state/mv.mdx
index 72999019ef..ba1257427a 100644
--- a/website/docs/cli/commands/state/mv.mdx
+++ b/website/docs/cli/commands/state/mv.mdx
@@ -1,5 +1,5 @@
---
-page_title: 'Command: state mv'
+page_title: "Command: state mv"
description: >-
The `terraform state mv` command changes bindings in Terraform state,
associating existing remote objects with new resource instances.
@@ -54,20 +54,19 @@ address.
This command also accepts the following options:
-* `-dry-run` - Report all of the resource instances that match the given
+- `-dry-run` - Report all of the resource instances that match the given
address without actually "forgetting" any of them.
-* `-lock=false` - Don't hold a state lock during the operation. This is
+- `-lock=false` - Don't hold a state lock during the operation. This is
dangerous if others might concurrently run commands against the same
workspace.
-* `-lock-timeout=DURATION` - Unless locking is disabled with `-lock=false`,
+- `-lock-timeout=DURATION` - Unless locking is disabled with `-lock=false`,
instructs Terraform to retry acquiring a lock for a period of time before
returning an error. The duration syntax is a number followed by a time
unit letter, such as "3s" for three seconds.
-For configurations using
-[the `remote` backend](/language/settings/backends/remote)
+For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform state mv`
also accepts the option
[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
diff --git a/website/docs/cli/commands/state/push.mdx b/website/docs/cli/commands/state/push.mdx
index 853b53618c..6da6b0573f 100644
--- a/website/docs/cli/commands/state/push.mdx
+++ b/website/docs/cli/commands/state/push.mdx
@@ -1,5 +1,5 @@
---
-page_title: 'Command: state push'
+page_title: "Command: state push"
description: The `terraform state push` command pushes items to the Terraform state.
---
@@ -40,8 +40,7 @@ Both of these safety checks can be disabled with the `-force` flag.
**This is not recommended.** If you disable the safety checks and are
pushing state, the destination state will be overwritten.
-For configurations using
-[the `remote` backend](/language/settings/backends/remote)
+For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform state push`
also accepts the option
[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
diff --git a/website/docs/cli/commands/state/replace-provider.mdx b/website/docs/cli/commands/state/replace-provider.mdx
index 3c74bd6e72..ead4b8591b 100644
--- a/website/docs/cli/commands/state/replace-provider.mdx
+++ b/website/docs/cli/commands/state/replace-provider.mdx
@@ -1,5 +1,5 @@
---
-page_title: 'Command: state replace-provider'
+page_title: "Command: state replace-provider"
description: >-
The `terraform state replace-provider` command replaces the provider for
resources in the Terraform state.
@@ -24,16 +24,15 @@ of this command, backups are required.
This command also accepts the following options:
-* `-auto-approve` - Skip interactive approval.
+- `-auto-approve` - Skip interactive approval.
-* `-lock=false` - Don't hold a state lock during the operation. This is
+- `-lock=false` - Don't hold a state lock during the operation. This is
dangerous if others might concurrently run commands against the same
workspace.
-* `-lock-timeout=0s` - Duration to retry a state lock.
+- `-lock-timeout=0s` - Duration to retry a state lock.
-For configurations using
-[the `remote` backend](/language/settings/backends/remote)
+For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform state replace-provider`
also accepts the option
[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
diff --git a/website/docs/cli/commands/state/rm.mdx b/website/docs/cli/commands/state/rm.mdx
index 034265767c..36821f0007 100644
--- a/website/docs/cli/commands/state/rm.mdx
+++ b/website/docs/cli/commands/state/rm.mdx
@@ -1,5 +1,5 @@
---
-page_title: 'Command: state rm'
+page_title: "Command: state rm"
description: >-
The `terraform state rm` command removes bindings from the Terraform state,
causing Terraform to "forget about" existing objects.
@@ -37,20 +37,19 @@ the old objects still present.
This command also accepts the following options:
-* `-dry-run` - Report all of the resource instances that match the given
+- `-dry-run` - Report all of the resource instances that match the given
address without actually "forgetting" any of them.
-* `-lock=false` - Don't hold a state lock during the operation. This is
+- `-lock=false` - Don't hold a state lock during the operation. This is
dangerous if others might concurrently run commands against the same
workspace.
-* `-lock-timeout=DURATION` - Unless locking is disabled with `-lock=false`,
+- `-lock-timeout=DURATION` - Unless locking is disabled with `-lock=false`,
instructs Terraform to retry acquiring a lock for a period of time before
returning an error. The duration syntax is a number followed by a time
unit letter, such as "3s" for three seconds.
-For configurations using
-[the `remote` backend](/language/settings/backends/remote)
+For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform state rm`
also accepts the option
[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
diff --git a/website/docs/cli/commands/taint.mdx b/website/docs/cli/commands/taint.mdx
index 007c6d9c8f..9e89fa40b6 100644
--- a/website/docs/cli/commands/taint.mdx
+++ b/website/docs/cli/commands/taint.mdx
@@ -1,5 +1,5 @@
---
-page_title: 'Command: taint'
+page_title: "Command: taint"
description: |-
The `terraform taint` command informs Terraform that a particular object
is damaged or degraded.
@@ -35,29 +35,27 @@ The address is in
[the resource address syntax](/cli/state/resource-addressing) syntax,
as shown in the output from other commands, such as:
-* `aws_instance.foo`
-* `aws_instance.bar[1]`
-* `aws_instance.baz[\"key\"]` (quotes in resource addresses must be escaped on the command line, so that they will not be interpreted by your shell)
-* `module.foo.module.bar.aws_instance.qux`
+- `aws_instance.foo`
+- `aws_instance.bar[1]`
+- `aws_instance.baz[\"key\"]` (quotes in resource addresses must be escaped on the command line, so that they will not be interpreted by your shell)
+- `module.foo.module.bar.aws_instance.qux`
This command accepts the following options:
-* `-allow-missing` - If specified, the command will succeed (exit code 0)
+- `-allow-missing` - If specified, the command will succeed (exit code 0)
even if the resource is missing. The command might still return an error
for other situations, such as if there is a problem reading or writing
the state.
-* `-lock=false` - Disables Terraform's default behavior of attempting to take
+- `-lock=false` - Disables Terraform's default behavior of attempting to take
a read/write lock on the state for the duration of the operation.
-* `-lock-timeout=DURATION` - Unless locking is disabled with `-lock=false`,
+- `-lock-timeout=DURATION` - Unless locking is disabled with `-lock=false`,
instructs Terraform to retry acquiring a lock for a period of time before
returning an error. The duration syntax is a number followed by a time
unit letter, such as "3s" for three seconds.
-For configurations using
-[the `remote` backend](/language/settings/backends/remote)
-only, `terraform taint`
+For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote) only, `terraform taint`
also accepts the option
[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
diff --git a/website/docs/cli/commands/untaint.mdx b/website/docs/cli/commands/untaint.mdx
index 85e210a6a3..0158dece5f 100644
--- a/website/docs/cli/commands/untaint.mdx
+++ b/website/docs/cli/commands/untaint.mdx
@@ -1,5 +1,5 @@
---
-page_title: 'Command: untaint'
+page_title: "Command: untaint"
description: |-
The `terraform untaint` command tells Terraform that an object is functioning
correctly, even though its creation failed or it was previously manually
@@ -43,26 +43,25 @@ identifying a particular resource instance which is currently tainted.
This command also accepts the following options:
-* `-allow-missing` - If specified, the command will succeed (exit code 0)
+- `-allow-missing` - If specified, the command will succeed (exit code 0)
even if the resource is missing. The command might still return an error
for other situations, such as if there is a problem reading or writing
the state.
-* `-lock=false` - Don't hold a state lock during the operation. This is
+- `-lock=false` - Don't hold a state lock during the operation. This is
dangerous if others might concurrently run commands against the same
workspace.
-* `-lock-timeout=DURATION` - Unless locking is disabled with `-lock=false`,
+- `-lock-timeout=DURATION` - Unless locking is disabled with `-lock=false`,
instructs Terraform to retry acquiring a lock for a period of time before
returning an error. The duration syntax is a number followed by a time
unit letter, such as "3s" for three seconds.
-* `-no-color` - Disables terminal formatting sequences in the output. Use this
+- `-no-color` - Disables terminal formatting sequences in the output. Use this
if you are running Terraform in a context where its output will be
rendered by a system that cannot interpret terminal formatting.
-For configurations using
-[the `remote` backend](/language/settings/backends/remote)
+For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform untaint`
also accepts the option
[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
From 9022b23d574b0c1f160033178f56959ee50f2cdc Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 21 Dec 2021 17:37:35 -0500
Subject: [PATCH 04/15] Fixing references again
---
website/docs/cli/commands/import.mdx | 5 ++---
website/docs/cli/commands/state/mv.mdx | 2 +-
website/docs/cli/commands/state/push.mdx | 4 ++--
website/docs/cli/commands/state/replace-provider.mdx | 2 +-
website/docs/cli/commands/state/rm.mdx | 2 +-
website/docs/cli/commands/taint.mdx | 2 +-
website/docs/cli/commands/untaint.mdx | 2 +-
7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/website/docs/cli/commands/import.mdx b/website/docs/cli/commands/import.mdx
index ec46b1e032..96c5a45c0f 100644
--- a/website/docs/cli/commands/import.mdx
+++ b/website/docs/cli/commands/import.mdx
@@ -76,11 +76,10 @@ The command-line flags are all optional. The list of available flags are:
the working directory. This flag can be used multiple times. This is only
useful with the `-config` flag.
-For configurations using
-the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
+For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform import`
also accepts the option
-[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
+[`-ignore-remote-version`](/cli/cloud/command-line-arguments#ignore-remote-version).
For configurations using
[the `local` backend](/language/settings/backends/local) only,
diff --git a/website/docs/cli/commands/state/mv.mdx b/website/docs/cli/commands/state/mv.mdx
index ba1257427a..2e825d4963 100644
--- a/website/docs/cli/commands/state/mv.mdx
+++ b/website/docs/cli/commands/state/mv.mdx
@@ -69,7 +69,7 @@ This command also accepts the following options:
For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform state mv`
also accepts the option
-[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
+[`-ignore-remote-version`](/cli/cloud/command-line-arguments#ignore-remote-version).
The legacy options [`-backup` and `-backup-out`](/language/settings/backends/local#command-line-arguments)
operate on a local state file only. Configurations using
diff --git a/website/docs/cli/commands/state/push.mdx b/website/docs/cli/commands/state/push.mdx
index 6da6b0573f..4d6256ddc7 100644
--- a/website/docs/cli/commands/state/push.mdx
+++ b/website/docs/cli/commands/state/push.mdx
@@ -40,7 +40,7 @@ Both of these safety checks can be disabled with the `-force` flag.
**This is not recommended.** If you disable the safety checks and are
pushing state, the destination state will be overwritten.
-For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
+For configurations using the [Terraform Cloud CLI integration](/cli/cloud/command-line-arguments#ignore-remote-version) or the [`remote` backend](/language/settings/backends/remote#command-line-arguments)
only, `terraform state push`
also accepts the option
-[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
+`-ignore-remote-version`.
diff --git a/website/docs/cli/commands/state/replace-provider.mdx b/website/docs/cli/commands/state/replace-provider.mdx
index ead4b8591b..bcf79da051 100644
--- a/website/docs/cli/commands/state/replace-provider.mdx
+++ b/website/docs/cli/commands/state/replace-provider.mdx
@@ -35,7 +35,7 @@ This command also accepts the following options:
For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform state replace-provider`
also accepts the option
-[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
+[`-ignore-remote-version`](/cli/cloud/command-line-arguments#ignore-remote-version).
For configurations using
[the `local` state rm](/language/settings/backends/local) only,
diff --git a/website/docs/cli/commands/state/rm.mdx b/website/docs/cli/commands/state/rm.mdx
index 36821f0007..3311a9774e 100644
--- a/website/docs/cli/commands/state/rm.mdx
+++ b/website/docs/cli/commands/state/rm.mdx
@@ -52,7 +52,7 @@ This command also accepts the following options:
For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform state rm`
also accepts the option
-[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
+[`-ignore-remote-version`](/cli/cloud/command-line-arguments#ignore-remote-version).
For configurations using
[the `local` state rm](/language/settings/backends/local) only,
diff --git a/website/docs/cli/commands/taint.mdx b/website/docs/cli/commands/taint.mdx
index 9e89fa40b6..44c2d1545d 100644
--- a/website/docs/cli/commands/taint.mdx
+++ b/website/docs/cli/commands/taint.mdx
@@ -57,7 +57,7 @@ This command accepts the following options:
For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote) only, `terraform taint`
also accepts the option
-[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
+[`-ignore-remote-version`](/cli/cloud/command-line-arguments#ignore-remote-version).
For configurations using
[the `local` backend](/language/settings/backends/local) only,
diff --git a/website/docs/cli/commands/untaint.mdx b/website/docs/cli/commands/untaint.mdx
index 0158dece5f..35bd92390b 100644
--- a/website/docs/cli/commands/untaint.mdx
+++ b/website/docs/cli/commands/untaint.mdx
@@ -64,7 +64,7 @@ This command also accepts the following options:
For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform untaint`
also accepts the option
-[`-ignore-remote-version`](/language/settings/backends/remote#command-line-arguments).
+[`-ignore-remote-version`](/cli/cloud/command-line-arguments#ignore-remote-version).
For configurations using
[the `local` backend](/language/settings/backends/local) only,
From caf0bdbe8d43c3acca0494e8e5145dede723e6b3 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 21 Dec 2021 17:39:30 -0500
Subject: [PATCH 05/15] fix push
---
website/docs/cli/commands/state/push.mdx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/website/docs/cli/commands/state/push.mdx b/website/docs/cli/commands/state/push.mdx
index 4d6256ddc7..88cf6daad7 100644
--- a/website/docs/cli/commands/state/push.mdx
+++ b/website/docs/cli/commands/state/push.mdx
@@ -40,7 +40,7 @@ Both of these safety checks can be disabled with the `-force` flag.
**This is not recommended.** If you disable the safety checks and are
pushing state, the destination state will be overwritten.
-For configurations using the [Terraform Cloud CLI integration](/cli/cloud/command-line-arguments#ignore-remote-version) or the [`remote` backend](/language/settings/backends/remote#command-line-arguments)
+For configurations using the [Terraform Cloud CLI integration](/cli/cloud) or the [`remote` backend](/language/settings/backends/remote)
only, `terraform state push`
also accepts the option
-`-ignore-remote-version`.
+[`-ignore-remote-version`](/cli/cloud/command-line-arguments#ignore-remote-version).
From 138ca02b90442ca69ea9025ea6e10faa2383c17b Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 21 Dec 2021 17:51:06 -0500
Subject: [PATCH 06/15] More mentions of remote backend
---
website/docs/cli/commands/validate.mdx | 4 +---
website/docs/cli/config/environment-variables.mdx | 2 +-
website/docs/cli/import/index.mdx | 9 ++++-----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/website/docs/cli/commands/validate.mdx b/website/docs/cli/commands/validate.mdx
index fbbb039716..a516623273 100644
--- a/website/docs/cli/commands/validate.mdx
+++ b/website/docs/cli/commands/validate.mdx
@@ -20,9 +20,7 @@ It is safe to run this command automatically, for example as a post-save
check in a text editor or as a test step for a re-usable module in a CI
system.
-Validation requires an initialized working directory with any referenced
-plugins and modules installed. To initialize a working directory for
-validation without accessing any configured remote backend, use:
+Validation requires an initialized working directory with any referenced plugins and modules installed. To initialize a working directory for validation without accessing any configured backend, use:
```
$ terraform init -backend=false
diff --git a/website/docs/cli/config/environment-variables.mdx b/website/docs/cli/config/environment-variables.mdx
index ffe749ec6a..57f0dd0cd0 100644
--- a/website/docs/cli/config/environment-variables.mdx
+++ b/website/docs/cli/config/environment-variables.mdx
@@ -88,7 +88,7 @@ be separated by spaces otherwise.
## TF_DATA_DIR
`TF_DATA_DIR` changes the location where Terraform keeps its
-per-working-directory data, such as the current remote backend configuration.
+per-working-directory data, such as the current backend configuration.
By default this data is written into a `.terraform` subdirectory of the
current directory, but the path given in `TF_DATA_DIR` will be used instead
diff --git a/website/docs/cli/import/index.mdx b/website/docs/cli/import/index.mdx
index 3ff3417498..9672f5fb45 100644
--- a/website/docs/cli/import/index.mdx
+++ b/website/docs/cli/import/index.mdx
@@ -38,13 +38,12 @@ imported object will be mapped.
While this may seem tedious, it still gives Terraform users an avenue for
importing existing resources.
-## Remote Backends
+## Terraform Cloud
-When using Terraform import on the command line with a [remote
-backend](/language/settings/backends/remote), such as Terraform Cloud, the import
+When using Terraform import on the command line with Terraform Cloud, the import
command runs locally, unlike commands such as apply, which run inside your
Terraform Cloud environment. Because of this, the import command will not have
-access to information from the remote backend, such as workspace variables.
+access to information from Terraform Cloud, such as workspace variables.
-In order to use Terraform import with a remote state backend, you may need to
+In order to use Terraform import with Terraform Cloud, you may need to
set local variables equivalent to the remote workspace variables.
From cab5305191e21f9226681c52a2f1118f0bced260 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 4 Jan 2022 14:58:31 -0500
Subject: [PATCH 07/15] Fix formatting
---
website/docs/cli/commands/import.mdx | 2 +-
website/docs/cli/commands/push.mdx | 2 +-
website/docs/cli/commands/state/mv.mdx | 2 +-
website/docs/cli/commands/state/push.mdx | 2 +-
.../cli/commands/state/replace-provider.mdx | 2 +-
website/docs/cli/commands/state/rm.mdx | 2 +-
website/docs/cli/commands/taint.mdx | 2 +-
website/docs/cli/commands/untaint.mdx | 2 +-
website/docs/cli/commands/validate.mdx | 40 +++++++++----------
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/website/docs/cli/commands/import.mdx b/website/docs/cli/commands/import.mdx
index 96c5a45c0f..ed2e5df9e1 100644
--- a/website/docs/cli/commands/import.mdx
+++ b/website/docs/cli/commands/import.mdx
@@ -1,5 +1,5 @@
---
-page_title: "Command: import"
+page_title: 'Command: import'
description: The terraform import command brings existing resources into Terraform state.
---
diff --git a/website/docs/cli/commands/push.mdx b/website/docs/cli/commands/push.mdx
index ff34d5c41e..0e15e1590a 100644
--- a/website/docs/cli/commands/push.mdx
+++ b/website/docs/cli/commands/push.mdx
@@ -1,5 +1,5 @@
---
-page_title: "Command: push"
+page_title: 'Command: push'
description: >-
DISCONTINUED. Terraform Cloud and the modern "remote" backend have replaced
the old `terraform push` command.
diff --git a/website/docs/cli/commands/state/mv.mdx b/website/docs/cli/commands/state/mv.mdx
index 2e825d4963..ed2159b145 100644
--- a/website/docs/cli/commands/state/mv.mdx
+++ b/website/docs/cli/commands/state/mv.mdx
@@ -1,5 +1,5 @@
---
-page_title: "Command: state mv"
+page_title: 'Command: state mv'
description: >-
The `terraform state mv` command changes bindings in Terraform state,
associating existing remote objects with new resource instances.
diff --git a/website/docs/cli/commands/state/push.mdx b/website/docs/cli/commands/state/push.mdx
index 88cf6daad7..f4417b9b0b 100644
--- a/website/docs/cli/commands/state/push.mdx
+++ b/website/docs/cli/commands/state/push.mdx
@@ -1,5 +1,5 @@
---
-page_title: "Command: state push"
+page_title: 'Command: state push'
description: The `terraform state push` command pushes items to the Terraform state.
---
diff --git a/website/docs/cli/commands/state/replace-provider.mdx b/website/docs/cli/commands/state/replace-provider.mdx
index bcf79da051..63fc4a75ef 100644
--- a/website/docs/cli/commands/state/replace-provider.mdx
+++ b/website/docs/cli/commands/state/replace-provider.mdx
@@ -1,5 +1,5 @@
---
-page_title: "Command: state replace-provider"
+page_title: 'Command: state replace-provider'
description: >-
The `terraform state replace-provider` command replaces the provider for
resources in the Terraform state.
diff --git a/website/docs/cli/commands/state/rm.mdx b/website/docs/cli/commands/state/rm.mdx
index 3311a9774e..e7031865d4 100644
--- a/website/docs/cli/commands/state/rm.mdx
+++ b/website/docs/cli/commands/state/rm.mdx
@@ -1,5 +1,5 @@
---
-page_title: "Command: state rm"
+page_title: 'Command: state rm'
description: >-
The `terraform state rm` command removes bindings from the Terraform state,
causing Terraform to "forget about" existing objects.
diff --git a/website/docs/cli/commands/taint.mdx b/website/docs/cli/commands/taint.mdx
index 44c2d1545d..b37a34b3eb 100644
--- a/website/docs/cli/commands/taint.mdx
+++ b/website/docs/cli/commands/taint.mdx
@@ -1,5 +1,5 @@
---
-page_title: "Command: taint"
+page_title: 'Command: taint'
description: |-
The `terraform taint` command informs Terraform that a particular object
is damaged or degraded.
diff --git a/website/docs/cli/commands/untaint.mdx b/website/docs/cli/commands/untaint.mdx
index 35bd92390b..7d247638ea 100644
--- a/website/docs/cli/commands/untaint.mdx
+++ b/website/docs/cli/commands/untaint.mdx
@@ -1,5 +1,5 @@
---
-page_title: "Command: untaint"
+page_title: 'Command: untaint'
description: |-
The `terraform untaint` command tells Terraform that an object is functioning
correctly, even though its creation failed or it was previously manually
diff --git a/website/docs/cli/commands/validate.mdx b/website/docs/cli/commands/validate.mdx
index a516623273..f662ed6245 100644
--- a/website/docs/cli/commands/validate.mdx
+++ b/website/docs/cli/commands/validate.mdx
@@ -70,26 +70,26 @@ We will introduce new major versions only within the bounds of
In the normal case, Terraform will print a JSON object to the standard output
stream. The top-level JSON object will have the following properties:
-* `valid` (boolean): Summarizes the overall validation result, by indicating
+- `valid` (boolean): Summarizes the overall validation result, by indicating
`true` if Terraform considers the current configuration to be valid or
`false` if it detected any errors.
-* `error_count` (number): A zero or positive whole number giving the count
+- `error_count` (number): A zero or positive whole number giving the count
of errors Terraform detected. If `valid` is `true` then `error_count` will
always be zero, because it is the presence of errors that indicates that
a configuration is invalid.
-* `warning_count` (number): A zero or positive whole number giving the count
+- `warning_count` (number): A zero or positive whole number giving the count
of warnings Terraform detected. Warnings do not cause Terraform to consider
a configuration to be invalid, but they do indicate potential caveats that
a user should consider and possibly resolve.
-* `diagnostics` (array of objects): A JSON array of nested objects that each
+- `diagnostics` (array of objects): A JSON array of nested objects that each
describe an error or warning from Terraform.
The nested objects in `diagnostics` have the following properties:
-* `severity` (string): A string keyword, currently either `"error"` or
+- `severity` (string): A string keyword, currently either `"error"` or
`"warning"`, indicating the diagnostic severity.
The presence of errors causes Terraform to consider a configuration to be
@@ -98,7 +98,7 @@ The nested objects in `diagnostics` have the following properties:
introduce new severity keywords, so consumers should be prepared to accept
and ignore severity values they don't understand.
-* `summary` (string): A short description of the nature of the problem that
+- `summary` (string): A short description of the nature of the problem that
the diagnostic is reporting.
In Terraform's usual human-oriented diagnostic messages, the summary serves
@@ -111,7 +111,7 @@ The nested objects in `diagnostics` have the following properties:
summary. In those cases, the summary might include newline characters which
a renderer should honor when presenting the message visually to a user.
-* `detail` (string): An optional additional message giving more detail about
+- `detail` (string): An optional additional message giving more detail about
the problem.
In Terraform's usual human-oriented diagnostic messages, the detail provides
@@ -133,7 +133,7 @@ The nested objects in `diagnostics` have the following properties:
additional rules for processing other text conventions, but will do so within
the bounds of the rules above to achieve backward-compatibility.
-* `range` (object): An optional object referencing a portion of the configuration
+- `range` (object): An optional object referencing a portion of the configuration
source code that the diagnostic message relates to. For errors, this will
typically indicate the bounds of the specific block header, attribute, or
expression which was detected as invalid.
@@ -147,36 +147,36 @@ The nested objects in `diagnostics` have the following properties:
configuration, so `range` will be omitted or `null` for diagnostic messages
where it isn't relevant.
-* `snippet` (object): An optional object including an excerpt of the
+- `snippet` (object): An optional object including an excerpt of the
configuration source code that the diagnostic message relates to.
The snippet information includes:
- * `context` (string): An optional summary of the root context of the
+ - `context` (string): An optional summary of the root context of the
diagnostic. For example, this might be the resource block containing the
expression which triggered the diagnostic. For some diagnostics this
information is not available, and then this property will be `null`.
- * `code` (string): A snippet of Terraform configuration including the
+ - `code` (string): A snippet of Terraform configuration including the
source of the diagnostic. This can be multiple lines and may include
additional configuration source code around the expression which
triggered the diagnostic.
- * `start_line` (number): A one-based line count representing the position
+ - `start_line` (number): A one-based line count representing the position
in the source file at which the `code` excerpt begins. This is not
necessarily the same value as `range.start.line`, as it is possible for
`code` to include one or more lines of context before the source of the
diagnostic.
- * `highlight_start_offset` (number): A zero-based character offset into the
+ - `highlight_start_offset` (number): A zero-based character offset into the
`code` string, pointing at the start of the expression which triggered
the diagnostic.
- * `highlight_end_offset` (number): A zero-based character offset into the
+ - `highlight_end_offset` (number): A zero-based character offset into the
`code` string, pointing at the end of the expression which triggered the
diagnostic.
- * `values` (array of objects): Contains zero or more expression values
+ - `values` (array of objects): Contains zero or more expression values
which may be useful in understanding the source of a diagnostic in a
complex expression. These expression value objects are described below.
@@ -185,12 +185,12 @@ The nested objects in `diagnostics` have the following properties:
A source position object, as used in the `range` property of a diagnostic
object, has the following properties:
-* `byte` (number): A zero-based byte offset into the indicated file.
+- `byte` (number): A zero-based byte offset into the indicated file.
-* `line` (number): A one-based line count for the line containing the relevant
+- `line` (number): A one-based line count for the line containing the relevant
position in the indicated file.
-* `column` (number): A one-based count of _Unicode characters_ from the start
+- `column` (number): A one-based count of _Unicode characters_ from the start
of the line indicated in `line`.
A `start` position is inclusive while an `end` position is exclusive. The
@@ -206,13 +206,13 @@ part of the expression which triggered the diagnostic. This is especially
useful when using `for_each` or similar constructs, in order to identify
exactly which values are responsible for an error. The object has two properties:
-* `traversal` (string): An HCL-like traversal string, such as
+- `traversal` (string): An HCL-like traversal string, such as
`var.instance_count`. Complex index key values may be elided, so this will
not always be valid, parseable HCL. The contents of this string are intended
to be human-readable and are subject to change in future versions of
Terraform.
-* `statement` (string): A short English-language fragment describing the value
+- `statement` (string): A short English-language fragment describing the value
of the expression when the diagnostic was triggered. The contents of this
string are intended to be human-readable and are subject to change in future
versions of Terraform.
From 5792973dd6ff57e9709afac9108f8f9142ef6d25 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 4 Jan 2022 15:22:12 -0500
Subject: [PATCH 08/15] Update language on import command page
---
website/docs/cli/import/index.mdx | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/website/docs/cli/import/index.mdx b/website/docs/cli/import/index.mdx
index 9672f5fb45..0781741b13 100644
--- a/website/docs/cli/import/index.mdx
+++ b/website/docs/cli/import/index.mdx
@@ -40,10 +40,4 @@ importing existing resources.
## Terraform Cloud
-When using Terraform import on the command line with Terraform Cloud, the import
-command runs locally, unlike commands such as apply, which run inside your
-Terraform Cloud environment. Because of this, the import command will not have
-access to information from Terraform Cloud, such as workspace variables.
-
-In order to use Terraform import with Terraform Cloud, you may need to
-set local variables equivalent to the remote workspace variables.
+When you use Terraform on the command line with Terraform Cloud, many commands (e.g., `apply`) run inside your Terraform Cloud environment. However, the `import` command runs locally, so it will not have access to information from Terraform Cloud. To fix this, you may need to set local variables equivalent to any remote workspace variables in Terraform Cloud.
From 96b31fb1d351b472595f8b44fec8c45486d41bce Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 4 Jan 2022 15:43:52 -0500
Subject: [PATCH 09/15] Update core workflow page
---
website/intro/core-workflow.mdx | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/website/intro/core-workflow.mdx b/website/intro/core-workflow.mdx
index 62afc53dc3..6e44eb8d56 100644
--- a/website/intro/core-workflow.mdx
+++ b/website/intro/core-workflow.mdx
@@ -230,21 +230,22 @@ for a better experience at each step.
Terraform Cloud provides a centralized and secure location for storing
input variables and state while also bringing back a tight feedback loop for
speculative plans for config authors. Terraform configuration interacts with
-Terraform Cloud via the ["remote" backend](/language/settings/backends/remote).
+Terraform Cloud via the [CLI integration](/cli/cloud).
```
terraform {
- backend "remote" {
+ cloud {
organization = "my-org"
+ hostname = "app.terraform.io" # Optional; defaults to app.terraform.io
+
workspaces {
- prefix = "my-app-"
+ tags = ["networking", "source:cli"]
}
}
}
```
-Once the backend is wired up, a Terraform Cloud API key is all that's
-needed by team members to be able to edit config and run speculative plans
+After you configure the integration, a Terraform Cloud API key is all your team members need to edit config and run speculative plans
against the latest version of the state file using all the remotely stored
input variables.
From 8b69d24147ff6350ab21c93065bc607357bfddca Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Tue, 4 Jan 2022 16:31:52 -0500
Subject: [PATCH 10/15] Update remote state data source page
---
website/docs/language/state/remote-state-data.mdx | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/website/docs/language/state/remote-state-data.mdx b/website/docs/language/state/remote-state-data.mdx
index 8dbda8ccb0..997d06e2db 100644
--- a/website/docs/language/state/remote-state-data.mdx
+++ b/website/docs/language/state/remote-state-data.mdx
@@ -13,13 +13,9 @@ The `terraform_remote_state` data source retrieves the root module output values
from some other Terraform configuration, using the latest state snapshot from
the remote backend.
-This data source is built into Terraform, and is always available; you do not
-need to require or configure a provider in order to use it.
+This data source implemented by a built-in provider with the [source address](/language/providers/requirements#source-addresses) `terraform.io/builtin/terraform`. That provider does not include any other resources or data sources. Because of this, the `terraform_remote_state` data source is always available; you do not need to require or configure a provider to use it.
--> **Note:** This data source is implemented by a built-in provider, whose
-[source address](/language/providers/requirements#source-addresses)
-is `terraform.io/builtin/terraform`. That provider does not include any other
-resources or data sources.
+-> **Warning:** To access remote state outputs in Terraform Cloud or Terraform Enterprise, we recommend using the [`tfe_outputs` data source](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/data-sources/outputs) in the [Terraform Cloud/Enterprise Provider](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs). The `tfe_outputs` method is more secure because it does not require full access to state of a workspace to fetch the outputs. If you are using the [Terraform Cloud CLI integration](/docs/cli/cloud), you **must** use `tfe_outputs` because the integration is incompatible with `terraform_remote_state`.
## Alternative Ways to Share Data Between Configurations
@@ -94,12 +90,6 @@ post-processing such as JSON decoding. You can then change that module later
if you switch to a different strategy for sharing data between multiple
Terraform configurations.
-## Usage with Terraform Cloud/Enterprise
-
-When trying to access remote state outputs in Terraform Cloud/Enterprise, it is recommended to use the `tfe_outputs` data source in the [Terraform Cloud/Enterprise Provider](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs) instead of relying the `terraform_remote_state` data source.
-
-See the [full documentation](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/data-sources/outputs) for the `tfe_outputs` data source for more details.
-
## Example Usage (`remote` Backend)
```hcl
From fbf02d63429098c2a8e4c0220df77c7d9485bbf5 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Thu, 6 Jan 2022 11:46:08 -0500
Subject: [PATCH 11/15] Language edits
---
website/docs/language/state/remote-state-data.mdx | 9 ++++-----
website/intro/core-workflow.mdx | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/website/docs/language/state/remote-state-data.mdx b/website/docs/language/state/remote-state-data.mdx
index 997d06e2db..a9c6bf93ea 100644
--- a/website/docs/language/state/remote-state-data.mdx
+++ b/website/docs/language/state/remote-state-data.mdx
@@ -9,13 +9,12 @@ description: >-
[backends]: /language/settings/backends
-The `terraform_remote_state` data source retrieves the root module output values
-from some other Terraform configuration, using the latest state snapshot from
-the remote backend.
+The `terraform_remote_state` data source uses the latest state snapshot from the remote backend to retrieve the root module output values
+from some other Terraform configuration.
-This data source implemented by a built-in provider with the [source address](/language/providers/requirements#source-addresses) `terraform.io/builtin/terraform`. That provider does not include any other resources or data sources. Because of this, the `terraform_remote_state` data source is always available; you do not need to require or configure a provider to use it.
+You can use the `terraform_remote_state` data source without requiring or configuring a provider. It is always available because it is implemented through a built-in provider with the [source address](/language/providers/requirements#source-addresses) `terraform.io/builtin/terraform`. That provider does not include any other resources or data sources.
--> **Warning:** To access remote state outputs in Terraform Cloud or Terraform Enterprise, we recommend using the [`tfe_outputs` data source](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/data-sources/outputs) in the [Terraform Cloud/Enterprise Provider](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs). The `tfe_outputs` method is more secure because it does not require full access to state of a workspace to fetch the outputs. If you are using the [Terraform Cloud CLI integration](/docs/cli/cloud), you **must** use `tfe_outputs` because the integration is incompatible with `terraform_remote_state`.
+!> **Warning:** We recommend using the [`tfe_outputs` data source](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/data-sources/outputs) in the [Terraform Cloud/Enterprise Provider](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs) to access remote state outputs in Terraform Cloud or Terraform Enterprise. The `tfe_outputs` data source is more secure because it does not require full access to workspace state to fetch outputs. If you are using the [Terraform Cloud CLI integration](/docs/cli/cloud), you **must** use `tfe_outputs` because the integration is incompatible with `terraform_remote_state`.
## Alternative Ways to Share Data Between Configurations
diff --git a/website/intro/core-workflow.mdx b/website/intro/core-workflow.mdx
index 6e44eb8d56..e73cb326d2 100644
--- a/website/intro/core-workflow.mdx
+++ b/website/intro/core-workflow.mdx
@@ -229,8 +229,8 @@ for a better experience at each step.
Terraform Cloud provides a centralized and secure location for storing
input variables and state while also bringing back a tight feedback loop for
-speculative plans for config authors. Terraform configuration interacts with
-Terraform Cloud via the [CLI integration](/cli/cloud).
+speculative plans for config authors. Terraform configuration can interact with
+Terraform Cloud through the [CLI integration](/cli/cloud).
```
terraform {
From 870116c5091d9d0606f04da1daceea70a0b99923 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Thu, 6 Jan 2022 11:48:13 -0500
Subject: [PATCH 12/15] more langauge edits
---
website/docs/language/state/remote-state-data.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/docs/language/state/remote-state-data.mdx b/website/docs/language/state/remote-state-data.mdx
index a9c6bf93ea..4e08a4c6b9 100644
--- a/website/docs/language/state/remote-state-data.mdx
+++ b/website/docs/language/state/remote-state-data.mdx
@@ -12,7 +12,7 @@ description: >-
The `terraform_remote_state` data source uses the latest state snapshot from the remote backend to retrieve the root module output values
from some other Terraform configuration.
-You can use the `terraform_remote_state` data source without requiring or configuring a provider. It is always available because it is implemented through a built-in provider with the [source address](/language/providers/requirements#source-addresses) `terraform.io/builtin/terraform`. That provider does not include any other resources or data sources.
+You can use the `terraform_remote_state` data source without requiring or configuring a provider. It is always available through a built-in provider with the [source address](/language/providers/requirements#source-addresses) `terraform.io/builtin/terraform`. That provider does not include any other resources or data sources.
!> **Warning:** We recommend using the [`tfe_outputs` data source](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/data-sources/outputs) in the [Terraform Cloud/Enterprise Provider](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs) to access remote state outputs in Terraform Cloud or Terraform Enterprise. The `tfe_outputs` data source is more secure because it does not require full access to workspace state to fetch outputs. If you are using the [Terraform Cloud CLI integration](/docs/cli/cloud), you **must** use `tfe_outputs` because the integration is incompatible with `terraform_remote_state`.
From e9d79f52848d4b93369936c7b45e335859a5cf5c Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Wed, 26 Jan 2022 11:41:57 -0500
Subject: [PATCH 13/15] Update website/docs/cli/import/index.mdx
Co-authored-by: Nick Fagerlund
---
website/docs/cli/import/index.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/docs/cli/import/index.mdx b/website/docs/cli/import/index.mdx
index 0781741b13..d9503e0b46 100644
--- a/website/docs/cli/import/index.mdx
+++ b/website/docs/cli/import/index.mdx
@@ -40,4 +40,4 @@ importing existing resources.
## Terraform Cloud
-When you use Terraform on the command line with Terraform Cloud, many commands (e.g., `apply`) run inside your Terraform Cloud environment. However, the `import` command runs locally, so it will not have access to information from Terraform Cloud. To fix this, you may need to set local variables equivalent to any remote workspace variables in Terraform Cloud.
+When you use Terraform on the command line with Terraform Cloud, many commands (e.g., `apply`) run inside your Terraform Cloud environment. However, the `import` command runs locally, so it will not have access to information from Terraform Cloud. To successfully perform an import, you may need to set local variables equivalent to any remote workspace variables in Terraform Cloud.
From 1b1b5225a2a954d2ff2741b2db49a80fa3c8e01f Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Wed, 26 Jan 2022 11:42:22 -0500
Subject: [PATCH 14/15] Update
website/docs/language/state/remote-state-data.mdx
Co-authored-by: Nick Fagerlund
---
website/docs/language/state/remote-state-data.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/docs/language/state/remote-state-data.mdx b/website/docs/language/state/remote-state-data.mdx
index 4e08a4c6b9..6d5b83554f 100644
--- a/website/docs/language/state/remote-state-data.mdx
+++ b/website/docs/language/state/remote-state-data.mdx
@@ -9,7 +9,7 @@ description: >-
[backends]: /language/settings/backends
-The `terraform_remote_state` data source uses the latest state snapshot from the remote backend to retrieve the root module output values
+The `terraform_remote_state` data source uses the latest state snapshot from a specified state backend to retrieve the root module output values
from some other Terraform configuration.
You can use the `terraform_remote_state` data source without requiring or configuring a provider. It is always available through a built-in provider with the [source address](/language/providers/requirements#source-addresses) `terraform.io/builtin/terraform`. That provider does not include any other resources or data sources.
From 53aa84576f6ce8294adba8e78658417f920ece45 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Wed, 26 Jan 2022 11:43:16 -0500
Subject: [PATCH 15/15] Update
website/docs/language/state/remote-state-data.mdx
Co-authored-by: Nick Fagerlund
---
website/docs/language/state/remote-state-data.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/docs/language/state/remote-state-data.mdx b/website/docs/language/state/remote-state-data.mdx
index 6d5b83554f..48ead8ea43 100644
--- a/website/docs/language/state/remote-state-data.mdx
+++ b/website/docs/language/state/remote-state-data.mdx
@@ -14,7 +14,7 @@ from some other Terraform configuration.
You can use the `terraform_remote_state` data source without requiring or configuring a provider. It is always available through a built-in provider with the [source address](/language/providers/requirements#source-addresses) `terraform.io/builtin/terraform`. That provider does not include any other resources or data sources.
-!> **Warning:** We recommend using the [`tfe_outputs` data source](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/data-sources/outputs) in the [Terraform Cloud/Enterprise Provider](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs) to access remote state outputs in Terraform Cloud or Terraform Enterprise. The `tfe_outputs` data source is more secure because it does not require full access to workspace state to fetch outputs. If you are using the [Terraform Cloud CLI integration](/docs/cli/cloud), you **must** use `tfe_outputs` because the integration is incompatible with `terraform_remote_state`.
+~> **Important:** We recommend using the [`tfe_outputs` data source](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/data-sources/outputs) in the [Terraform Cloud/Enterprise Provider](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs) to access remote state outputs in Terraform Cloud or Terraform Enterprise. The `tfe_outputs` data source is more secure because it does not require full access to workspace state to fetch outputs.
## Alternative Ways to Share Data Between Configurations