Skip to content

Commit 3aa909a

Browse files
committed
website: Update URLs and name references for Terraform Cloud rebrand
The Terraform Enterprise brand has now been split into two parts: - Terraform Cloud is the application that helps teams use Terraform together, with remote state storage, a shared run environment, etc. - Terraform Enterprise is the on-premise distribution that lets enterprises run a private instance of the Terraform Cloud application. The former TFE docs have been split accordingly.
1 parent d316ea0 commit 3aa909a

24 files changed

Lines changed: 110 additions & 112 deletions

‎tools/terraform-bundle/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,17 @@ that is used for auto-installed plugins, using Hashicorp's release key. At
149149
this time, the core Terraform archive itself is _not_ verified in this way;
150150
that may change in a future version of this tool.
151151

152-
## Installing a Bundle in On-premises Terraform Enterprise
152+
## Installing a Bundle in Terraform Enterprise
153153

154-
If using a private install of Terraform Enterprise in an "air-gapped"
154+
If using a Terraform Enterprise instance in an "air-gapped"
155155
environment, this tool can produce a custom Terraform version package, which
156156
includes a set of provider plugins along with core Terraform.
157157

158158
To create a suitable bundle, use the `-os` and `-arch` options as described
159159
above to produce a bundle targeting `linux_amd64`. You can then place this
160160
archive on an HTTP server reachable by the Terraform Enterprise hosts and
161161
install it as per
162-
[Administration: Managing Terraform Versions](https://www.terraform.io/docs/enterprise/private/admin/resources.html#managing-terraform-versions).
162+
[Administration: Managing Terraform Versions](https://www.terraform.io/docs/enterprise/admin/resources.html#managing-terraform-versions).
163163

164164
After clicking the "Add Terraform Version" button:
165165

‎website/docs/backends/index.html.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Here are some of the benefits of backends:
2020

2121
* **Working in a team**: Backends can store their state remotely and
2222
protect that state with locks to prevent corruption. Some backends
23-
such as Terraform Enterprise even automatically store a history of
23+
such as Terraform Cloud even automatically store a history of
2424
all state revisions.
2525

2626
* **Keeping sensitive information off disk**: State is retrieved from

‎website/docs/backends/operations.html.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ environment and more powerful access controls, without disrupting workflows
2525
for users who are already comfortable with running Terraform.
2626

2727
Currently, [the `remote` backend](./types/remote.html) is the only backend to
28-
support remote operations, and [Terraform Enterprise](/docs/enterprise/index.html)
28+
support remote operations, and [Terraform Cloud](/docs/cloud/index.html)
2929
is the only remote execution environment that supports it. For more information, see:
3030

3131
- [The `remote` backend](./types/remote.html)
32-
- [Terraform Enterprise's CLI-driven run workflow](/docs/enterprise/run/cli.html)
32+
- [Terraform Cloud's CLI-driven run workflow](/docs/cloud/run/cli.html)

‎website/docs/backends/types/remote.html.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ description: |-
1111
**Kind: Enhanced**
1212

1313
-> **Note:** We recommend using Terraform v0.11.13 or newer with this
14-
backend. This backend requires either a Terraform Enterprise account on
15-
[app.terraform.io](https://app.terraform.io) or a private instance of
16-
Terraform Enterprise (version v201809-1 or newer).
14+
backend. This backend requires either a Terraform Cloud account on
15+
[app.terraform.io](https://app.terraform.io) or a Terraform Enterprise instance
16+
(version v201809-1 or newer).
1717

18-
The remote backend stores state and runs operations in Terraform Enterprise.
18+
The remote backend stores state and runs operations in Terraform Cloud.
1919

20-
When used with a Pro or Premium tier Terraform Enterprise account, operations
20+
When used with a Pro or Premium tier Terraform Cloud account, operations
2121
like `terraform plan` or `terraform apply` are executed in Terraform
22-
Enterprise's run environment, with log output streaming to the local terminal.
22+
Cloud's run environment, with log output streaming to the local terminal.
2323
Remote plans and applies use variable values from the associated Terraform
24-
Enterprise workspace.
24+
Cloud workspace.
2525

26-
When used with a free Terraform Enterprise account, operations are executed on
27-
the local machine and state is stored in Terraform Enterprise.
26+
When used with a free Terraform Cloud account, operations are executed on
27+
the local machine and state is stored in Terraform Cloud.
2828

2929
## Command Support
3030

@@ -123,7 +123,7 @@ data "terraform_remote_state" "foo" {
123123
## Example configuration using CLI input
124124

125125
```hcl
126-
# main.tf
126+
# main.tf
127127
terraform {
128128
required_version = "~> 0.12.0"
129129
@@ -165,6 +165,6 @@ The following configuration options are supported:
165165
only the default workspace can be used. This option conflicts with `prefix`.
166166
* `prefix` - (Optional) A prefix used in the names of one or more remote
167167
workspaces, all of which can be used with this configuration. The full
168-
workspace names are used in Terraform Enterprise, and the short names
168+
workspace names are used in Terraform Cloud, and the short names
169169
(minus the prefix) are used on the command line. If omitted, only the
170170
default workspace can be used. This option conflicts with `name`.

‎website/docs/backends/types/terraform-enterprise.html.md‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,30 @@ layout: "backend-types"
33
page_title: "Backend Type: terraform enterprise"
44
sidebar_current: "docs-backends-types-standard-terraform-enterprise"
55
description: |-
6-
Terraform can store the state in Terraform Enterprise
6+
Terraform can store its state in Terraform Enterprise
77
---
88

99
# terraform enterprise
1010

11-
-> **Deprecated** Please use the new enhanced [remote](/docs/backends/types/remote.html)
12-
backend for storing state and running remote operations in Terraform Enterprise.
11+
!> **The `atlas` backend is deprecated.** Please use the new enhanced
12+
[remote](/docs/backends/types/remote.html) backend for storing state and running
13+
remote operations in Terraform Cloud.
1314

1415
**Kind: Standard (with no locking)**
1516

16-
Reads and writes state from a [Terraform Enterprise](/docs/enterprise/index.html)
17+
Reads and writes state from a [Terraform Enterprise](/docs/cloud/index.html)
1718
workspace.
1819

1920
-> **Why is this called "atlas"?** Before it was a standalone offering,
2021
Terraform Enterprise was part of an integrated suite of enterprise products
2122
called Atlas. This backend predates the current version Terraform Enterprise, so
2223
it uses the old name.
2324

24-
This backend is useful for uncommon tasks like migrating state into a Terraform
25-
Enterprise workspace, but we no longer recommend using it as part of your
26-
day-to-day Terraform workflow. Since it performs runs outside of Terraform
27-
Enterprise and updates state directly, it does not support Terraform
28-
Enterprise's collaborative features like [workspace
29-
locking](/docs/enterprise/run/index.html). To perform Terraform Enterprise runs
30-
from the command line, use [Terraform Enterprise's CLI-driven
31-
workflow](/docs/enterprise/run/cli.html) instead.
25+
We no longer recommend using this backend, as it does not support collaboration
26+
features like [workspace
27+
locking](/docs/cloud/run/index.html). Please use the new enhanced
28+
[remote](/docs/backends/types/remote.html) backend for storing state and running
29+
remote operations in Terraform Cloud.
3230

3331
## Example Configuration
3432

@@ -61,7 +59,7 @@ The following configuration options / environment variables are supported:
6159

6260
* `name` - (Required) Full name of the workspace (`<ORGANIZATION>/<WORKSPACE>`).
6361
* `ATLAS_TOKEN`/ `access_token` - (Optional) A Terraform Enterprise [user API
64-
token](/docs/enterprise/users-teams-organizations/users.html#api-tokens). We
62+
token](/docs/cloud/users-teams-organizations/users.html#api-tokens). We
6563
recommend using the `ATLAS_TOKEN` environment variable rather than setting
6664
`access_token` in the configuration. If not set, the token will be requested
6765
during a `terraform init` and saved locally.

‎website/docs/cli-index.html.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ to browse the various subsections.
2323
## Who is This For?
2424

2525
The Terraform CLI docs are relevant to _all Terraform users,_ including open
26-
source users and Terraform Enterprise users.
26+
source users and Terraform Cloud users.
2727

2828
Since these docs are reference material, they are mainly written for
2929
_intermediate and advanced users,_ who need to find complete and detailed

‎website/docs/commands/cli-config.html.markdown‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ The following settings can be set in the CLI configuration file:
6363
[plugin caching](/docs/configuration/providers.html#provider-plugin-cache)
6464
and specifies, as a string, the location of the plugin cache directory.
6565

66-
- `credentials` — provides credentials for use with Terraform Enterprise.
66+
- `credentials` — provides credentials for use with Terraform Cloud.
6767
Terraform uses this when performing remote operations or state access with
6868
the [remote backend](../backends/types/remote.html) and when accessing
69-
Terraform Enterprise's [private module registry.](/docs/enterprise/registry/index.html)
69+
Terraform Cloud's [private module registry.](/docs/cloud/registry/index.html)
7070

7171
This setting is a repeatable block, where the block label is a hostname
72-
(either `app.terraform.io` or the hostname of your private install) and
72+
(either `app.terraform.io` or the hostname of a Terraform Enterprise instance) and
7373
the block body contains a `token` attribute. Whenever Terraform accesses
7474
state, modules, or remote operations from that hostname, it will
7575
authenticate with that API token.
@@ -81,15 +81,15 @@ The following settings can be set in the CLI configuration file:
8181
```
8282
8383
~> **Important:** The token provided here must be a
84-
[user token](/docs/enterprise/users-teams-organizations/users.html#api-tokens)
84+
[user token](/docs/cloud/users-teams-organizations/users.html#api-tokens)
8585
or a
86-
[team token](/docs/enterprise/users-teams-organizations/service-accounts.html#team-service-accounts);
86+
[team token](/docs/cloud/users-teams-organizations/service-accounts.html#team-service-accounts);
8787
organization tokens cannot be used for command-line Terraform actions.
8888
8989
-> **Note:** The credentials hostname must match the hostname in your module
9090
sources and/or backend configuration. If your Terraform Enterprise instance
9191
is available at multiple hostnames, use one of them consistently. (The SaaS
92-
version of Terraform Enterprise responds to API calls at both its newer
92+
version of Terraform Cloud responds to API calls at both its current
9393
hostname, app.terraform.io, and its historical hostname,
9494
atlas.hashicorp.com.)
9595

‎website/docs/configuration-0-11/data-sources.html.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ to create and manage a new infrastructure component, data sources
2424
present read-only views into pre-existing data, or they compute
2525
new values on the fly within Terraform itself.
2626

27-
For example, a data source may retrieve artifact information from
28-
Terraform Enterprise, configuration information from Consul, or look up a pre-existing
27+
For example, a data source may retrieve remote state data from a
28+
Terraform Cloud workspace, configuration information from Consul, or look up a pre-existing
2929
AWS resource by filtering on its attributes and tags.
3030

3131
Every data source in Terraform is mapped to a provider based

‎website/docs/configuration-0-11/modules.html.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ or if there is a well-defined release process that avoids unwanted updates.
130130

131131
Version constraints are supported only for modules installed from a module
132132
registry, such as the [Terraform Registry](https://registry.terraform.io/) or
133-
[Terraform Enterprise's private module registry](/docs/enterprise/registry/index.html).
133+
[Terraform Cloud's private module registry](/docs/cloud/registry/index.html).
134134
Other module sources can provide their own versioning mechanisms within the
135135
source string itself, or might not support versions at all. In particular,
136136
modules sourced from local file paths do not support `version`; since

‎website/docs/configuration-0-11/terraform-enterprise.html.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ description: |-
1111
-> **Note:** This page is about Terraform 0.11 and earlier, and documents a
1212
feature that was removed in Terraform 0.12.
1313

14-
~> **Important:** The `terraform push` command is deprecated, and only works with the legacy version of Terraform Enterprise. In the current version of Terraform Enterprise, you can upload configurations using the API. See [the docs about API-driven runs](/docs/enterprise/run/api.html) for more details.
14+
~> **Important:** The `terraform push` command is deprecated, and only works with the legacy version of Terraform Enterprise. In the current version of Terraform Cloud, you can upload configurations using the API. See [the docs about API-driven runs](/docs/cloud/run/api.html) for more details.
1515

1616
The [`terraform push` command](/docs/commands/push.html) uploads a configuration to a Terraform Enterprise (legacy) environment. The name of the environment (and the organization it's in) can be specified on the command line, or as part of the Terraform configuration in an `atlas` block.
1717

0 commit comments

Comments
 (0)