Merge branch 'main' into ngf-release-2.3

Author: ADubhlaoich

.github/CODEOWNERS

@@ -30,8 +30,12 @@ content/waf/*               @nginx/waf
 content/includes/waf/*      @nginx/waf
 
 # NGINXaaS for Azure 
-content/nginxaas-azure/*          @nginx/n4a-docs-approvers
-content/includes/nginxaas-azure/* @nginx/n4a-docs-approvers
+content/nginxaas-azure/*          @nginx/nginxaas-docs-approvers
+content/includes/nginxaas-azure/* @nginx/nginxaas-docs-approvers
+
+# NGINXaaS for Google Cloud 
+content/nginxaas-google/*          @nginx/nginxaas-docs-approvers
+content/includes/nginxaas-google/* @nginx/nginxaas-docs-approvers
 
 # NGINX Gateway Fabric
 content/ngf/*               @nginx/nginx-gateway-fabric

.github/ISSUE_TEMPLATE/1-idea_suggestion.yml

@@ -10,7 +10,7 @@ body:
       required: true
   - type: dropdown
     attributes: 
-      label: Which product or products does this request relate to?
+      label: Which product or products does this idea relate to?
       multiple: true
       options:
         - F5 DoS for NGINX
@@ -28,16 +28,12 @@ body:
       required: true
   - type: textarea
     attributes:
-      label: Is this idea related to a larger problem?
+      label: Does this idea relate to other issues?
       description: If you have identified multiple related issues, it might be a design pattern problem.
-    validations:
-      required: true
   - type: textarea
     attributes: 
-      label: What alternative ways are there to implement your idea?
-      description: There are often multiple ways to something - context is important.
-    validations:
-      required: true
+      label: Are there alternative ideas for improving the same topic?
+      description: If you already identified reasons not to go with other solutions, we'd like to know why!
   - type: textarea
     attributes: 
       label: Any additional information

.github/ISSUE_TEMPLATE/2-bug_report.yml

@@ -1,16 +1,16 @@
 name: Bug report
-description: Report an issue with our documentation
+description: Report an issue with our content or website
 title: "[Bug]: "
 body: 
   - type: textarea
     attributes:
-      label: Describe the bug you have identified
+      label: Describe the problem you have identified
       description: Explain the problem with as much detail as possible.
     validations:
       required: true
   - type: dropdown
     attributes: 
-      label: Which product or products does this request relate to?
+      label: Which product or products does this problem relate to?
       multiple: true
       options:
         - F5 DoS for NGINX
@@ -28,22 +28,16 @@ body:
       required: true
   - type: textarea
     attributes:
-      label: Steps to reproduce the bug
+      label: If necessary, explain any additional steps to reproduce the problem.
       description: Describe the where the issue occurs.
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: What is the expected or desired behaviour?
-      description: Describe what you expected to happen instead of the bug.
-    validations:
-      required: true    
+      description: Describe what you expected to happen instead of the problem
   - type: textarea
     attributes:
-      label: What environments or versions does this bug affect?
-      description: Describe the contexts which this bug seems to occur.
-    validations:
-      required: true
+      label: Is this problem specific to a particular platform or software version?
+      description: Describe the context in which this problem appears.
   - type: textarea
     attributes: 
       label: Any additional information

.github/workflows/build-push.yml

@@ -58,7 +58,7 @@ jobs:
 
   call-docs-build-push:
     needs: prod-check-branch
-    uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@04ed2db338ee08cc560a327f412684d0c8260de2 # v1.0.11
+    uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@7bae601be08ca09aabd0850731e20847a456c227 # v1.0.12
     with:
       production_url_path: ""
       preview_url_path: "${{ vars.PREVIEW_URL_PATH }}"

.github/workflows/coveo.yml

@@ -67,7 +67,7 @@ jobs:
 
       - name: Upload token for ${{matrix.env_name}}
         if: ${{ steps.generate-token.outcome == 'success' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{matrix.env_name}}
           path: "./"
@@ -101,7 +101,7 @@ jobs:
     needs: generate-coveo-search-token
     steps:
       - name: Download Coveo search token
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
 
       - name: View files
         run: ls -R

.github/workflows/linkchecker.yml

@@ -56,7 +56,6 @@ jobs:
           - waf
           - nginx-ingress-controller
           - nginxaas/azure
-          - nginx-service-mesh
           - nginx-amplify
           - nginx-controller
           - nginx-waf

.github/workflows/ossf_scorecard.yml

@@ -48,14 +48,14 @@ jobs:
 
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF format to the repository Actions tab.
       - name: Upload artifact
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload SARIF results to code scanning
-        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/playwright.yml

@@ -18,13 +18,13 @@ jobs:
       run: npx playwright install --with-deps
     - name: Run Playwright tests
       run: npx playwright test --retries=2
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v5
       if: ${{ !cancelled() }}
       with:
         name: playwright-report
         path: tests/playwright-report/
         retention-days: 30
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v5
       if: ${{ !cancelled() }}
       with:
         name: test-results

Makefile

@@ -1,16 +1,16 @@
 HUGO?=hugo
 HUGO_VERSION?=$(shell hugo version 2>/dev/null | awk '{print $$2}' | cut -d '.' -f 2)
-HUGO_IMG?=hugomods/hugo:std-go-git-0.147.8
+HUGO_IMG?=hugomods/hugo:std-go-git-0.152.2
 
-THEME_MODULE = github.com/nginxinc/nginx-hugo-theme
+THEME_MODULE = github.com/nginxinc/nginx-hugo-theme/v2
 
 ifeq ($(shell [ $(HUGO_VERSION) -gt 146 2>/dev/null ] && echo true || echo false), true)
     $(info Hugo is available and has a version greater than 146. Proceeding with build.)
 else
-    $(warning Hugo is not available or using a version less than 147. Attempting to use docker. HUGO_VERSION=$(HUGO_VERSION))
+    $(warning Hugo is not available or using a version less than 151. Attempting to use docker. HUGO_VERSION=$(HUGO_VERSION))
     HUGO=docker run --rm -it -v ${CURDIR}:/src -p 1313:1313 ${HUGO_IMG} /src/hugo-entrypoint.sh
     ifeq (, $(shell docker version 2> /dev/null))
-        $(error Hugo (>0.147) or Docker are required to build the local previews.)
+        $(error Hugo (>0.151) or Docker are required to build the local previews.)
     endif
 endif
 
@@ -50,7 +50,7 @@ clean:
 	[ -d "public" ] && rm -rf "public" 
 
 hugo-get:
-	hugo mod get -u github.com/nginxinc/nginx-hugo-theme
+	hugo mod get -u github.com/nginxinc/nginx-hugo-theme/v2
 
 hugo-tidy:
 	hugo mod tidy

config/_default/config.toml

@@ -28,7 +28,7 @@ enableGitInfo = true
 
 [module]
 [[module.imports]]
-  path="github.com/nginxinc/nginx-hugo-theme"
+  path="github.com/nginxinc/nginx-hugo-theme/v2"
 
 [markup]
   [markup.goldmark]