Merge branch 'main' into gm/oraclepluginversionsupdate

gerardma77 · web-flow · commit 78d160c33b88 · 2025-09-05T07:51:41.000+02:00
diff --git a/content/terraform-docs-common/docs/cloud-docs/api-docs/oauth-clients.mdx b/content/terraform-docs-common/docs/cloud-docs/api-docs/oauth-clients.mdx
@@ -376,6 +376,7 @@ This PATCH endpoint requires a JSON object with the following properties as a re
 | `data.attributes.secret`         | string | (previous value) | The OAuth client secret. For Bitbucket Data Center, this secret is the text of the SSH private key associated with your Bitbucket Data Center application link.                                    |
 | `data.attributes.rsa-public-key` | string | (previous value) | **Required for Bitbucket Data Center in conjunction with the `secret`. Not used for any other providers.** The text of the SSH public key associated with your Bitbucket Data Center application link. |
 | `data.attributes.organization-scoped` | boolean | (previous value) | Whether or not the OAuth client is available to all projects and workspaces in the organization.                                                                      |
+| `data.attributes.oauth-token-string` | string | (previous value) | The personal access token string. Set this field to update the token when rotating credentials. Updating this value does not trigger new runs, and HCP Terraform uses the new token for all subsequent runs. |
 | `data.relationships.projects`    | array\[object] | (previous value) | A list of resource identifier objects that defines which projects are associated with the OAuth client. If `data.attributes.organization-scoped` is set to `false`, the OAuth client is only available to this list of projects. Each object in this list must contain a project `id` and use the `"projects"` type. For example, `{ "id": "prj-AwfuCJTkdai4xj9w", "type": "projects" }`. Sending an empty array clears all project assignments.                                               |
 | `data.relationships.agent-pool.data` | object | `{}`    | The Agent Pool associated to the VCS connection. This pool will be responsible for forwarding VCS Provider API calls and cloning VCS repositories.                            |
 
@@ -389,7 +390,8 @@ This PATCH endpoint requires a JSON object with the following properties as a re
     "attributes": {
       "key": "key",
       "secret": "secret",
-      "organization-scoped": false
+      "organization-scoped": false,
+      "oauth-token-string": "74653028376f0009d0ed81f1b654ac17a"
     },
     "relationships": {
       "projects": {
diff --git a/content/terraform-docs-common/docs/cloud-docs/migrate/index.mdx b/content/terraform-docs-common/docs/cloud-docs/migrate/index.mdx
@@ -1,8 +1,7 @@
 ---
 page_title: Migrate Terraform state to HCP Terraform or Terraform Enterprise
 description: >-
-  Learn how to migrate existing Terraform state to HCP Terraform or Terraform Enterprise so that you can manage
-  existing infrastructure without de-provisioning.
+  Learn how to migrate existing Terraform state to HCP Terraform or Terraform Enterprise using the CLI, API, or tf-migrate.
 ---
 
 # Migrate Terraform state to HCP Terraform or Terraform Enterprise
@@ -14,13 +13,13 @@ This topic describes how to migrate existing Terraform state files to HCP Terraf
 Perform the following actions to migrate existing resources to one or more workspaces in HCP Terraform or Terraform Enterprise:
 
 1. Stop all Terraform operations associated with the state files. 
-1. Migrate Terraform state files using either the Terraform CLI or the HCP Terraform or Terraform Enterprise API.
+1. Migrate Terraform state files to HCP Terraform or Terraform Enterprise.
 
 You have three options to migrate your state:
 
 1. Manually using the Terraform CLI
-1. Automatically using `tf-migrate`
 1. Manually using the HCP Terraform API
+1. Automatically using `tf-migrate`
 
 ## Requirements
 
@@ -60,10 +59,6 @@ Stop all Terraform operations associated with the state files. This may require
 
 1. Run `terraform init`. Terraform creates any workspaces specified in the configuration if they do not already exist in the organization.
 
-## 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/migrate) for more information.
-
 ## Migrate state using the API
 
 1. Encode your state files as a base64 string and generate an MD5 hash. The following example generates the string and hash file for a single `terraform.tfstate` file:
@@ -89,6 +84,9 @@ You can use the Terraform migrate CLI tool to automatically migrate state to HCP
 Refer to the following external article for an example of how to create a script in Python to automate multiple state files:
 [Migrating A Lot of State with Python and the HCP Terraform (previously Terraform Cloud) API](https://medium.com/hashicorp-engineering/migrating-a-lot-of-state-with-python-and-the-terraform-cloud-api-997ec798cd11). The example uses the [Workspaces API](/terraform/cloud-docs/api-docs/workspaces#create-a-workspace) to create the necessary workspaces in HCP Terraform and the [State Versions API](/terraform/cloud-docs/api-docs/state-versions) to migrate the state files to those workspaces.
 
-## 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.
+## Migrate state using `tf-migrate`
+
+> **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 `tf-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 [`tf-migrate` documentation](/terraform/migrate) for more information.
diff --git a/content/vault/v1.16.x/content/docs/platform/k8s/helm/index.mdx b/content/vault/v1.16.x/content/docs/platform/k8s/helm/index.mdx
@@ -20,6 +20,8 @@ This page assumes general knowledge of [Helm](https://helm.sh/) and
 how to use it. Using Helm to install Vault requires that Helm is
 properly installed and configured with your Kubernetes cluster.
 
+@include 'kubernetes-supported-versions.mdx'
+
 ## Using the helm chart
 
 Helm must be installed and configured on your machine. Please refer to the [Helm
diff --git a/content/vault/v1.16.x/content/partials/kubernetes-supported-versions.mdx b/content/vault/v1.16.x/content/partials/kubernetes-supported-versions.mdx
@@ -4,10 +4,10 @@ The following [Kubernetes minor releases][k8s-releases] are currently supported.
 The latest version is tested against each Kubernetes version. It may work with
 other versions of Kubernetes, but those are not supported.
 
+* 1.33
 * 1.32
 * 1.31
 * 1.30
 * 1.29
-* 1.28
 
 [k8s-releases]: https://kubernetes.io/releases/
diff --git a/content/vault/v1.18.x/content/api-docs/secret/ldap.mdx b/content/vault/v1.18.x/content/api-docs/secret/ldap.mdx
@@ -42,6 +42,8 @@ to search and change entry passwords in LDAP.
   to use to generate passwords. Note that this accepts the name of the policy, not the policy itself.
 - `schema` `(string: "openldap")` - The LDAP schema to use when storing entry passwords.
   Valid schemas include `openldap`, `ad`, and `racf`.
+- `credential_type` `(string: "password")` - The type of password to generate. Valid values include `password` and `phrase`.
+  When set to `phrase`, the secrets engine will modify the RACF schema for all static roles to manage password phrases instead of passwords.
 - `userdn` `(string: <optional>)` - The base DN under which to perform user search in
   [library management](/vault/api-docs/secret/ldap#library-management) and [static roles](/vault/api-docs/secret/ldap#static-roles).
   For example, `ou=Users,dc=hashicorp,dc=com`.
diff --git a/content/vault/v1.18.x/content/docs/platform/k8s/helm/index.mdx b/content/vault/v1.18.x/content/docs/platform/k8s/helm/index.mdx
@@ -19,6 +19,8 @@ This page assumes general knowledge of [Helm](https://helm.sh/) and
 how to use it. Using Helm to install Vault requires that Helm is
 properly installed and configured with your Kubernetes cluster.
 
+@include 'kubernetes-supported-versions.mdx'
+
 ## Using the helm chart
 
 Helm must be installed and configured on your machine. Please refer to the [Helm
diff --git a/content/vault/v1.18.x/content/partials/kubernetes-supported-versions.mdx b/content/vault/v1.18.x/content/partials/kubernetes-supported-versions.mdx
@@ -4,10 +4,10 @@ The following [Kubernetes minor releases][k8s-releases] are currently supported.
 The latest version is tested against each Kubernetes version. It may work with
 other versions of Kubernetes, but those are not supported.
 
+* 1.33
 * 1.32
 * 1.31
 * 1.30
 * 1.29
-* 1.28
 
 [k8s-releases]: https://kubernetes.io/releases/
diff --git a/content/vault/v1.19.x/content/api-docs/secret/ldap.mdx b/content/vault/v1.19.x/content/api-docs/secret/ldap.mdx
@@ -42,6 +42,8 @@ to search and change entry passwords in LDAP.
   to use to generate passwords. Note that this accepts the name of the policy, not the policy itself.
 - `schema` `(string: "openldap")` - The LDAP schema to use when storing entry passwords.
   Valid schemas include `openldap`, `ad`, and `racf`.
+- `credential_type` `(string: "password")` - The type of password to generate. Valid values include `password` and `phrase`.
+  When set to `phrase`, the secrets engine will modify the RACF schema for all static roles to manage password phrases instead of passwords.
 - `userdn` `(string: <optional>)` - The base DN under which to perform user search in
   [library management](/vault/api-docs/secret/ldap#library-management) and [static roles](/vault/api-docs/secret/ldap#static-roles).
   For example, `ou=Users,dc=hashicorp,dc=com`.
diff --git a/content/vault/v1.19.x/content/docs/deploy/kubernetes/helm/index.mdx b/content/vault/v1.19.x/content/docs/deploy/kubernetes/helm/index.mdx
@@ -19,6 +19,8 @@ This page assumes general knowledge of [Helm](https://helm.sh/) and
 how to use it. Using Helm to install Vault requires that Helm is
 properly installed and configured with your Kubernetes cluster.
 
+@include 'kubernetes-supported-versions.mdx'
+
 ## Using the Helm chart
 
 Helm must be installed and configured on your machine. Please refer to the [Helm
diff --git a/content/vault/v1.19.x/content/partials/kubernetes-supported-versions.mdx b/content/vault/v1.19.x/content/partials/kubernetes-supported-versions.mdx
@@ -4,10 +4,10 @@ The following [Kubernetes minor releases][k8s-releases] are currently supported.
 The latest version is tested against each Kubernetes version. It may work with
 other versions of Kubernetes, but those are not supported.
 
+* 1.33
 * 1.32
 * 1.31
 * 1.30
 * 1.29
-* 1.28
 
 [k8s-releases]: https://kubernetes.io/releases/
diff --git a/content/vault/v1.20.x/content/api-docs/secret/ldap.mdx b/content/vault/v1.20.x/content/api-docs/secret/ldap.mdx
@@ -42,6 +42,8 @@ to search and change entry passwords in LDAP.
   to use to generate passwords. Note that this accepts the name of the policy, not the policy itself.
 - `schema` `(string: "openldap")` - The LDAP schema to use when storing entry passwords.
   Valid schemas include `openldap`, `ad`, and `racf`.
+- `credential_type` `(string: "password")` - The type of password to generate. Valid values include `password` and `phrase`.
+  When set to `phrase`, the secrets engine will modify the RACF schema for all static roles to manage password phrases instead of passwords.
 - `userdn` `(string: <optional>)` - The base DN under which to perform user search in
   [library management](/vault/api-docs/secret/ldap#library-management) and [static roles](/vault/api-docs/secret/ldap#static-roles).
   For example, `ou=Users,dc=hashicorp,dc=com`.
diff --git a/content/vault/v1.20.x/content/docs/deploy/kubernetes/helm/index.mdx b/content/vault/v1.20.x/content/docs/deploy/kubernetes/helm/index.mdx
@@ -19,6 +19,8 @@ This page assumes general knowledge of [Helm](https://helm.sh/) and
 how to use it. Using Helm to install Vault requires that Helm is
 properly installed and configured with your Kubernetes cluster.
 
+@include 'kubernetes-supported-versions.mdx'
+
 ## Using the Helm chart
 
 Helm must be installed and configured on your machine. Please refer to the [Helm
diff --git a/content/vault/v1.20.x/content/partials/kubernetes-supported-versions.mdx b/content/vault/v1.20.x/content/partials/kubernetes-supported-versions.mdx
@@ -4,10 +4,10 @@ The following [Kubernetes minor releases][k8s-releases] are currently supported.
 The latest version is tested against each Kubernetes version. It may work with
 other versions of Kubernetes, but those are not supported.
 
+* 1.33
 * 1.32
 * 1.31
 * 1.30
 * 1.29
-* 1.28
 
 [k8s-releases]: https://kubernetes.io/releases/
diff --git a/scripts/add-version-to-nav-data.mjs b/scripts/add-version-to-nav-data.mjs
@@ -34,6 +34,9 @@ export async function addVersionToNavData(filePath, versionMetadata) {
 		 */
 		const [product, version] = relativePath.split('/')
 
+		// Remove any release stage in parentheses)
+		const cleanVersion = version.replace(/\s*\([^)]+\)/, '')
+
 		// We are looking at a versionless doc
 		if (PRODUCT_CONFIG[product].versionedDocs === false) {
 			return
@@ -70,8 +73,8 @@ export async function addVersionToNavData(filePath, versionMetadata) {
 					(key === 'href' || key === 'path') &&
 					typeof obj[key] === 'string' &&
 					!obj[key].startsWith('http') &&
-					version !== latestVersion &&
-					!obj[key].includes(version)
+					cleanVersion !== latestVersion &&
+					!obj[key].includes(cleanVersion)
 				) {
 					// href allows linking outside of content subpath
 					let basePath = PRODUCT_CONFIG[product].basePaths?.find((basePath) => {
@@ -84,9 +87,9 @@ export async function addVersionToNavData(filePath, versionMetadata) {
 					// if the href starts with a basepath, e.g. "/cli", add version after the basepath
 					if (basePath && basePath.length) {
 						obj[key] =
-							`${basePath}/${version}${obj[key].substring(basePath.length)}`
+							`${basePath}/${cleanVersion}${obj[key].substring(basePath.length)}`
 					} else if (key === 'path') {
-						obj[key] = `${version}/${obj[key]}`
+						obj[key] = `${cleanVersion}/${obj[key]}`
 					}
 				}
 			}
diff --git a/scripts/mdx-transforms/add-version-to-internal-links/add-version-to-internal-links.mjs b/scripts/mdx-transforms/add-version-to-internal-links/add-version-to-internal-links.mjs
@@ -27,6 +27,9 @@ export const rewriteInternalLinksPlugin = ({ entry, versionMetadata }) => {
 	 */
 	const [product, version] = relativePath.split('/')
 
+	// Remove any release stage in parentheses)
+	const cleanVersion = version.replace(/\s*\([^)]+\)/, '')
+
 	if (PRODUCT_CONFIG[product].versionedDocs === false) {
 		return
 	}
@@ -42,7 +45,7 @@ export const rewriteInternalLinksPlugin = ({ entry, versionMetadata }) => {
 	 * If the version in the filepath is the latest version or
 	 * no base paths exist for the product, then skip rewriting internal links
 	 */
-	if (version === latestVersion || !Object.entries(basePaths).length) {
+	if (cleanVersion === latestVersion || !Object.entries(basePaths).length) {
 		return
 	}
 	/**
@@ -63,7 +66,7 @@ export const rewriteInternalLinksPlugin = ({ entry, versionMetadata }) => {
 			// Check if the node is a link and matches the pattern for links to rewrite
 			if (node.type === 'link' && isLinkToRewritePattern.test(node.url)) {
 				// Replace the matched part of the URL with the versioned path
-				node.url = node.url.replace(replacePattern, `/$1/${version}$2`)
+				node.url = node.url.replace(replacePattern, `/$1/${cleanVersion}$2`)
 			}
 			// Return the node (those with and without a versioned path)
 			return [node]
diff --git a/scripts/mdx-transforms/add-version-to-internal-links/add-version-to-internal-links.test.mjs b/scripts/mdx-transforms/add-version-to-internal-links/add-version-to-internal-links.test.mjs
@@ -253,4 +253,67 @@ describe('transformRewriteInternalLinks', () => {
 		)
 		expect(result).toBe(expectedOutput)
 	})
+
+	it('should remove release stage in parentheses from version', async () => {
+		const content = `[Link to plugin/testing](/plugin/testing/some-page)`
+		const entry = {
+			filePath:
+				'content/terraform-plugin-testing/v1.5.x (alpha)/docs/some-file.mdx',
+		}
+		const expectedOutput =
+			'[Link to plugin/testing](/plugin/testing/v1.5.x/some-page)\n'
+		const result = await transformRewriteInternalLinks(
+			content,
+			entry,
+			versionMetadata,
+		)
+		expect(result).toBe(expectedOutput)
+	})
+
+	it('should not modify version if there is no parentheses', async () => {
+		const content = `[Link to plugin/testing](/plugin/testing/some-page)`
+		const entry = {
+			filePath: 'content/terraform-plugin-testing/v1.5.x/docs/some-file.mdx',
+		}
+		const expectedOutput =
+			'[Link to plugin/testing](/plugin/testing/v1.5.x/some-page)\n'
+		const result = await transformRewriteInternalLinks(
+			content,
+			entry,
+			versionMetadata,
+		)
+		expect(result).toBe(expectedOutput)
+	})
+
+	it('should remove multiple spaces before parentheses', async () => {
+		const content = `[Link to plugin/testing](/plugin/testing/some-page)`
+		const entry = {
+			filePath:
+				'content/terraform-plugin-testing/v1.5.x    (alpha)/docs/some-file.mdx',
+		}
+		const expectedOutput =
+			'[Link to plugin/testing](/plugin/testing/v1.5.x/some-page)\n'
+		const result = await transformRewriteInternalLinks(
+			content,
+			entry,
+			versionMetadata,
+		)
+		expect(result).toBe(expectedOutput)
+	})
+
+	it('should handle version with parentheses but no space', async () => {
+		const content = `[Link to plugin/testing](/plugin/testing/some-page)`
+		const entry = {
+			filePath:
+				'content/terraform-plugin-testing/v1.5.x(alpha)/docs/some-file.mdx',
+		}
+		const expectedOutput =
+			'[Link to plugin/testing](/plugin/testing/v1.5.x/some-page)\n'
+		const result = await transformRewriteInternalLinks(
+			content,
+			entry,
+			versionMetadata,
+		)
+		expect(result).toBe(expectedOutput)
+	})
 })
