Merge branch 'main' into abhishek/consul-k8s-cli-proxy-docs

Author: LordAbhishek

.github/PULL_REQUEST_TEMPLATE/consul_pull_request_template.md

@@ -0,0 +1,80 @@
+<!--
+**Merge branch**
+
+Make sure you create your PR against the correct **base** branch. For instructions, refer to
+GitHub's **Change the branch range and destination repository guide** (https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request).
+
+If your content is an update to:
+
+- Currently published content
+
+  Choose **base: main** when you are updating published documentation, and you
+  want your changes published when the PR is merged. We publish Consul content
+  from the `main` branch.
+
+- Upcoming Consul release
+
+  Choose the branch for the Consul release that your content is for. Consul
+  release branches use the `consul/<exact-release-number>` format. If you are not
+  able to find the upcoming Consul release branch that you are looking for,
+  contact the tech writer that works with the Consul team.
+
+**Backports**
+
+This repo stores previous version docs in folders instead of branches. There are
+no backport labels.  If you backported your code PR to previous branches, update
+the docs content in the corresponding folders. For example, if the current
+release is 1.22.x and you backported your code to 1.21.x and 1.20.x, update the docs content
+in the v1.22.x, v1.21.x, and v1.20.x folders.
+-->
+
+## Description
+
+<!-- Please describe why you're making this change and point out any important details the reviewers
+should be aware of. 
+
+Include the target release as well as prior versions if applicable.
+-->
+
+## Links
+<!--
+Please include links to GitHub issues, documentation, or similar which is relevant to this PR. If
+this is a bug fix, please ensure related issues are linked so they will close when this PR is
+merged.
+
+Jira: [<jira-ticket-number>]  // for example, Jira: [CE-1001] GH-Jira integration generates the link and updates the Jira ticket.
+GitHub Issue: <issue-link>
+Deploy previews:
+
+The bot does publish a root-level link to the deploy preview, 
+but it's nice to include a direct link to your content so the reviewers don't have to navigate to your pages.
+-->
+
+## Contributor checklists
+
+Review urgency:
+
+- [ ] ASAP: Bug fixes, broken content, imminent releases
+- [ ] 3 days: Small changes, easy reviews
+- [ ] 1 week: Default expectation
+- [ ] Best effort: No urgency
+
+Pull request:
+
+- [ ] Verify that the PR is set to merge into the correct base branch
+- [ ] Verify that all status checks passed
+- [ ] Verify that the preview environment deployed successfully
+- [ ] Add additional reviewers if they are not part of assigned groups
+
+Content:
+
+- [ ] I added redirects for any moved or removed pages
+- [ ] I followed the [Education style guide](https://github.com/hashicorp/web-unified-docs/tree/main/docs/style-guide)
+- [ ] I looked at the local or Vercel build to make sure the content rendered correctly
+
+## Reviewer checklist
+
+- [ ] This PR is set to merge into the correct base branch.
+- [ ] The content does not contain technical inaccuracies.
+- [ ] The content follows the Education content and style guides.
+- [ ] I have verified and tested changes to instructions for end users.

.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/actions/reload-dev-portal/action.yml

@@ -7,7 +7,7 @@
 
 
 policy:
-  - template: [ docs.yml]
+  - template: [docs.yml]
     section:
       - id: [product]
         label:
@@ -35,4 +35,6 @@ policy:
             keys: ['Waypoint']
           - name: 'Triage'
             keys: ['No product', 'Other product']
+          - name: 'Runtime'
+            keys: ['Nomad', 'Consul']
 

.github/advanced-issue-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,15 +230,23 @@ Waypoint:
         'content/hcp-docs/content/docs/waypoint/**'
       ]
 
-# Add 'HCP Docs' label to changes under '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
 # --------------- | ------------------------------------------------------------
-# HCP Docs        | Default; applies to all doc updates
+# Runtime         | Default; applies to all doc updates
+# Runtime         | Updates to Consul documentation
+# Runtime         | Updates to Nomad documentation
+# Runtime         | Updates to HCP CLI documentation
+# Runtime         | Updates to HCP platform documentation
+
 
-HCP Docs:
+Runtime:
 - any:
   - changed-files:
     - any-glob-to-any-file: [
-        'content/hcp-docs/**'
-      ]
+        'content/consul/**',
+        'content/nomad/**',
+        'content/hcp-docs/content/docs/cli/**',
+        'content/hcp-docs/content/docs/hcp/**'
+      ]

.github/labeler.yml

@@ -1,5 +1,11 @@
 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)

.github/pull_request_template.md

@@ -1,6 +1,7 @@
 name: Algolia Sync - Production
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - 'main'

.github/workflows/algolia-prod.yml

@@ -105,14 +105,17 @@ jobs:
           cache: 'npm'
           node-version-file: 'package.json'
 
+      - name: Generate cache manifest
+        run: git ls-files -z -- '*.js' '*.mjs' '*.ts' '*.tsx' '*.mdx' '*.json' | xargs -0 git hash-object > cache-key.txt
+
       - name: Use cache
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
         with:
           path: |
             ~/.npm
             ${{ github.workspace }}/.next/cache
           # Generate a new cache whenever packages or source files change.
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.js', '**/*.mjs', '**/*.ts', '**/*.tsx', '**/*.mdx', '**/*.json') }}
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('cache-key.txt') }}
           # If source files changed but packages didn't, rebuild from a prior cache.
           restore-keys: |
             ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-

.github/workflows/build-pr-preview.yml

@@ -25,7 +25,7 @@ on:
         default: true
 
 env:
-  GITHUB_TOKEN: ${{ secrets.TFE_GITHUB_TOKEN_010623 }}
+  GITHUB_TOKEN: ${{ secrets.TFE_GITHUB_TOKEN }}
   GITHUB_USER: [email protected]
   DEV: ${{ inputs.dev-mode }}
   NOTIFY: ${{ inputs.notify }}