Merge branch 'main' into lane-wetmore/single-item-recovery

Author: schavis

content/terraform/v1.13.x/docs/language/stacks/deploy/conditions.mdx

@@ -52,7 +52,7 @@ deployment_auto_approve "no_changes" {
 
 </CodeBlockConfig>
 
-The `condition` argument in the `deployment_auto_approve` block has access to the `context` of the current deployment run. To learn more about `context`, refer to the [`deployment_auto_approve` reference](/terraform/language/block/stack/deploy/deployment_auto_approve#deployment-plan-context).
+The `condition` argument in the `deployment_auto_approve` block has access to the `context` of the current deployment run. To learn more about `context`, refer to the [`deployment_auto_approve` reference](/terraform/language/block/stack/tfdeploy/deployment_auto_approve#deployment-plan-context).
 
 After defining your auto-approval rule, add that rule to your deployment group using the `auto_approve_checks` argument. In the following example, the `staging_group` deployment group enforces the `no_changes` rule:
 

content/terraform/v1.13.x/docs/language/stacks/deploy/config.mdx

@@ -216,7 +216,7 @@ deployment "web" {
 
 Now, whenever the `web` deployment generates a deployment run that does not destroy resources, HCP Terraform automatically approves that run.
 
-If you don't assign a deployment to a group, Terraform automatically creates a default deployment group for that deployment. To learn more about defining deployment groups, refer to the [`deployment_group` reference](/terraform/language/block/stack/deploy/deployment_group). To learn more about setting up deployment group orchestration rules, refer to [Set conditions for deployment runs](/terraform/language/stacks/deploy/conditions).
+If you don't assign a deployment to a group, Terraform automatically creates a default deployment group for that deployment. To learn more about defining deployment groups, refer to the [`deployment_group` reference](/terraform/language/block/stack/tfdeploy/deployment_group). To learn more about setting up deployment group orchestration rules, refer to [Set conditions for deployment runs](/terraform/language/stacks/deploy/conditions).
 
 ## Next steps
 

content/terraform/v1.14.x (beta)/docs/language/stacks/deploy/conditions.mdx

@@ -52,7 +52,7 @@ deployment_auto_approve "no_changes" {
 
 </CodeBlockConfig>
 
-The `condition` argument in the `deployment_auto_approve` block has access to the `context` of the current deployment run. To learn more about `context`, refer to the [`deployment_auto_approve` reference](/terraform/language/block/stack/deploy/deployment_auto_approve#deployment-plan-context).
+The `condition` argument in the `deployment_auto_approve` block has access to the `context` of the current deployment run. To learn more about `context`, refer to the [`deployment_auto_approve` reference](/terraform/language/block/stack/tfdeploy/deployment_auto_approve#deployment-plan-context).
 
 After defining your auto-approval rule, add that rule to your deployment group using the `auto_approve_checks` argument. In the following example, the `staging_group` deployment group enforces the `no_changes` rule:
 

content/terraform/v1.14.x (beta)/docs/language/stacks/deploy/config.mdx

@@ -216,7 +216,7 @@ deployment "web" {
 
 Now, whenever the `web` deployment generates a deployment run that does not destroy resources, HCP Terraform automatically approves that run.
 
-If you don't assign a deployment to a group, Terraform automatically creates a default deployment group for that deployment. To learn more about defining deployment groups, refer to the [`deployment_group` reference](/terraform/language/block/stack/deploy/deployment_group). To learn more about setting up deployment group orchestration rules, refer to [Set conditions for deployment runs](/terraform/language/stacks/deploy/conditions).
+If you don't assign a deployment to a group, Terraform automatically creates a default deployment group for that deployment. To learn more about defining deployment groups, refer to the [`deployment_group` reference](/terraform/language/block/stack/tfdeploy/deployment_group). To learn more about setting up deployment group orchestration rules, refer to [Set conditions for deployment runs](/terraform/language/stacks/deploy/conditions).
 
 ## Next steps
 

scripts/prebuild/mdx-transforms/build-mdx-transforms-file.mjs

@@ -10,6 +10,7 @@ import path from 'node:path'
 import remark from 'remark'
 import remarkMdx from 'remark-mdx'
 import grayMatter from 'gray-matter'
+import semver from 'semver'
 
 import { paragraphCustomAlertsPlugin } from './paragraph-custom-alert/paragraph-custom-alert.mjs'
 import { rewriteInternalLinksPlugin } from './add-version-to-internal-links/add-version-to-internal-links.mjs'
@@ -37,14 +38,29 @@ export async function buildFileMdxTransforms(filePath) {
 
 	const relativePath = path.relative(targetDir, filePath)
 	const [repoSlug, version, contentDir] = relativePath.split('/')
+	/**
+	 * handles version and content dir for versionless docs
+	 * these values are index based
+	 * if versionless, version becomes the content dir
+	 * which will cause an error when trying resolve partials
+	 */
+	const verifiedVersion = PRODUCT_CONFIG[repoSlug].versionedDocs ? version : ''
+	const verifiedContentDir = semver.valid(semver.coerce(version))
+		? contentDir
+		: version
 	const partialsDir = path.join(
 		targetDir,
 		repoSlug,
-		version,
-		contentDir,
+		verifiedVersion,
+		verifiedContentDir,
 		'partials',
 	)
-	const redirectsDir = path.join('/server/', targetDir, repoSlug, version)
+	const redirectsDir = path.join(
+		'/server/',
+		targetDir,
+		repoSlug,
+		verifiedVersion,
+	)
 	const outPath = path.join(outputDir, relativePath)
 
 	const entry = {

scripts/prebuild/mdx-transforms/build-mdx-transforms-file.test.mjs

@@ -32,17 +32,17 @@ An exact location within a [schema](/plugin/framework/schemas)`
 
 beforeEach(() => {
 	vol.fromJSON({
-		'/content/terraform/v1.19.x/test.mdx': mdxContent,
-		'/public/content/terraform/v1.19.x/test.mdx': transformedMdxContent,
+		'content/terraform/v1.19.x/test.mdx': mdxContent,
+		'public/content/terraform/v1.19.x/test.mdx': transformedMdxContent,
 		'app/api/versionMetadata.json': JSON.stringify(versionMetadata),
-		'/content/terraform/v1.19.x/partials': {},
+		'content/terraform/v1.19.x/partials': {},
 	})
 })
 
-const transformedOutPath = '/public/content/terraform/v1.19.x/test.mdx'
+const transformedOutPath = 'public/content/terraform/v1.19.x/test.mdx'
 
 test('test buildfileMdxTransforms', async () => {
-	await buildFileMdxTransforms('/content/terraform/v1.19.x/test.mdx')
+	await buildFileMdxTransforms('content/terraform/v1.19.x/test.mdx')
 	const transformedContent = fs.readFileSync(transformedOutPath, 'utf8')
 	expect(transformedContent).toContain(transformedMdxContent)
 })
@@ -54,7 +54,7 @@ test('test applyFileMdxTransforms', async () => {
 		},
 	})
 	const entry = {
-		filePath: '/content/terraform/v1.19.x/test.mdx',
+		filePath: 'content/terraform/v1.19.x/test.mdx',
 		partialsDir: '../../partials',
 		outPath: transformedOutPath,
 	}