Merge branch 'main' into joshathc/update-copy-secrets

Author: JoshAtHC

.github/PULL_REQUEST_TEMPLATE/hcp_terraform_pull_request_template.md

@@ -0,0 +1,32 @@
+### What
+<!-- Explain what you changed and provide a list of changed page names. -->
+
+### Why
+<!-- Explain why this change is necessary and how it benefits users. -->
+
+### Screenshots
+<!-- Optional. Show additions to the sidebar or new formatting. -->
+
+----------
+
+### Merge Checklist
+_If items do not apply to your changes, add (N/A) and mark them as complete._
+
+#### Pull Request
+- [ ] Description links to related pull requests or issues, if any.
+
+#### Content
+- [ ] Redirects have been added to `content/terraform-docs-common/redirects.jsonc` for moved, renamed, or deleted pages.
+- [ ] API documentation and the API Changelog have been updated.
+- [ ] Links to related content where appropriate (e.g., API endpoints, permissions, etc.).
+- [ ] Pages with related content are updated and link to this content when appropriate.
+- [ ] Sidebar navigation files have been updated for added, deleted, reordered, or renamed pages.
+- [ ] New pages have metadata (page name and description) at the top.
+- [ ] New images are 2048 px wide. They have HashiCorp standard annotation color (#F92672) and format (rectangle with rounded corners), blurred sensitive details (e.g. credentials, usernames, user icons), and descriptive alt text in the markdown for accessibility.
+- [ ] New code blocks have the correct syntax and line breaks to eliminate horizontal scroll bars.
+- [ ] UI elements (button names, page names, etc.) are bolded.
+- [ ] The Vercel website preview successfully deployed.
+
+#### Reviews
+- [ ] I or someone else reviewed the content for technical accuracy.
+- [ ] I or someone else reviewed the content for typos, punctuation, spelling, and grammar.

.github/PULL_REQUEST_TEMPLATE/terraform_pull_request_template.md

@@ -0,0 +1,31 @@
+### What
+<!-- Explain what you changed and provide a list of changed page names. -->
+
+### Why
+<!-- Explain why this change is necessary and how it benefits users. -->
+
+### Screenshots
+<!-- Optional. Show additions to the sidebar or new formatting. -->
+
+----------
+
+### Merge Checklist
+_If items do not apply to your changes, add (N/A) and mark them as complete._
+
+#### Pull Request
+- [ ] Description links to related pull requests or issues, if any.
+
+#### Content
+- [ ] You added redirects to `content/terraform-docs-common/redirects.jsonc` for moved, renamed, or deleted pages **across all affected versions**. Refer to [Redirects](https://github.com/hashicorp/web-unified-docs/blob/main/docs/content-guide/redirects.md#example-redirects) for examples and guidance. 
+- [ ] Links to related content where appropriate (e.g., CLI, language, API endpoints, permissions, etc.).
+- [ ] Pages with related content are updated and link to this content when appropriate.
+- [ ] Sidebar navigation files have been updated for added, deleted, reordered, or renamed pages.
+- [ ] New pages have metadata (page name and description) at the top.
+- [ ] New images are 2048 px wide. They have HashiCorp standard annotation color (#F92672) and format (rectangle with rounded corners), blurred sensitive details (e.g. credentials, usernames, user icons), and descriptive alt text in the markdown for accessibility.
+- [ ] New code blocks have the correct syntax and line breaks to eliminate horizontal scroll bars.
+- [ ] UI elements (button names, page names, etc.) are bolded.
+- [ ] The Vercel website preview successfully deployed.
+
+#### Reviews
+- [ ] I or someone else reviewed the content for technical accuracy.
+- [ ] I or someone else reviewed the content for typos, punctuation, spelling, and grammar.

.github/advanced-issue-labeler.yml

@@ -14,11 +14,11 @@ policy:
           - name: 'Boundary'
             keys: ['Boundary']
           - name: 'Consul'
-            keys: ['Consul', 'Runtime']
+            keys: ['Consul']
           - name: 'HCP'
             keys: ['HashiCorp Cloud Platform']
           - name: 'Nomad'
-            keys: ['Nomad', 'Runtime']
+            keys: ['Nomad']
           - name: 'Packer'
             keys: ['Packer']
           - name: 'Sentinel'
@@ -35,4 +35,6 @@ policy:
             keys: ['Waypoint']
           - name: 'Triage'
             keys: ['No product', 'Other product']
+          - name: 'Runtime'
+            keys: ['Nomad', 'Consul']
 

.github/labeler.yml

@@ -44,6 +44,19 @@ HCP:
         'content/hcp-docs/**'
       ]
 
+# Add 'Nomad' label to changes under 'content/nomad'
+#
+# Label           | Rule
+# --------------- | ------------------------------------------------------------
+# Nomad             | Default; applies to all doc updates
+
+Nomad:
+- any:
+  - changed-files:
+    - any-glob-to-any-file: [
+        'content/nomad/**'
+      ]
+
 # Add 'Packer' label to changes under 'content/packer'
 #
 # Label           | Rule
@@ -217,19 +230,6 @@ Waypoint:
         'content/hcp-docs/content/docs/waypoint/**'
       ]
 
-# Add 'HCP Docs' label to changes under 'content/hcp-docs'
-#
-# Label           | Rule
-# --------------- | ------------------------------------------------------------
-# HCP Docs        | Default; applies to all doc updates
-
-HCP Docs:
-- any:
-  - changed-files:
-    - any-glob-to-any-file: [
-        'content/hcp-docs/**'
-      ]
-
 # Add 'Runtime' label to changes under 'content/consul', 'content/nomad', 'content/hcp-docs/content/docs/cli' and 'content/hcp-docs/content/docs/hcp'
 #
 # Label           | Rule
@@ -245,8 +245,8 @@ Runtime:
 - any:
   - changed-files:
     - any-glob-to-any-file: [
-        'content/consul/**'
-        'content/nomad/**'
-        'content/hcp-docs/content/docs/cli/**'
+        'content/consul/**',
+        'content/nomad/**',
+        'content/hcp-docs/content/docs/cli/**',
         'content/hcp-docs/content/docs/hcp/**'
       ]

.github/pull_request_template.md

@@ -3,4 +3,9 @@ Please go to the `Preview` tab and select the appropriate template:
 * [Consul](?expand=1&labels=Consul&title=Consul+Docs&template=consul_pull_request_template.md)
 * [HCP services](?expand=1&template=hcp_pull_request_template.md)
 * [Nomad](?expand=1&labels=Nomad&title=Nomad+Docs&template=nomad_pull_request_template.md)
+
+### Terraform
+
+* [HCP Terraform](?expand=1&labels=hcp,terraform&title=HCP+Terraform+Docs&template=hcp_terraform_pull_request_template.md)
+* [Terraform](?expand=1&labels=terraform&title=Terraform+Docs&template=terraform_pull_request_template.md)
 * [Terraform Enterprise](?expand=1&template=ptfe_release_pull_request_template.md)

content/hcp-docs/content/docs/vault/get-started/access-cluster.mdx

@@ -7,8 +7,8 @@ description: |-
 
 # Access a cluster
 
-HCP Vault Dedicated clusters, like self-managed Vault Enterprise clusters, can be accessed
-using:
+You can access your HCP Vault Dedicated clusters, like self-managed Vault Enterprise clusters,
+using the:
 
 - [Vault command-line interface (CLI)](#cli-access)
 - [Application programming interface (API)](#api-access)
@@ -19,35 +19,44 @@ token](/hcp/docs/vault/get-started/generate-admin-token), or a token generated
 from a [Vault auth method](/vault/docs/auth).
 
 Before you can access the Vault cluster, you must retrieve the cluster URL. When
-a Vault cluster is deployed with the cluster accessibility option set to
-**Private** you can use the private URL from [the HCP Portal](https://portal.cloud.hashicorp.com/) to connect from
-any device in a network that has a connection to the HashiCorp Virtual Network
+you deploy a Vault cluster with the cluster accessibility option set to
+**Private** you can use the private URL from [the HCP
+Portal](https://portal.cloud.hashicorp.com/) to connect from any device in a
+network that has a connection to the HashiCorp Virtual Network
 such as peering connection for Amazon Web Services or Microsoft Azure. Refer to
 the [HashiCorp Virtual Network documentation](/hcp/docs/hcp/network) for more
 information on supported connectivity options.
 
-When the cluster accessibility option is set to **Public**, you can connect to
+When you set the cluster accessibility option to **Public**, you can connect using
 any internet connected device.
 
 <Highlight title="Recommended practice for HCP administrators">
 
-If your use case requires that you set the cluster accessibility option to
-public, we recommend you manage which addresses can connect to HCP Vault Dedicated using
-the IP allow list.
+If your use case requires the cluster accessibility option to
+public, we recommend you manage which addresses can connect to HCP Vault
+Dedicated using the IP allow list.
 
 </Highlight>
 
 ## Retrieve HCP Vault Dedicated cluster address
 
 Log into the [HCP Portal](https://portal.cloud.hashicorp.com/) and navigate to
-the Vault cluster you wish to access.
+the Vault cluster you want to access.
 
 From the **Vault cluster** page, click either the **Private** or **Public**
 link to copy the address to your clipboard.
 ![HCP Portal showing the HCP Vault Dedicated cluster overview page with the cluster
 URLs window highlighted with both a public and private URL link
 available](/img/docs/vault/ui-hcp-portal-vault-url.png)
 
+<Highlight title="Supported TCP ports">
+
+By default, you connect to Vault using Vault's standard port, `8200`. If your
+security policies require a different port, create a support ticket to have
+either port `443` or `8207` enabled for your HCP Vault Dedicated cluster.
+
+</Highlight>
+
 ## Environment variables
 
 For convenience, you can set the following environment variables:
@@ -57,15 +66,15 @@ For convenience, you can set the following environment variables:
 - `VAULT_NAMESPACE`: Set it to the target namespace to operate on (the top-level
   namespace is `admin`)
 
-**Example:** The following command sets environment variables for the [admin
+The following command sets environment variables for the [admin
 token](/hcp/docs/vault/get-started/generate-admin-token), cluster URL, and
 namespace.
 
 ```shell-session
 $ export \
      VAULT_ADDR=https://<vault-cluster-address:8200> \
      VAULT_NAMESPACE=admin \
-     VAULT_TOKEN=hvs.<foo...>
+     VAULT_TOKEN=hvs.1234567890abcdef
 ```
 
 Refer to the Vault documentation for the list of Vault specific [environment

content/nomad/v1.10.x/content/docs/job-specification/volume.mdx

@@ -81,7 +81,7 @@ the [volume_mount][volume_mount] block in the `task` configuration.
   group always receives the volume with the same ID, if available. Use sticky
   volumes for [stateful deployments]. You may only use the `sticky` field for
   dynamic host volumes. For CSI volumes, the `per_alloc` field provides similar
-  functionality
+  functionality.
 
 - `per_alloc` `(bool: false)` - Specifies that the `source` of the volume
   should have the suffix `[n]`, where `n` is the allocation index. This allows
@@ -92,8 +92,11 @@ the [volume_mount][volume_mount] block in the `task` configuration.
 
   The `per_alloc` field cannot be true for system jobs, sysbatch jobs, or jobs
   that use canaries. `per_alloc` is mutually exclusive with the `sticky`
-  property. Use `per_alloc` only with CSI volumes and `sticky` only
-  with dynamic host volumes.
+  property. If you use `per_alloc` with dynamic host volumes, you are
+  responsible for ensuring that the volumes have unique volume names. Unless you
+  need multiple allocations for the same job to use dynamic host volumes on the
+  same host, we recommend using `sticky` for dynamic host volumes and
+  `per_alloc` for CSI volumes.
 
 The following fields are only valid for volumes with `type = "csi"` or dynamic
 host volumes with `type = "host"`:

content/nomad/v1.11.x/content/docs/job-specification/secret.mdx

@@ -79,8 +79,8 @@ as an example, you would reference the value in the secret key "foo"  as
 
   Config parameters:
 
-    - `engine` `(string: "kv_v2")` - Specifies what Vault storage engine to
-  query. Options are `kv_v1` and `kv_v2`.
+    - `engine` `(string: "kv")` - Specifies what Vault storage engine to
+  query. Options are `kv` and `kv_v2`.
 
 
 ## Custom providers

content/nomad/v1.11.x/content/docs/job-specification/volume.mdx

@@ -81,7 +81,7 @@ the [volume_mount][volume_mount] block in the `task` configuration.
   group always receives the volume with the same ID, if available. Use sticky
   volumes for [stateful deployments]. You may only use the `sticky` field for
   dynamic host volumes. For CSI volumes, the `per_alloc` field provides similar
-  functionality
+  functionality.
 
 - `per_alloc` `(bool: false)` - Specifies that the `source` of the volume
   should have the suffix `[n]`, where `n` is the allocation index. This allows
@@ -92,8 +92,11 @@ the [volume_mount][volume_mount] block in the `task` configuration.
 
   The `per_alloc` field cannot be true for system jobs, sysbatch jobs, or jobs
   that use canaries. `per_alloc` is mutually exclusive with the `sticky`
-  property. Use `per_alloc` only with CSI volumes and `sticky` only
-  with dynamic host volumes.
+  property. If you use `per_alloc` with dynamic host volumes, you are
+  responsible for ensuring that the volumes have unique volume names. Unless you
+  need multiple allocations for the same job to use dynamic host volumes on the
+  same host, we recommend using `sticky` for dynamic host volumes and
+  `per_alloc` for CSI volumes.
 
 The following fields are only valid for volumes with `type = "csi"` or dynamic
 host volumes with `type = "host"`:

content/terraform/v1.12.x/docs/language/meta-arguments/provider.mdx

@@ -11,7 +11,7 @@ type name. Note that the `provider` argument is distinct from the [`provider` bl
 
 ## Usage
 
-By default, Terraform determines the local name of the provider from the first word in the resource type and uses that provider's default configuration to create the resource. For example, the resource type `google_compute_instance` automatically uses the default configuration for the `google` provider. 
+By default, Terraform determines the local name of the provider from the first word in the resource type and uses that provider's default configuration to create the resource. For example, the resource type `google_compute_instance` automatically uses the default configuration for the `google` provider.
 
 You can add multiple `provider` blocks to your configuration and use the `provider` argument to a resource definition to specify which provider it should use. For its value, the `provider` argument expects a reference formatted as `<PROVIDER>.<ALIAS>`. In the following example, the `google_compute_instance` resource selects the provider configuration with the `europe` alias.
 
@@ -31,11 +31,11 @@ resource "google_compute_instance" "example" {
 }
 ```
 
-Quotation marks are not required. Arbitrary expressions are not permitted because Terraform must resolve the `provider` value while constructing the dependency graph before Terraform can safely evaluate expressions. 
+Quotation marks are not required. Arbitrary expressions are not permitted because Terraform must resolve the `provider` value while constructing the dependency graph before Terraform can safely evaluate expressions.
 
 A resource always has an implicit dependency on its associated provider. This ensures that the provider is fully configured before Terraform takes any actions on resources.
 
-Creating multiple configurations for a single provider is a common pattern for managing resources in different regions of multi-region services. 
+Creating multiple configurations for a single provider is a common pattern for managing resources in different regions of multi-region services.
 
 ## Supported constructs
 
@@ -44,7 +44,7 @@ You can use `provider` in the following Terraform configuration blocks:
 - [`check` blocks](/terraform/language/block/check)
 - [`data` blocks](/terraform/language/block/data)
 - [`ephemeral` blocks](/terraform/language/block/ephemeral)
-- [`import` block ](/terraform/language/block/import)
+- [`import` block](/terraform/language/block/import)
 - [`resource` blocks](/terraform/language/block/resource)
 
 ## Example use cases
@@ -114,4 +114,4 @@ import {
 resource "aws_instance" "web" {
   # ...
 }
-```
+```