Backport of docs: Initial HCP Rebrand into release/1.18.x (#21002)

* backport of commit dbaa076 * adding missing changes to backport --------- Co-authored-by: boruszak <jeffrey.boruszak@hashicorp.com> Co-authored-by: Krastin Krastev <kkrasteff@gmail.com>
hashicorp · Apr 22, 2024 · d0b964c · d0b964c
1 parent 6e45dfe
commit d0b964c
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 65 deletions.
diff --git a/website/content/docs/nia/api/tasks.mdx b/website/content/docs/nia/api/tasks.mdx
@@ -400,5 +400,5 @@ The task object is used by the Task APIs as part of a request or response. It re
 | `providers`             | list[string] | Optional | The list of provider names that the task's module uses.                                                                                                                                                                                                                               | none                                                         |
 | `variables`             | map[string]  | Optional | The map of variables that are provided to the task's module.                                                                                                                                                                                                                          | none                                                         |
 | `version`               | string       | Optional | The version of the configured module that the task uses.                                                                                                                                                                                                                              | The latest version.                                          |
-| `terraform_version`     | string       | Optional | <EnterpriseAlert inline /> **Deprecated in CTS 0.6.0 and will be removed in 0.8.0. Review `terraform_version` in `terraform_cloud_workspace` instead.** The version of Terraform to use for the Terraform Cloud workspace associated with the task. This is only available when used with the [Terraform Cloud driver](/consul/docs/nia/configuration#terraform-cloud-driver).                                                  | The latest compatible version supported by the organization. |
-| `terraform_cloud_workspace` | object | Optional | <EnterpriseAlert inline /> The [configurable attributes of the Terraform Cloud workspace](/consul/docs/nia/configuration#terraform_cloud_workspace) associated with the task. This option is only available when used with the [Terraform Cloud driver](/consul/docs/nia/configuration#terraform-cloud-driver).| none |
+| `terraform_version`     | string       | Optional | <EnterpriseAlert inline /> **Deprecated in CTS 0.6.0 and will be removed in 0.8.0. Review `terraform_version` in `terraform_cloud_workspace` instead.** The version of Terraform to use for the HCP Terraform workspace associated with the task. This is only available when used with the [HCP Terraform driver](/consul/docs/nia/configuration#hcp-terraform-driver).                                                  | The latest compatible version supported by the organization. |
+| `terraform_cloud_workspace` | object | Optional | <EnterpriseAlert inline /> The [configurable attributes of the HCP Terraform workspace](/consul/docs/nia/configuration#terraform_cloud_workspace) associated with the task. This option is only available when used with the [HCP Terraform driver](/consul/docs/nia/configuration#hcp-terraform-driver).| none |
diff --git a/website/content/docs/nia/architecture.mdx b/website/content/docs/nia/architecture.mdx
@@ -41,7 +41,7 @@ A driver encapsulates the resources required to communicate the updates to the
 network infrastructure. The following [drivers](/consul/docs/nia/network-drivers#terraform) are supported:
 
 - Terraform driver
-- Terraform Cloud driver<EnterpriseAlert inline />
+- HCP Terraform driver<EnterpriseAlert inline />
 
 Each driver includes a set of providers that [enables support](/consul/docs/nia/terraform-modules) for a wide variety of infrastructure applications.
 

diff --git a/website/content/docs/nia/compatibility.mdx b/website/content/docs/nia/compatibility.mdx
@@ -24,7 +24,7 @@ Below are CTS versions with supported Consul versions. The latest CTS binary sup
 
 CTS integration with Terraform is supported for the following:
 
-| CTS Version         | Terraform CLI Version | Terraform Cloud Version | Terraform Enterprise Version |
+| CTS Version         | Terraform CLI Version | HCP Terraform Version | Terraform Enterprise Version |
 | :------------------ | :-------------------- | :---------------------- | :--------------------------- |
 | CTS Enterprise 0.7   | 0.13-1.2             | Latest                  | v202010-2 - Latest           |
 | CTS Enterprise 0.4+ | 0.13 - 1.1            | Latest                  | v202010-2 - Latest           |

diff --git a/website/content/docs/nia/configuration.mdx b/website/content/docs/nia/configuration.mdx
diff --git a/website/content/docs/nia/enterprise/index.mdx b/website/content/docs/nia/enterprise/index.mdx
@@ -9,22 +9,22 @@ description: >-
 
 Consul-Terraform-Sync (CTS) Enterprise is available with [Consul Enterprise](https://www.hashicorp.com/products/consul) and requires a Consul [license](/consul/docs/nia/enterprise/license) to be applied.
 
-Enterprise features of CTS address organization complexities of collaboration, operations, scale, and governance. CTS Enterprise supports an official integration with [Terraform Cloud](https://cloud.hashicorp.com/products/terraform) and [Terraform Enterprise](/terraform/enterprise), the self-hosted distribution, to extend insight into dynamic updates of your network infrastructure.
+Enterprise features of CTS address organization complexities of collaboration, operations, scale, and governance. CTS Enterprise supports an official integration with [HCP Terraform](https://cloud.hashicorp.com/products/terraform) and [Terraform Enterprise](/terraform/enterprise), the self-hosted distribution, to extend insight into dynamic updates of your network infrastructure.
 
 | Features | Community Edition | Enterprise |
 |----------|-------------|------------|
 | Consul Namespace | Default namespace only | Filter task triggers by any namespace |
-| Automation Driver | Terraform Community Edition | Terraform Community Edition, Terraform Cloud, or Terraform Enterprise |
-| Terraform Workspaces | Local | Local workspaces with the Terraform driver or [remote workspaces](/terraform/cloud-docs/workspaces) with the Terraform Cloud driver |
-| Terraform Backend Options | [azurerm](/terraform/language/settings/backends/azurerm), [consul](/terraform/language/settings/backends/consul), [cos](/terraform/language/settings/backends/cos), [gcs](/terraform/language/settings/backends/gcs), [kubernetes](/terraform/language/settings/backends/kubernetes), [local](/terraform/language/settings/backends/local), [manta](/terraform/language/v1.2.x/settings/backends/manta), [pg](/terraform/language/settings/backends/pg), and [s3](/terraform/language/settings/backends/s3) with the Terraform driver | The supported backends for CTS with the Terraform driver or Terraform Cloud with the Terraform Cloud driver |
-| Terraform Version | One Terraform version for all tasks | Optional Terraform version per task when using the Terraform Cloud driver |
-| Terraform Run Output | CTS logs | CTS logs or Terraform output organized by Terraform Cloud remote workspaces |
+| Automation Driver | Terraform Community Edition | Terraform Community Edition, HCP Terraform, or Terraform Enterprise |
+| Terraform Workspaces | Local | Local workspaces with the Terraform driver or [remote workspaces](/terraform/cloud-docs/workspaces) with the HCP Terraform driver |
+| Terraform Backend Options | [azurerm](/terraform/language/settings/backends/azurerm), [consul](/terraform/language/settings/backends/consul), [cos](/terraform/language/settings/backends/cos), [gcs](/terraform/language/settings/backends/gcs), [kubernetes](/terraform/language/settings/backends/kubernetes), [local](/terraform/language/settings/backends/local), [manta](/terraform/language/v1.2.x/settings/backends/manta), [pg](/terraform/language/settings/backends/pg), and [s3](/terraform/language/settings/backends/s3) with the Terraform driver | The supported backends for CTS with the Terraform driver or HCP Terraform with the HCP Terraform driver |
+| Terraform Version | One Terraform version for all tasks | Optional Terraform version per task when using the HCP Terraform driver |
+| Terraform Run Output | CTS logs | CTS logs or Terraform output organized by THCP Terraform remote workspaces |
 | Credentials and secrets | On disk as `.tfvars` files or in shell environment | Secured variables stored in remote workspace |
-| Audit | | Terraform audit logs ([Terraform Cloud](/terraform/cloud-docs/api-docs/audit-trails) or [Terraform Enterprise](/terraform/enterprise/admin/infrastructure/logging)) |
-| Collaboration | | Run [history](/terraform/cloud-docs/run/manage), [triggers](/terraform/cloud-docs/workspaces/settings/run-triggers), and [notifications](/terraform/cloud-docs/workspaces/settings/notifications) supported on Terraform Cloud |
+| Audit | | Terraform audit logs ([HCP Terraform](/terraform/cloud-docs/api-docs/audit-trails) or [Terraform Enterprise](/terraform/enterprise/admin/infrastructure/logging)) |
+| Collaboration | | Run [history](/terraform/cloud-docs/run/manage), [triggers](/terraform/cloud-docs/workspaces/settings/run-triggers), and [notifications](/terraform/cloud-docs/workspaces/settings/notifications) supported on HCP Terraform |
 | Governance | | [Sentinel](/terraform/cloud-docs/policy-enforcement) to enforce governance policies as code |
 
-The [Terraform Cloud driver](/consul/docs/nia/configuration#terraform-cloud-driver) enables CTS Enterprise to integrate with Terraform Cloud or Terraform Enterprise. The [Terraform Cloud driver](/consul/docs/nia/network-drivers/terraform-cloud) page provides an overview of how the integration works within CTS.
+The [HCP Terraform driver](/consul/docs/nia/configuration#hcp-terraform-driver) enables CTS Enterprise to integrate with HCP Terraform or Terraform Enterprise. The [HCP Terraform driver](/consul/docs/nia/network-drivers/hcp-terraform) page provides an overview of how the integration works within CTS.
 
 ## Consul Admin Partition Support
 CTS subscribes to a Consul agent. Depending on the admin partition the Consul agent is a part of and the services within the admin partition, CTS will be able to subscribe to those services and support the automation workflow. As such, admin partitions are not relevant to the CTS workflow. We recommend deploying a single CTS instance that subscribes to services/KV within a single partition and using a different CTS instance (or instances) to subscribe to services/KV in another partition.
diff --git a/website/content/docs/nia/index.mdx b/website/content/docs/nia/index.mdx
@@ -53,7 +53,7 @@ CTS is available as an open source and enterprise distribution. Follow the [Auto
 
 - `Tasks` - A task is the translation of dynamic service information from the Consul Catalog into network infrastructure changes downstream.
 
-- `Terraform Cloud` - Per the [Terraform documentation](/terraform/cloud-docs), "Terraform Cloud" describes both Terraform Cloud and Terraform Enterprise, which are different distributions of the same application. Documentation will apply to both distributions unless specifically stated otherwise.
+- `HCP Terraform` - Per the [Terraform documentation](/terraform/cloud-docs), "HCP Terraform" describes both HCP Terraform and Terraform Enterprise, which are different distributions of the same application. Documentation will apply to both distributions unless specifically stated otherwise.
 
 - `Terraform Module` - A [Terraform module](/terraform/language/modules) is a container for multiple Terraform resources that are used together.