Merge branch 'main' into casey/helm-versioning-strategy

Author: casey-robertson-paypal

Dockerfile

@@ -10,7 +10,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20260527-203230-gabf2049e0@sha256:e6d4192acbdf566584c77f1306cd72cac3a381be6ff6174c85ee21bb164a8b46 AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20260603-101723-g62a660e20@sha256:216e9ea02bb1f000a3e9ed1beeb9127b33a7661ae61f041879e61fffd52e1bd2 AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

assets/images/help/billing/copilot-billing-entity-dropdown.png

@@ -12,8 +12,6 @@ environments:
 
   # 15 staging environments, evergreens only
   # they should all contain the same configs
-  # intentionally pinned to a single cluster via the `name` selector
-
   - name: staging-balsam
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour
@@ -24,7 +22,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':balsam: Review at https://docs-internal-staging-balsam.githubapp.com/'
 
   - name: staging-boxwood
@@ -37,7 +34,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':boxwood: Review at https://docs-internal-staging-boxwood.githubapp.com/'
 
   - name: staging-cedar
@@ -50,7 +46,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':cedar: Review at https://docs-internal-staging-cedar.githubapp.com/'
 
   - name: staging-cypress
@@ -63,7 +58,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':cypress: Review at https://docs-internal-staging-cypress.githubapp.com/'
 
   - name: staging-fir
@@ -76,7 +70,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':fir: Review at https://docs-internal-staging-fir.githubapp.com/'
 
   - name: staging-hemlock
@@ -89,7 +82,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':hemlock: Review at https://docs-internal-staging-hemlock.githubapp.com/'
 
   - name: staging-hinoki
@@ -102,7 +94,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':hinoki: Review at https://docs-internal-staging-hinoki.githubapp.com/'
 
   - name: staging-holly
@@ -115,7 +106,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':holly_: Review at https://docs-internal-staging-holly.githubapp.com/'
 
   - name: staging-juniper
@@ -128,7 +118,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':juniper: Review at https://docs-internal-staging-juniper.githubapp.com/'
 
   - name: staging-laurel
@@ -141,7 +130,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':laurel: Review at https://docs-internal-staging-laurel.githubapp.com/'
 
   - name: staging-pine
@@ -154,7 +142,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':pine: Review at https://docs-internal-staging-pine.githubapp.com/'
 
   - name: staging-redwood
@@ -167,7 +154,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':redwood: Review at https://docs-internal-staging-redwood.githubapp.com/'
 
   - name: staging-sequoia
@@ -180,7 +166,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':sequoia: Review at https://docs-internal-staging-sequoia.githubapp.com/'
 
   - name: staging-spruce
@@ -193,7 +178,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':spruce: Review at https://docs-internal-staging-spruce.githubapp.com/'
 
   - name: staging-yew
@@ -206,7 +190,6 @@ environments:
     cluster_selector:
       profile: general
       region: iad
-      name: general-2-ash1-iad
     extra_completed_message: ':yew: Review at https://docs-internal-staging-yew.githubapp.com/'
 
 required_builds:

assets/images/help/billing/premium-request-analytics-chart.png

@@ -16,6 +16,7 @@ redirect_from:
   - /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-default-setup-for-code-scanning
   - /code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning
   - /code-security/how-tos/scan-code-for-vulnerabilities/configure-code-scanning/configuring-default-setup-for-code-scanning
+  - /code-security/how-tos/find-and-fix-code-vulnerabilities/configure-code-scanning/configuring-default-setup-for-code-scanning
 permissions: '{% data reusables.permissions.security-repo-enable %}'
 product: '{% data reusables.gated-features.code-scanning %}'
 versions:

assets/images/help/billing/premium-request-analytics-org-table.png

@@ -7,7 +7,7 @@ versions:
   ghec: '*'
 contentType: how-tos
 children:
-  - /configuring-default-setup-for-code-scanning
+  - /configure-code-scanning
   - /configuring-advanced-setup-for-code-scanning
 redirect_from:
   - /code-security/code-scanning/enabling-code-scanning

assets/images/help/copilot/cloud-agent/log-stop-session.png

@@ -13,7 +13,7 @@ redirect_from:
   - /code-security/secure-coding/integrating-with-code-scanning
   - /code-security/how-tos/scan-code-for-vulnerabilities/integrate-with-existing-tools
 children:
-  - /using-code-scanning-with-your-existing-ci-system
-  - /uploading-a-sarif-file-to-github
+  - /use-with-existing-ci-system
+  - /upload-sarif-file
 ---
 

config/moda/deployment.yaml

@@ -1,6 +1,6 @@
 ---
 title: Uploading a SARIF file to GitHub
-shortTitle: Upload a SARIF file
+shortTitle: Upload SARIF file
 intro: '{% data reusables.code-scanning.you-can-upload-third-party-analysis %}'
 permissions: '{% data reusables.permissions.code-scanning-all-alerts %}'
 product: '{% data reusables.gated-features.code-scanning %}'
@@ -12,6 +12,8 @@ redirect_from:
   - /github/finding-security-vulnerabilities-and-errors-in-your-code/integrating-with-code-scanning/uploading-a-sarif-file-to-github
   - /code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github
   - /code-security/how-tos/scan-code-for-vulnerabilities/integrate-with-existing-tools/uploading-a-sarif-file-to-github
+  - /code-security/how-tos/find-and-fix-code-vulnerabilities/integrate-with-existing-tools/uploading-a-sarif-file-to-github
+  - /code-security/how-tos/find-and-fix-code-vulnerabilities/integrate-with-existing-tools/upload-a-sarif-file
 versions:
   fpt: '*'
   ghes: '*'