diff --git a/runatlantis.io/.vuepress/config.js b/runatlantis.io/.vuepress/config.js index 8aba78573..73a15c1c1 100644 --- a/runatlantis.io/.vuepress/config.js +++ b/runatlantis.io/.vuepress/config.js @@ -66,7 +66,7 @@ module.exports = { 'apply-requirements', 'checkout-strategy', 'terraform-versions', - 'terraform-enterprise' + 'terraform-cloud' ] }, { diff --git a/runatlantis.io/docs/requirements.md b/runatlantis.io/docs/requirements.md index 05fdd491f..08197666a 100644 --- a/runatlantis.io/docs/requirements.md +++ b/runatlantis.io/docs/requirements.md @@ -19,7 +19,7 @@ statefile back to version control. :::tip If you're looking for an easy remote state solution, check out [free remote state](https://app.terraform.io/signup) -storage from Terraform Enterprise. This is fully supported by Atlantis. +storage from Terraform Cloud. This is fully supported by Atlantis. ::: ## Repository Structure diff --git a/runatlantis.io/docs/server-configuration.md b/runatlantis.io/docs/server-configuration.md index 092513265..5914a0ef3 100644 --- a/runatlantis.io/docs/server-configuration.md +++ b/runatlantis.io/docs/server-configuration.md @@ -385,4 +385,4 @@ Values are chosen in this order: # or (recommended) ATLANTIS_TFE_TOKEN='xxx.atlasv1.yyy' atlantis server ``` - A token for Terraform Enterprise integration. See [Terraform Enterprise](terraform-enterprise.html) for more details. + A token for Terraform Cloud/Terraform Enteprise integration. See [Terraform Cloud](terraform-cloud.html) for more details. diff --git a/runatlantis.io/docs/terraform-enterprise.md b/runatlantis.io/docs/terraform-cloud.md similarity index 59% rename from runatlantis.io/docs/terraform-enterprise.md rename to runatlantis.io/docs/terraform-cloud.md index a5c3a914c..cd2e8cfd5 100644 --- a/runatlantis.io/docs/terraform-enterprise.md +++ b/runatlantis.io/docs/terraform-cloud.md @@ -1,8 +1,12 @@ -# Terraform Enterprise +# Terraform Cloud -Atlantis integrates seamlessly with Terraform Enterprise, whether you're using: -* New [Free Remote State Management](https://app.terraform.io/signup) -* Terraform Enterprise SaaS +::: tip +Terraform Enterprise was [recently renamed](https://www.hashicorp.com/blog/introducing-terraform-cloud-remote-state-management) Terraform Cloud. +::: + +Atlantis integrates seamlessly with Terraform Cloud, whether you're using: +* [Free Remote State Management](https://app.terraform.io/signup) +* Terraform Cloud Paid Tiers * Private Terraform Enterprise Read the docs below :point_down: depending on your use-case. @@ -10,22 +14,22 @@ Read the docs below :point_down: depending on your use-case. ## Using Atlantis With Free Remote State Storage To use Atlantis with Free Remote State Storage, you need to: -1. Migrate your state to Terraform Enterprise. See [Getting Started with the Terraform Enterprise Free Tier](https://www.terraform.io/docs/enterprise/free/index.html#enable-remote-state-in-terraform-configurations) +1. Migrate your state to Terraform Cloud. See [Getting Started with the Terraform Cloud Free Tier](https://www.terraform.io/docs/enterprise/free/index.html#enable-remote-state-in-terraform-configurations) 1. Update any projects that are referencing the state you migrated to use the new location -1. [Generate a Terraform Enterprise Token](#generating-a-terraform-enterprise-token) +1. [Generate a Terraform Cloud Token](#generating-a-terraform-cloud-token) 1. [Pass the token to Atlantis](#passing-the-token-to-atlantis) That's it! Atlantis will run as normal and your state will be stored in Terraform -Enterprise. +Cloud. -## Using Atlantis With Full Terraform Enterprise -Atlantis integrates with the full version of Terraform Enterprise (TFE) via the [remote backend](https://www.terraform.io/docs/backends/types/remote.html). +## Using Atlantis With Terraform Cloud Paid Tiers +Atlantis integrates with the full version of Terraform Cloud via its [remote backend](https://www.terraform.io/docs/backends/types/remote.html). Atlantis will run `terraform` commands as usual, however those commands will -actually be executed *remotely* in Terraform Enterprise. +actually be executed *remotely* in Terraform Cloud. ### Why? -Using Atlantis with TFE gives you access to Terraform Enterprise features like: +Using Atlantis with Terraform Cloud gives you access to features like: * Real-time streaming output * Ability to cancel in-progress commands * Secret variables @@ -34,14 +38,14 @@ Using Atlantis with TFE gives you access to Terraform Enterprise features like: **Without** having to change your pull request workflow. ### Getting Started -To use Atlantis with Terraform Enterprise, you need to: -1. Migrate your state to Terraform Enterprise. See [Migrating State from Terraform Open Source](https://www.terraform.io/docs/enterprise/migrate/index.html) +To use Atlantis with Terraform Cloud Paid Tiers, you need to: +1. Migrate your state to Terraform Cloud. See [Migrating State from Terraform Open Source](https://www.terraform.io/docs/enterprise/migrate/index.html) 1. Update any projects that are referencing the state you migrated to use the new location -1. [Generate a Terraform Enterprise Token](#generating-a-terraform-enterprise-token) +1. [Generate a Terraform Cloud Token](#generating-a-terraform-cloud-token) 1. [Pass the token to Atlantis](#passing-the-token-to-atlantis) -## Generating a Terraform Enterprise Token -Atlantis needs a TFE Token that it will use to access the TFE API. +## Generating a Terraform Cloud Token +Atlantis needs a Terraform Cloud Token that it will use to access the API. Using a **Team Token is recommended**, however you can also use a User Token. ### Team Token @@ -58,7 +62,7 @@ The token can be passed to Atlantis via the `ATLANTIS_TFE_TOKEN` environment var You can also use the `--tfe-token` flag, however your token would then be easily viewable in the process list. -That's it! Atlantis should be able to perform Terraform operations using TFE's +That's it! Atlantis should be able to perform Terraform operations using Terraform Cloud's remote state backend now. :::tip NOTE