Merge remote-tracking branch 'public/main' into repo-sync-3-24-2025

Author: BrianMMcClain

website/data/cloud-docs-nav-data.json

@@ -29,6 +29,41 @@
     "title": "Getting Started",
     "href": "https://learn.hashicorp.com/collections/terraform/cloud-get-started?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS"
   },
+  {
+    "title": "Migrate to HCP Terraform",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "migrate"
+      },
+      {
+        "title": "The tf-migrate CLI",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "migrate/tf-migrate"
+          },
+          {
+            "title": "CLI Reference",
+            "routes": [
+              {
+                "title": "tf-migrate prepare",
+                "path": "migrate/tf-migrate/reference/prepare"
+              },
+              {
+                "title": "tf-migrate execute",
+                "path": "migrate/tf-migrate/reference/execute"
+              },
+              {
+                "title": "Configuration file reference",
+                "path": "migrate/tf-migrate/reference/configuration"
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
   {
     "title": "API",
     "routes": [
@@ -478,41 +513,6 @@
       }
     ]
   },
-  {
-    "title": "Migrate to HCP Terraform",
-    "routes": [
-      {
-        "title": "Overview",
-        "path": "migrate"
-      },
-      {
-        "title": "The tf-migrate CLI",
-        "routes": [
-          {
-            "title": "Overview",
-            "path": "migrate/tf-migrate"
-          },
-          {
-            "title": "CLI Reference",
-            "routes": [
-              {
-                "title": "tf-migrate prepare",
-                "path": "migrate/tf-migrate/reference/prepare"
-              },
-              {
-                "title": "tf-migrate execute",
-                "path": "migrate/tf-migrate/reference/execute"
-              },
-              {
-                "title": "Configuration file reference",
-                "path": "migrate/tf-migrate/reference/configuration"
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  },
   {
     "title": "Policy enforcement",
     "routes": [

website/docs/cloud-docs/api-docs/index.mdx

@@ -38,7 +38,7 @@ description: >-
 
 # HCP Terraform API documentation
 
-HCP Terraform provides an API for a subset of its features. If you have any questions or want to request new API features, please email <support@hashicorp.com>.
+HCP Terraform provides an API for a subset of its features. If you need assistance or want to submit a feature request, visit the [HashiCorp support center](https://support.hashicorp.com/hc/en-us) and open a ticket.
 
 -> **Note:** Before planning an API integration, consider whether [the `tfe` Terraform provider](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs) meets your needs. It can't create or approve runs in response to arbitrary events, but it's a useful tool for managing your organizations, teams, and workspaces as code.
 

website/docs/cloud-docs/api-docs/run-tasks/run-tasks-integration.mdx

@@ -186,7 +186,7 @@ A run task result may optionally contain one or more detailed outcomes, which im
 | ------------------------- | ------ | ----------------------------------------------------------------------------------------------- |
 | `outcome-id`     | string | A partner supplied identifier for this outcome. |
 | `description`     | string | A one-line description of the result. |
-| `body`     | string | (Optional)  A detailed message for the result in Markdown format. |
+| `body`     | string | (Optional)  A detailed message for the result in Markdown format. It is recommended to keep it under 1MB, with a maximum allowable limit of 5MB. |
 | `url`     | string | (Optional) A URL that a user can navigate to for more information about this result. |
 | `tags`     | object | (Optional) An object containing tag arrays, named by the property key. |
 | `tags.key`     | string | The two or three word name of the header tag. [Special handling](#severity-and-status-tags) is given to `severity` and `status` keys. |

website/docs/cloud-docs/cost-estimation/index.mdx

@@ -12,7 +12,12 @@ HCP Terraform provides cost estimates for many resources found in your Terraform
 
 ## Enabling Cost Estimation
 
-HCP Terraform disables cost estimation by default. You can enable or disable the feature in your organization's settings.
+HCP Terraform disables cost estimation by default. To enable cost estimation:
+
+1. Sign in to [HCP Terraform](https://app.terraform.io/) or Terraform Enterprise, then navigate to the organization where you want to enable cost estimation.
+1. Choose **Settings** from the sidebar, then **Cost Estimation**.
+1. Toggle the **Enable cost estimation for all workspaces** setting.
+1. Click **Update settings**.
 
 ## Viewing a Cost Estimate
 

website/docs/cloud-docs/integrations/kubernetes/setup.mdx

@@ -23,6 +23,8 @@ The HCP Terraform Operator for Kubernetes makes outbound requests over HTTPS (TC
 | ---------------- | -------------- | -------------- | ------------------------------------------------------------------------------------------------------------------ |
 | `app.terraform.io` | tcp/443, HTTPS | Outbound       | Dynamically managing HCP Terraform workspaces and returning the output to Kubernetes with the HCP Terraform API |
 
+For self-managed Terraform Enterprise instances, ensure that the operator can reach your Terraform Enterprise hostname over HTTPS (TCP port 443).
+
 ## Compatibility
 
 The HCP Terraform Operator for Kubernetes supports the following versions:
@@ -32,7 +34,9 @@ The HCP Terraform Operator for Kubernetes supports the following versions:
 
 ## Install and configure
 
-1. Generate an [organization token](/terraform/cloud-docs/users-teams-organizations/api-tokens#organization-api-tokens) within HCP Terraform and save it to a file. These instructions assume you are using a file named `credentials`.
+1. Sign in to [HCP Terraform](https://app.terraform.io/) or Terraform Enterprise and navigate to the organization you want to integrate with Kubernetes.
+
+1. Generate an [organization token](/terraform/cloud-docs/users-teams-organizations/api-tokens#organization-api-tokens) within HCP Terraform or Terraform Enterprise and save it to a file. These instructions assume you are using a file named `credentials`.
 
 1. Set the `NAMESPACE` environment variable. This will be the namespace that you will install the Helm chart to.
 
@@ -58,20 +62,46 @@ The HCP Terraform Operator for Kubernetes supports the following versions:
    kubectl -n $NAMESPACE create secret generic workspacesecrets --from-literal=secret_key=abc123
    ```
 
-1. Install the [HCP Terraform Operator for Kubernetes with Helm](https://github.com/hashicorp/terraform-helm).
+1.  Add the HashiCorp Helm repository.
 
-   ```
-   helm repo add hashicorp https://helm.releases.hashicorp.com
+    ```
+    helm repo add hashicorp https://helm.releases.hashicorp.com
+    ```
 
-   helm install --namespace ${RELEASE_NAMESPACE} hashicorp/terraform --generate-name
-   ```
+1.  Install the [HCP Terraform Operator for Kubernetes with Helm](https://github.com/hashicorp/hcp-terraform-operator).  By default, the operator communicates with `app.terraform.io`. When deploying in a self-managed Terraform Enterprise, it is required to set the `operator.tfeAddress` to the specific hostname of the Terraform Enterprise instance.
+
+    - For HCP Terraform Cloud (default)
+    
+    ```
+    helm install --namespace ${RELEASE_NAMESPACE} hashicorp/hcp-terraform-operator tfc-operator 
+    ```
+
+    - For self-managed Terraform Enterprise, specify your instance's hostname
+
+    ```
+    helm install --namespace ${RELEASE_NAMESPACE} hashicorp/hcp-terraform-operator tfc-operator \
+      --set operator.tfeAddress="TERRAFORM_ENTERPRISE_HOSTNAME"
+    ```
+
+    - Alternatively, you can set this configuration in the [value.yaml](https://github.com/hashicorp/hcp-terraform-operator/blob/main/charts/hcp-terraform-operator/values.yaml) file.
+
+    ```yaml
+    operator:
+      tfeAddress: <TERRAFORM_ENTERPRISE_HOSTNAME>
+    ```
+
+    - Then, apply the configuration with.
+
+    ```
+    helm install --namespace ${NAMESPACE} hashicorp/hcp-terraform-operator tfc-operator -f value.yaml
+    ```
 
-1. To create a Terraform workspace, you can create a separate Helm chart to deploy the custom resource or refer to these [examples](https://github.com/hashicorp/terraform-helm/tree/master/example).
+1.  To create a Terraform workspace, agent pool or etc, you can find different [examples](https://github.com/hashicorp/hcp-terraform-operator/tree/main/docs/examples) of the YAML manifests.
 
 ### Upgrade
 
 When a new version of the HCP Terraform Operator for Kubernetes Helm Chart is available from the HashiCorp Helm repository, you can upgrade with the following command.
 
 ```
-helm upgrade --namespace ${RELEASE_NAMESPACE} ${RELEASE_NAME} hashicorp/terraform
+helm upgrade --namespace ${RELEASE_NAMESPACE} hashicorp/hcp-terraform-operator tfc-operator
 ```

website/docs/cloud-docs/integrations/service-now/service-catalog-terraform/index.mdx

@@ -102,6 +102,7 @@ Before installing the ServiceNow integration, the Terraform Admin will need to
 perform the following steps to configure and gather information from HCP
 Terraform.
 
+1. Sign in to [HCP Terraform](https://app.terraform.io/) or Terraform Enterprise.
 1. Either [create an
    organization](/terraform/cloud-docs/users-teams-organizations/organizations#creating-organizations)
    or choose an existing organization where ServiceNow will create new

website/docs/cloud-docs/integrations/service-now/service-graph/service-graph-setup.mdx

@@ -44,7 +44,11 @@ Once the integration is installed, you can proceed to the guided setup form wher
 
 In order for ServiceNow to connect to HCP Terraform, you must give it an HCP Terraform API token. The permissions of this token determine what resources the Service Graph Connector will import into the CMDB. While you could use a user API token, it could import resources from multiple organizations. By providing a team API token, you can scope permissions to only import resources from specified workspaces within a single organization. 
 
-Visit your organization’s **Settings** > **Teams** page. Scroll down to the **Team API Token** section and click **Create a team token**.
+To create a team API token:
+1. Sign in to [HCP Terraform](https://app.terraform.io/) or Terraform Enterprise and navigate to the organization where you want to create a team token.
+1. Choose **Settings** from the sidebar, then **Teams**.
+1. In **Team API Token** section, click **Create a team token**.
+
 Save this token in a safe place since HCP Terraform only displays it once. You will use it to configure ServiceNow in the next section.
 
 ![ServiceNow Service Graph Connector Configure Team API token in HCP Terraform](/img/docs/service-now-service-graph-team-token-gen.png)

website/docs/cloud-docs/migrate/index.mdx

@@ -25,6 +25,7 @@ You have three options to migrate your state:
 ## Requirements
 
 - Terraform v1.1 and later is required to configure the `cloud` block. For Terraform v1.0 and older, use the [`remote` backend](/terraform/language/settings/backends/remote) instead.
+- Create an account on [HCP Terraform](https://app.terraform.io/) or on a [Terraform Enterprise instance](/terraform/enterprise/users-teams-organizations/users#creating-an-account).
 - You must present a token linked to appropriate permissions to use the API. Refer to the following topics for additional information:
   - [HCP Terraform API overview](/terraform/cloud-docs/api-docs)
   - [Terraform Enterprise API overview](/terraform/enterprise/api-docs)

website/docs/cloud-docs/migrate/tf-migrate/index.mdx

@@ -89,7 +89,7 @@ Do you want to proceed?
  Enter a value: yes
 ```
 
-Terraform opens a browser to the HCP Terraform login screen. Enter a token name in the web UI, or leave the default name. Click **Create API token** to generate the authentication token.
+Terraform opens a browser to the HCP Terraform sign in screen, where you can then enter a token name in the web UI, or leave the default name. Click **Create API token** to generate the authentication token.
 
 HCP Terraform only displays your token once. Copy this token, then when the Terraform CLI prompts you, paste the user token exactly once into your terminal. Press **Enter** to complete the authentication process.
 

website/docs/cloud-docs/no-code-provisioning/provisioning.mdx

@@ -27,6 +27,8 @@ The no-code provisioning workflow creates a new HCP Terraform workspace to deplo
 
 To launch the no-code workflow:
 
+1. Sign in to [HCP Terraform](https://app.terraform.io/) or Terraform Enterprise and navigate to the organization with the module you want to provision.
+
 1. Click **Registry** in the main HCP Terraform navigation to access your organization's private registry.
 
 1. Click **Modules** to view the list of available modules in the private registry. You can filter for no-code ready modules in your registry. No-code enabled modules have a **No-code Ready** badge next to their names.
@@ -67,7 +69,9 @@ When you [update the module version](/terraform/cloud-docs/no-code-provisioning/
 
 To change the version of the module that users can deploy:
 
-1. Navigate to the module in your organization's registry.
+1. Sign in to [HCP Terraform](https://app.terraform.io/) or Terraform Enterprise and navigate to your organization.
+
+1. Choose **Registry** from the sidebar and navigate to the module in your organization's registry.
 
 1. Click **Configure Settings**.
 

website/docs/cloud-docs/overview/activate-flex.mdx

@@ -19,9 +19,9 @@ To activate HashiCorp Flex, you must:
 
 ## Step 1: Create the required user accounts
 
-There are two ways to activate HashiCorp Flex. If you already use both HCP Terraform and HCP, we recommend that you create a unified HCP user account. Otherwise, you can create separate HCP Terraform and HCP accounts.
+There are two ways to activate HashiCorp Flex. If you already use both HCP Terraform and HCP, we recommend that you create a linked HCP user account. Otherwise, you can create separate HCP Terraform and HCP accounts.
 
-### Create a unified HCP user account
+### Create a linked HCP user account
 
 1. Go to [HCP Terraform](https://app.terraform.io) and click **Continue with HCP account.** 
 1. Create a free HCP account or sign in using your HCP email. If you have an existing HCP Terraform account, HCP prompts you to [link it](/terraform/cloud-docs/users-teams-organizations/users#linking-hcp-and-hcp-terraform-accounts). If you do not have an HCP Terraform account, HCP creates one for you and links it to the HCP account.  
@@ -51,7 +51,7 @@ Your sales account manager will email your organization's tech contact a code to
 
 To activate your Flex plan:
 1. Copy the HCP Flex activation code from your email.
-1. Click the link in your activation email to access your HCP organization or log into your HCP portal. 
+1. Click the link in your activation email to access your HCP organization or log into your [HCP portal](https://portal.cloud.hashicorp.com/). 
 1. Navigate to **Billing > Payment Methods** and find the **Contract** section.
 1. Paste the activation code you copied to the **Contract** section.
 
@@ -71,7 +71,7 @@ Navigate to your HCP Terraform organization setting's **Plan & Billing** page. I
 
 ![Prompt for user to link their HCP Terraform account to an HCP account](/img/docs/tfc-plan-and-billing.png)
 
-~> **Note**: If you have a unified HCP account, you do not need to log in and HCP Terraform will automatically identify HCP organizations that your unified HCP user account is a member of and are a member of the Flex HCP Terraform organization.
+~> **Note**: If you have a linked HCP account, you do not need to log in and HCP Terraform will automatically identify HCP organizations that your linked HCP user account is a member of and are a member of the Flex HCP Terraform organization.
 
 Click **Edit Plan** to go to the Plan Activation page.  
 

website/docs/cloud-docs/overview/activate-payg.mdx

@@ -13,9 +13,9 @@ Pay-as-you-go offers dynamic billing based on monthly consumption. Larger organi
 
 ## Activate pay-as-you-go
 
-To enable pay-as-you-go and change your organization's plan, navigate to **Organization Settings > Plan & Billing**. 
+To enable pay-as-you-go and change your organization's plan, sign in to [HCP Terraform](https://app.terraform.io/) and select your organization. Then choose **Settings** from the sidebar, then **Plan & Billing**. 
 
-In order to upgrade to **Standard Edition** or **Plus Edition** and use pay-as-you-go billing, you must log in to your HashiCorp Cloud Platform account and [link](/terraform/cloud-docs/users-teams-organizations/users#linking-hcp-and-hcp-terraform-accounts) your HCP Terraform account to your [HashiCorp Cloud Platform billing account](/hcp/docs/hcp/admin/billing). Click **Edit plan** to authenticate with HCP and link your accounts.
+In order to upgrade to **Standard Edition** or **Plus Edition** and use pay-as-you-go billing, you must sign in to your HashiCorp Cloud Platform account and [link](/terraform/cloud-docs/users-teams-organizations/users#linking-hcp-and-hcp-terraform-accounts) your HCP Terraform account to your [HashiCorp Cloud Platform billing account](/hcp/docs/hcp/admin/billing). Click **Edit plan** to authenticate with HCP and link your accounts.
 
 ![Screenshot: Notification reading that the user must link their HashiCorp Cloud Platform account to change their plan. Click the "edit plan" button](/img/docs/tfc-pnb-link-hcp.png)
 

website/docs/cloud-docs/overview/estimate-hcp-terraform-cost.mdx

@@ -19,7 +19,7 @@ Examples of managed resources include resources provisioned by a Terraform provi
 
 HashiCorp charges for each managed resource on a per-hour basis, from the time a managed resource is provisioned until it is destroyed. Each partial hour is billed as a full hour. The peak number of managed resources in a given hour determines the cost. 
 
-Your organization's **Usage** page reports the total number of managed resources, which you can use to determine the number of billable managed resources in use at any given time. You can find the total cost in the [HashiCorp Cloud Platform portal](/hcp/docs/hcp/admin/billing#usage). It is refreshed hourly.
+Sign in to [HCP Terraform](https://app.terraform.io/) or Terraform Enterprise and choose **Usage** from the sidebar to navigate to a report of your organization's total number of managed resources. You can use the total number of managed resources to determine your number of billable managed resources in use at any given time. You can find your total cost in the [HashiCorp Cloud Platform portal](/hcp/docs/hcp/admin/billing#usage), which is refreshed hourly.
 
 The Usage report gives an at a glance view of general usage limits in the Organization:
 - A summary of projects, workspaces, and applies
@@ -41,7 +41,12 @@ Another example calculation factors in billable managed resource counts, partial
 
 ## Manage your plan
 
-To edit your organization's plan, navigate to the **Plan & Billing** page and click **Edit Plan**. If you cannot edit your organization's plan due to an active contract, contact your HashiCorp account team.
+To edit your organization's plan, complete the following steps:
+
+1. Sign in to [HCP Terraform](https://app.terraform.io).
+1. Select the organization that you want to manage.
+1. Navigate to the **Plan & Billing** page.
+1. Click **Edit Plan**. If you cannot edit your organization's plan due to an active contract, contact your HashiCorp account team.
 
 Pay-as-you-go and HashiCorp Flex customers can self-activate their HCP Terraform organizations. Refer to [Changing Your HCP Terraform Plan](/terraform/cloud-docs/overview/change-plan) for details.