From b6b2d2d505051d6aa95860cfb5505f05d5816778 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Fri, 7 Apr 2017 11:36:49 -0400 Subject: [PATCH] Remove more references to Atlas --- .../types/terraform-enterprise.html.md | 6 +++ .../terraform-enterprise.html.md | 6 +++ .../artifacts/artifact-provider.html.md | 8 +++- .../artifacts/managing-versions.html.md | 2 +- .../docs/providers/atlas/index.html.markdown | 42 ------------------- .../terraform-enterprise/index.html.markdown | 26 ++++++++---- .../r/artifact.html.markdown | 12 +++--- .../terraform/d/remote_state.html.md | 27 +++++++----- website/source/layouts/docs.erb | 8 ++-- 9 files changed, 63 insertions(+), 74 deletions(-) delete mode 100644 website/source/docs/providers/atlas/index.html.markdown diff --git a/website/source/docs/backends/types/terraform-enterprise.html.md b/website/source/docs/backends/types/terraform-enterprise.html.md index 13663ac6a..e9f2ad08a 100644 --- a/website/source/docs/backends/types/terraform-enterprise.html.md +++ b/website/source/docs/backends/types/terraform-enterprise.html.md @@ -15,6 +15,12 @@ Stores the state in [Terraform Enterprise](https://www.terraform.io/docs/provide You can create a new environment in the Environments section and generate new token in the Tokens page under Settings. +~> **Why is this called "atlas"?** Atlas was previously a commercial offering +from HashiCorp that included a full suite of enterprise products. The products +have since been broken apart into their individual products, like **Terraform +Enterprise**. While this transition is in progress, you may see references to +"atlas" in the documentation. We apologize for the inconvenience. + ## Example Configuration ```hcl diff --git a/website/source/docs/configuration/terraform-enterprise.html.md b/website/source/docs/configuration/terraform-enterprise.html.md index 04a596bcb..e59511f75 100644 --- a/website/source/docs/configuration/terraform-enterprise.html.md +++ b/website/source/docs/configuration/terraform-enterprise.html.md @@ -22,6 +22,12 @@ This page assumes you're familiar with the [configuration syntax](/docs/configuration/syntax.html) already. +~> **Why is this called "atlas"?** Atlas was previously a commercial offering +from HashiCorp that included a full suite of enterprise products. The products +have since been broken apart into their individual products, like **Terraform +Enterprise**. While this transition is in progress, you may see references to +"atlas" in the documentation. We apologize for the inconvenience. + ## Example Terraform Enterprise configuration looks like the following: diff --git a/website/source/docs/enterprise/artifacts/artifact-provider.html.md b/website/source/docs/enterprise/artifacts/artifact-provider.html.md index a68a1e5c6..565c6077c 100755 --- a/website/source/docs/enterprise/artifacts/artifact-provider.html.md +++ b/website/source/docs/enterprise/artifacts/artifact-provider.html.md @@ -14,6 +14,12 @@ This is used to make data stored in Artifacts available to Terraform for interpolation. In the following example, an artifact is defined and references an AMI ID stored in Terraform Enterprise. +~> **Why is this called "atlas"?** Atlas was previously a commercial offering +from HashiCorp that included a full suite of enterprise products. The products +have since been broken apart into their individual products, like **Terraform +Enterprise**. While this transition is in progress, you may see references to +"atlas" in the documentation. We apologize for the inconvenience. + ```hcl provider "atlas" { # You can also set the atlas token by exporting ATLAS_TOKEN into your env @@ -46,4 +52,4 @@ diff would be generated when running `terraform plan`. This allows you to reference changing artifacts and trigger new deployments upon pushing subsequent Packer builds. -Read more about artifacts in the [Terraform documentation](https://terraform.io/docs/providers/atlas/r/artifact.html). +Read more about artifacts in the [Terraform documentation](https://terraform.io/docs/providers/terraform-enterprise/r/artifact.html). diff --git a/website/source/docs/enterprise/artifacts/managing-versions.html.md b/website/source/docs/enterprise/artifacts/managing-versions.html.md index 04ad0fbd1..3c8c23230 100755 --- a/website/source/docs/enterprise/artifacts/managing-versions.html.md +++ b/website/source/docs/enterprise/artifacts/managing-versions.html.md @@ -12,7 +12,7 @@ Artifacts stored in Terraform Enterprise are versioned and assigned a version number. Versions are useful to roll back, audit and deploy images specific versions of images to certain environments in a targeted way. -This assumes you are familiar with the [artifact provider](https://terraform.io/docs/providers/atlas/index.html) +This assumes you are familiar with the [artifact provider](https://terraform.io/docs/providers/terraform-enterprise/index.html) in Terraform. ### Finding the Version of an Artifact diff --git a/website/source/docs/providers/atlas/index.html.markdown b/website/source/docs/providers/atlas/index.html.markdown deleted file mode 100644 index 6f3a008aa..000000000 --- a/website/source/docs/providers/atlas/index.html.markdown +++ /dev/null @@ -1,42 +0,0 @@ ---- -layout: "atlas" -page_title: "Provider: Atlas" -sidebar_current: "docs-atlas-index" -description: |- - The Atlas provider is used to interact with configuration, - artifacts, and metadata managed by the Atlas service. ---- - -# Atlas Provider - -The Atlas provider is used to interact with resources, configuration, -artifacts, and metadata managed by [Atlas](https://atlas.hashicorp.com). -The provider needs to be configured with the proper credentials before -it can be used. - -Use the navigation to the left to read about the available resources. - -## Example Usage - -```hcl -# Configure the Atlas provider -provider "atlas" { - token = "${var.atlas_token}" -} - -# Fetch an artifact configuration -data "atlas_artifact" "web" { - # ... -} -``` - -## Argument Reference - -The following arguments are supported: - -* `address` - (Optional) Atlas server endpoint. Defaults to public Atlas. - This is only required when using an on-premise deployment of Atlas. This can - also be specified with the `ATLAS_ADDRESS` shell environment variable. - -* `token` - (Required) API token. This can also be specified with the - `ATLAS_TOKEN` shell environment variable. diff --git a/website/source/docs/providers/terraform-enterprise/index.html.markdown b/website/source/docs/providers/terraform-enterprise/index.html.markdown index 978630975..1793e5828 100644 --- a/website/source/docs/providers/terraform-enterprise/index.html.markdown +++ b/website/source/docs/providers/terraform-enterprise/index.html.markdown @@ -9,17 +9,24 @@ description: |- # Terraform Enterprise Provider -The Terraform Enterprise provider is used to interact with resources, configuration, -artifacts, and metadata managed by [Terraform Enterprise](https://www.terraform.io/docs/providers/index.html). -The provider needs to be configured with the proper credentials before -it can be used. +The Terraform Enterprise provider is used to interact with resources, +configuration, artifacts, and metadata managed by +[Terraform Enterprise](https://www.terraform.io/docs/providers/index.html). +The provider needs to be configured with the proper credentials before it can +be used. Use the navigation to the left to read about the available resources. +~> **Why is this called "atlas"?** Atlas was previously a commercial offering +from HashiCorp that included a full suite of enterprise products. The products +have since been broken apart into their individual products, like **Terraform +Enterprise**. While this transition is in progress, you may see references to +"atlas" in the documentation. We apologize for the inconvenience. + ## Example Usage -``` -# Configure the Atlas provider +```hcl +# Configure the Terraform Enterprise provider provider "atlas" { token = "${var.atlas_token}" } @@ -34,9 +41,10 @@ data "atlas_artifact" "web" { The following arguments are supported: -* `address` - (Optional) Terrafrom Enterprise server endpoint. Defaults to public Terraform Enterprise. - This is only required when using an on-premise deployment of Terraform Enterprise. This can - also be specified with the `ATLAS_ADDRESS` shell environment variable. +* `address` - (Optional) Terraform Enterprise server endpoint. Defaults to + public Terraform Enterprise. This is only required when using an on-premise + deployment of Terraform Enterprise. This can also be specified with the + `ATLAS_ADDRESS` shell environment variable. * `token` - (Required) API token. This can also be specified with the `ATLAS_TOKEN` shell environment variable. diff --git a/website/source/docs/providers/terraform-enterprise/r/artifact.html.markdown b/website/source/docs/providers/terraform-enterprise/r/artifact.html.markdown index ce9fbde30..42d820929 100644 --- a/website/source/docs/providers/terraform-enterprise/r/artifact.html.markdown +++ b/website/source/docs/providers/terraform-enterprise/r/artifact.html.markdown @@ -3,16 +3,16 @@ layout: "terraform-enterprise" page_title: "Terraform Enterprise: atlas_artifact" sidebar_current: "docs-terraform-enterprise-resource-artifact" description: |- - Provides access to deployment artifacts managed by Terraform Enterprise. This can - be used to dynamically configure instantiation and provisioning - of resources. + Provides access to deployment artifacts managed by Terraform Enterprise. This + can be used to dynamically configure instantiation and provisioning of + resources. --- # atlas_artifact -Provides access to deployment artifacts managed by Atlas. This can -be used to dynamically configure instantiation and provisioning -of resources. +Provides access to deployment artifacts managed by Terraform Enterprise. This +can be used to dynamically configure instantiation and provisioning of +resources. ~> **This resource is deprecated!** Please use the diff --git a/website/source/docs/providers/terraform/d/remote_state.html.md b/website/source/docs/providers/terraform/d/remote_state.html.md index c54fdb014..cec5d919b 100644 --- a/website/source/docs/providers/terraform/d/remote_state.html.md +++ b/website/source/docs/providers/terraform/d/remote_state.html.md @@ -6,23 +6,23 @@ description: |- Accesses state meta data from a remote backend. --- -# remote\_state +# remote_state Retrieves state meta data from a remote backend ## Example Usage -``` +```hcl data "terraform_remote_state" "vpc" { - backend = "atlas" - config { - name = "hashicorp/vpc-prod" - } + backend = "atlas" + config { + name = "hashicorp/vpc-prod" + } } resource "aws_instance" "foo" { - # ... - subnet_id = "${data.terraform_remote_state.vpc.subnet_id}" + # ... + subnet_id = "${data.terraform_remote_state.vpc.subnet_id}" } ``` @@ -47,11 +47,14 @@ on the `terraform_remote_state` resource. ## Root Outputs Only -Only the root level outputs from the remote state are accessible. Outputs from modules within the state cannot be accessed. If you want a module output to be accessible via a remote state, you must thread the output through to a root output. +Only the root level outputs from the remote state are accessible. Outputs from +modules within the state cannot be accessed. If you want a module output to be +accessible via a remote state, you must thread the output through to a root +output. An example is shown below: -``` +```hcl module "app" { source = "..." } @@ -61,4 +64,6 @@ output "app_value" { } ``` -In this example, the output `value` from the "app" module is available as "app_value". If this root level output hadn't been created, then a remote state resource wouldn't be able to access the `value` output on the module. +In this example, the output `value` from the "app" module is available as +"app_value". If this root level output hadn't been created, then a remote state +resource wouldn't be able to access the `value` output on the module. diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 2cf07ddec..347eefbe4 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -196,10 +196,6 @@ Arukas - > - Terraform Enterprise - - > AWS @@ -408,6 +404,10 @@ Terraform + > + Terraform Enterprise + + > TLS