migrate

Author: rkoron007

content/terraform-docs-common/data/cloud-docs-nav-data.json

@@ -145,24 +145,14 @@
       ]
   },
   {
-  "title": "Group with projects",
+  "title": "Scope access with projects",
     "routes": [
-  { "title": "Overview", "path": "projects" },
-      {
-        "title": "Manage projects",
-        "path": "projects/manage"
-      },
-  { "title": "Best practices", "path": "projects/best-practices" }
-    ]
-  },
-  {
-  "title": "Variables",
-    "routes": [
-  { "title": "Overview", "path": "variables" },
-      {
-        "title": "Managing variables",
-        "path": "variables/managing-variables"
-      }
+    { "title": "Overview", "path": "projects" },
+        {
+          "title": "Manage projects",
+          "path": "projects/manage"
+        },
+    { "title": "Best practices", "path": "projects/best-practices" }
     ]
   },
   {
@@ -202,8 +192,8 @@
     ]
   },
   {
-  "title": "Stacks or workspaces",
-    "path": "workspace-or-stack"
+  "title": "Compare Stacks and workspaces",
+    "path": "stack-workspace"
   },
   {
   "title": "Use workspaces",
@@ -263,6 +253,16 @@
           ]
         },
   { "title": "Best practices", "path": "workspaces/best-practices"},
+    {
+  "title": "Configure variables",
+    "routes": [
+  { "title": "Overview", "href": "variables" },
+      {
+        "title": "Managing variables",
+        "href": "variables/managing-variables"
+      }
+    ]
+  },
   { "title": "Health", "path": "workspaces/health" },
       {
         "title": "Terraform configurations",
@@ -602,6 +602,16 @@
           { "title": "Review deployment plans", "path": "stacks/deploy/runs" }
         ]
       },
+        {
+        "title": "Configure variables",
+          "routes": [
+        { "title": "Overview", "href": "variables" },
+            {
+              "title": "Managing variables",
+              "href": "variables/managing-variables"
+            }
+          ]
+        },
       {
   "title": "Use dynamic provider credentials",
     "routes": [

content/terraform-docs-common/docs/cloud-docs/migrate/index.mdx

@@ -90,3 +90,17 @@ Refer to the following external article for an example of how to create a script
 > **Hands-on:** Complete the [Migrate to HCP Terraform in bulk](/terraform/tutorials/cloud/bulk-migrate-hcp) tutorial to get started with tf-migrate.
 
 You can use the Terraform migrate CLI tool to automatically migrate state to HCP Terraform and Terraform Enterprise. The tool does not ship with HCP Terraform. You must download and install the binary for the CLI tool separately. Refer to the [Terraform migrate documentation](/terraform/cloud-docs/migrate/tf-migrate) for more information.
+
+
+<!-- BEGIN: TFC:only name:stacks-tfe -->
+
+## Migrate a workspace to a Stack
+
+In HCP Terraform, there are two ways of organizing your infrastructure:
+
+- Workspaces are ideal for managing a self-contained infrastructure of one Terraform root module.
+- Stacks are ideal for managing multiple infrastructure modules and repeating that infrastructure at scale.
+
+If you have an existing workspace that you want to convert to a Stack, you can use the Terraform migrate CLI to migrate your workspace state and configuration to a Stack in HCP Terraform. Refer to the [Terraform migrate CLI](/terraform/migrate/stacks) to learn more.
+
+<!-- END: TFC:only name:stacks-tfe -->

content/terraform-docs-common/docs/cloud-docs/overview/index.mdx

@@ -69,7 +69,7 @@ In HCP Terraform, there are two main ways of organizing your infrastructure:
 - Workspaces are ideal for managing a self-contained infrastructure of one Terraform root module.
 - Stacks are ideal for managing multiple infrastructure modules and repeating that infrastructure at scale.
 
-To learn if a workspace or a Stack works best for your use case, refer to [Choose workspaces or Stacks](/terraform/cloud-docs/workspace-or-stack).
+To learn if a workspace or a Stack works best for your use case, refer to [Choose workspaces or Stacks](/terraform/cloud-docs/stack-workspace).
 
 Since teams must share responsibilities and awareness to avoid single points of failure, working with Terraform in a team requires a remote workflow. At minimum, state must be shared; ideally, Terraform should execute in a consistent remote environment.
 

content/terraform-docs-common/docs/cloud-docs/workspace-or-stack.mdx renamed to content/terraform-docs-common/docs/cloud-docs/stack-workspace.mdx

@@ -1,11 +1,11 @@
 ---
-page_title: Choose workspaces or Stacks in HCP Terraform
+page_title: Comparing Stacks and workspaces in HCP Terraform
 description: |-
   Learn about workspace and Stacks, the ways of managing infrastructure in HCP Terraform. Determine if a Stack or a workspace is best for your use case.
 tfc_only: true
 ---
 
-# Choose workspaces or Stacks
+# Compare Stacks and workspaces
 
 In HCP Terraform, there are two ways of organizing your infrastructure:
 
@@ -28,9 +28,9 @@ Workspaces provide a hard separation between environments because each workspace
 
 If your team uses a branching strategy where each environment maps to a separate Git branch, workspaces can align with your workflow. You can promote changes across environments through pull requests between branches. Workspaces also work well when CI/CD pipelines control promotion across environments, especially when a promotion must be gated by approvals or automated test outcomes.
 
-Previously, those looking to deploy repeatable infrastructure using HCP Terraform would create separate workspaces and then use run triggers or other automation tools to coordinate changes between them. However, workspaces are not truly coupled to each other, hampering your ability to flexibly manage infrastructure as it scales. If you have a tightly orchestrated infrastructure that changes across different environments, we recommend defining a Stack.
+Previously, those looking to deploy repeatable infrastructure using HCP Terraform would create separate workspaces and then use run triggers or other automation tools to coordinate changes between them. However, workspaces are not truly coupled to each other, hampering your ability to flexibly manage infrastructure as it scales. If you have a tightly orchestrated infrastructure that changes across different environments, we recommend defining a Stack. If you want to migrate an existing workspace to a Stack, refer to the [Terraform migrate CLI](/terraform/migrate/stacks).
 
-If you want to migrate an existing workspace to a Stack, refer to the [Terraform migrate CLI](#TODO). Workspaces do support validating your code with policies, drift detection, and a range of other features that Stacks do not support. Refer to [Feature support](#feature-support) to learn more.
+Workspaces do support validating your code with policies, drift detection, and a range of other features that Stacks do not support. Refer to [Feature support](#feature-support) to learn more.
 
 ## When to use Stacks
 
@@ -45,7 +45,7 @@ We recommend using Stacks if your use case meets any of the following conditions
 - You repeat infrastructure across different environments, regions, or accounts that require consistent and synchronized deployments.
 - You have a tightly orchestrated infrastructure that changes across different environments.
 
-Stacks codify the entire behavior of your infrastructure lifecycle within version-controlled configuration files. To learn more about Stacks and review examples, refer to [Stack use cases](/terraform/language/stacks/use-cases). If you want to migrate an existing workspace to a Stack, refer to the [Terraform migrate CLI](/terraform/language/stacks/deploy/conditions).
+Stacks codify the entire behavior of your infrastructure lifecycle within version-controlled configuration files. To learn more about Stacks and review examples, refer to [Stack use cases](/terraform/language/stacks/use-cases). If you want to migrate an existing workspace to a Stack, refer to the [Terraform migrate CLI](/terraform/migrate/stacks).
 
 Stacks were designed to simplify and scale Terraform workflows that become complex or repetitive using workspaces. When you use a Stack, HCP Terraform automatically recognizes the dependency between components, automatically deferring the component's plan and apply steps until it can complete them successfully. Learn more about how Stacks plan [deferred changes](/terraform/cloud-docs/stacks/deploy/runs#deferred-changes).
 

content/terraform-docs-common/docs/cloud-docs/stacks/create.mdx

@@ -31,6 +31,8 @@ You can create a Stack using any of the following methods:
 - The HCP Terraform UI
 - The Terraform CLI
 
+If you want to migrate an existing workspace to a Stack, refer to the [Terraform migrate CLI](/terraform/migrate/stacks).
+
 If you are creating a Stack in an organization for the first time, you must enable Stacks for your organization. Navigate to your organization’s **Settings** page, and in the **General** settings, check the box next to **Stacks**.
 
 ### HCP Terraform workflow

content/terraform-docs-common/docs/cloud-docs/stacks/index.mdx

@@ -13,7 +13,7 @@ Stacks let you split your Terraform configuration into components and then deplo
 
 ## Background
 
-Stacks are an alternative way to organize your infrastructure and fundamentally differ from [HCP Terraform workspaces](/terraform/cloud-docs/workspaces). Stacks are not built on top of HCP Terraform workspaces, but can exist alongside them in the same project. To learn if a workspace or Stack is better for your use case, refer to [Choose a workspace or Stack](/terraform/cloud-docs/workspace-or-stack).
+Stacks are an alternative way to organize your infrastructure and fundamentally differ from [HCP Terraform workspaces](/terraform/cloud-docs/workspaces). Stacks are not built on top of HCP Terraform workspaces, but can exist alongside them in the same project. To learn if a workspace or Stack is better for your use case, refer to [Choose a workspace or Stack](/terraform/cloud-docs/stack-workspace).
 
 > **Hands-on**: Try out the [Deploy a Stack with HCP Terraform](/terraform/tutorials/cloud/stacks-deploy) tutorial to get started with Stacks quickly.
 

content/terraform-docs-common/docs/cloud-docs/users-teams-organizations/teams/manage.mdx

@@ -104,6 +104,6 @@ You can grant teams permissions to manage a project and the<!-- BEGIN: TFC:only
 
 ## Manage organization access
 
-Organization owners can grant teams permissions to manage policies, projects,  workspaces, team and organization membership, VCS settings, private registry providers and modules, and policy overrides across an organization. Refer to [Organization Permissions](/terraform/cloud-docs/users-teams-organizations/permissions#organization-permissions) for details.
+Organization owners can grant teams permissions to manage policies, projects,  workspaces,<!-- BEGIN: TFC:only name:stacks-tfe --> Stacks,<!-- END: TFC:only name:stacks-tfe --> team and organization membership, VCS settings, private registry providers and modules, and policy overrides across an organization. Refer to [Organization Permissions](/terraform/cloud-docs/users-teams-organizations/permissions#organization-permissions) for details.
 
 [permissions-citation]: #intentionally-unused---keep-for-maintainers

content/terraform-docs-common/docs/cloud-docs/vcs/azure-devops-services.mdx

@@ -138,7 +138,7 @@ Ensure that the Azure DevOps organization you intend to link with HCP Terraform
 
 ## Next steps
 
-After configuring Azure DevOps Services access for HCP Terraform, you can create Terraform workspaces<!-- BEGIN: TFC:only name:stacks-tfe --> or Stacks<!-- END: TFC:only name:stacks-tfe -->based on your organization's repositories..
+After configuring Azure DevOps Services access for HCP Terraform, you can create Terraform workspaces<!-- BEGIN: TFC:only name:stacks-tfe --> or Stacks<!-- END: TFC:only name:stacks-tfe -->based on your organization's repositories.
 
 ### Migrate existing workspaces to connect to ADO Organization with the new MS Entra App
 

content/terraform-docs-common/docs/cloud-docs/vcs/private.mdx

@@ -15,6 +15,12 @@ Connect HCP Terraform to your private VCS provider using a self-hosted HCP Terra
 
 ## Background
 
+<Note>
+
+Only workspaces can connect to a private VCS provider, Stacks do not support them.
+
+</Note>
+
 You can use HCP Terraform agents to connect HCP Terraform to your private VCS providers. The following are examples of private VCS providers that you can manage locally on your private network:
 
 - GitHub Enterprise
@@ -23,8 +29,6 @@ You can use HCP Terraform agents to connect HCP Terraform to your private VCS pr
 
 For more information about HCP Terraform agents, refer to the [HCP Terraform agent documentation](/terraform/cloud-docs/agents).
 
-Note that Stacks do not support private VCS providers, only workspaces can connect to them.
-
 ## Requirements
 
 You must meet the following requirements to configure a connection to your private VCS provider: