Merge pull request #316 from hashicorp/repo-sync

Repo sync

Author: hashibot-web

CODEOWNERS

@@ -10,6 +10,7 @@
 /content/terraform-plugin-sdk @hashicorp/terraform-devex @hashicorp/terraform-education
 /content/terraform-plugin-testing @hashicorp/terraform-devex @hashicorp/terraform-education
 /content/terraform-docs-agents @hashicorp/team-hcpt-agent-engineering
+/content/terraform-migrate @hashicorp/team-docs-packer-and-terraform
 /content/terraform-cdk @hashicorp/cdktf
 
 /content/terraform @hashicorp/terraform-education @hashicorp/terraform-core @hashicorp/team-docs-packer-and-terraform

__fixtures__/productConfig.mjs

@@ -241,6 +241,16 @@ export const PRODUCT_CONFIG = {
 		versionedDocs: true,
 		websiteDir: 'website',
 	},
+	'terraform-migrate': {
+		assetDir: 'img',
+		basePaths: ['migrate'],
+		contentDir: 'docs',
+		dataDir: 'data',
+		productSlug: 'terraform',
+		semverCoerce: semver.coerce,
+		versionedDocs: true,
+		websiteDir: 'website',
+	},
 	'terraform-cdk': {
 		/**
 		 * ✅ Initial migration attempt: SEEMS TO WORK

app/api/content/[productSlug]/redirects/route.ts

@@ -39,7 +39,9 @@ export async function GET(request: Request, { params }: { params: GetParams }) {
 		'redirects.jsonc',
 	]
 
-	const readFileResult = await findFileWithMetadata(filePath, versionMetadata)
+	const readFileResult = await findFileWithMetadata(filePath, versionMetadata, {
+		loadFromContentDir: process.env.NODE_ENV === 'development',
+	})
 	if (!readFileResult.ok) {
 		return new Response('Not found', { status: 404 })
 	}

app/utils/file.ts

@@ -5,6 +5,7 @@
 
 import grayMatter from 'gray-matter'
 import { parse as jsoncParse } from 'jsonc-parser'
+import { readFile } from 'fs/promises'
 
 import { Err, Ok, Result } from './result'
 import type { ProductVersionMetadata } from './contentVersions'
@@ -27,13 +28,22 @@ const headers = process.env.VERCEL_URL
 export const findFileWithMetadata = async (
 	filePath: string[],
 	versionMetaData: ProductVersionMetadata,
+	options: {
+		loadFromContentDir?: boolean
+	} = { loadFromContentDir: false },
 ) => {
 	const newFilePath = ifNeededAddReleaseStageToPath(
 		filePath,
 		versionMetaData.releaseStage,
 	)
 
 	try {
+		if (options.loadFromContentDir) {
+			const filePathString = joinFilePath(newFilePath)
+			const fileContent = await readFile(filePathString, 'utf-8')
+			return Ok(fileContent)
+		}
+
 		const res = await fetch(`${SELF_URL}/${newFilePath.join('/')}`, {
 			cache: 'no-cache',
 			headers,
@@ -47,7 +57,9 @@ export const findFileWithMetadata = async (
 
 		return Ok(text)
 	} catch {
-		return Err(`Failed to read file at path: ${newFilePath.join('/')}`)
+		return Err(
+			`Failed to read file at path: ${newFilePath.join('/')}, with options: ${JSON.stringify(options, null, 2)}`,
+		)
 	}
 }
 

app/utils/productConfig.mjs

@@ -247,6 +247,17 @@ export const PRODUCT_CONFIG = {
 		versionedDocs: true,
 		websiteDir: 'website',
 	},
+	'terraform-migrate': {
+		assetDir: '',
+		basePaths: ['migrate'],
+		contentDir: 'docs',
+		dataDir: 'data',
+		navDataPath: 'migrate',
+		productSlug: 'terraform',
+		semverCoerce: semver.coerce,
+		versionedDocs: true,
+		websiteDir: 'website',
+	},
 	'terraform-cdk': {
 		assetDir: '',
 		basePaths: ['cdktf'],

content/terraform-docs-agents/v1.23.x/docs/cloud-docs/agents/request-forwarding.mdx

@@ -6,6 +6,8 @@ description: >-
 
 # Request forwarding
 
+@include 'request-forwarding-tier.mdx'
+
 You can configure HCP Terraform Agents to handle HTTP and HTTPS
 request forwarding on behalf of HCP Terraform. This enables HCP Terraform to access
 services in private networks without requiring direct inbound network access.

content/terraform-docs-agents/v1.23.x/docs/partials/request-forwarding-tier.mdx

@@ -0,0 +1,5 @@
+<Note> 
+
+Request forwarding is available on the HCP Terraform **Premium** edition. Refer to [HCP Terraform pricing](https://www.hashicorp.com/products/terraform/pricing) for details.
+
+</Note>

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

@@ -27,38 +27,7 @@
   },
   {
     "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"
-              }
-            ]
-          }
-        ]
-      }
-    ]
+    "path": "migrate"   
   },
   {
     "title": "API",

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

@@ -62,7 +62,7 @@ Stop all Terraform operations associated with the state files. This may require
 
 ## Migrate state using Terraform 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.
+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/migrate) for more information.
 
 ## Migrate state using the API