From c5fd039fb9bbc531d4425a4e29e079bf0ffccef7 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 27 Feb 2023 08:46:12 -0500 Subject: [PATCH 1/2] Correct includeGuides (actions,code-security) (#35101) Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com> --- content/actions/guides.md | 18 +++++------ content/code-security/guides.md | 56 ++++++++++++++++++--------------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/content/actions/guides.md b/content/actions/guides.md index d8a1f5af1d..c593bf13a2 100644 --- a/content/actions/guides.md +++ b/content/actions/guides.md @@ -16,14 +16,14 @@ learningTracks: - create_actions includeGuides: - /actions/quickstart - - /actions/learn-github-actions/introduction-to-github-actions + - /actions/learn-github-actions/understanding-github-actions - /actions/creating-actions/creating-a-docker-container-action - - /actions/learn-github-actions/using-starter-workflows + - /actions/using-workflows/using-starter-workflows - /actions/automating-builds-and-tests/building-and-testing-python - /actions/automating-builds-and-tests/building-and-testing-nodejs - /actions/publishing-packages/about-packaging-with-github-actions - /actions/publishing-packages/publishing-docker-images - - /actions/advanced-guides/caching-dependencies-to-speed-up-workflows + - /actions/using-workflows/caching-dependencies-to-speed-up-workflows - /actions/automating-builds-and-tests/about-continuous-integration - /actions/automating-builds-and-tests/building-and-testing-powershell - /actions/automating-builds-and-tests/building-and-testing-ruby @@ -31,17 +31,17 @@ includeGuides: - /actions/automating-builds-and-tests/building-and-testing-java-with-gradle - /actions/automating-builds-and-tests/building-and-testing-java-with-ant - /actions/automating-builds-and-tests/building-and-testing-swift - - /actions/deployment/installing-an-apple-certificate-on-macos-runners-for-xcode-development + - /actions/deployment/deploying-xcode-applications/installing-an-apple-certificate-on-macos-runners-for-xcode-development - /actions/automating-builds-and-tests/building-and-testing-xamarin-applications - /actions/publishing-packages/publishing-nodejs-packages - /actions/publishing-packages/publishing-java-packages-with-maven - /actions/publishing-packages/publishing-java-packages-with-gradle - - /actions/advanced-guides/storing-workflow-data-as-artifacts + - /actions/using-workflows/storing-workflow-data-as-artifacts - /actions/using-containerized-services/about-service-containers - /actions/using-containerized-services/creating-redis-service-containers - /actions/using-containerized-services/creating-postgresql-service-containers - - /actions/deployment/deploying-to-amazon-elastic-container-service - - /actions/deployment/deploying-to-google-kubernetes-engine + - /actions/deployment/deploying-to-your-cloud-provider/deploying-to-amazon-elastic-container-service + - /actions/deployment/deploying-to-your-cloud-provider/deploying-to-google-kubernetes-engine - /actions/learn-github-actions/essential-features-of-github-actions - /actions/security-guides/security-hardening-for-github-actions - /actions/creating-actions/about-custom-actions @@ -59,8 +59,8 @@ includeGuides: - /actions/managing-issues-and-pull-requests/commenting-on-an-issue-when-a-label-is-added - /actions/managing-issues-and-pull-requests/moving-assigned-issues-on-project-boards - /actions/managing-issues-and-pull-requests/removing-a-label-when-a-card-is-added-to-a-project-board-column - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot + - /code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions + - /code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot - /actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-docker-to-azure-app-service - /actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-java-to-azure-app-service - /actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/deploying-net-to-azure-app-service diff --git a/content/code-security/guides.md b/content/code-security/guides.md index fb567962d3..0093acd08f 100644 --- a/content/code-security/guides.md +++ b/content/code-security/guides.md @@ -51,17 +51,17 @@ includeGuides: - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/installing-codeql-cli-in-your-ci-system - /code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/migrating-from-the-codeql-runner-to-codeql-cli - - /code-security/repository-security-advisories/about-github-security-advisories-for-repositories + - /code-security/security-advisories/repository-security-advisories/about-repository-security-advisories - /code-security/security-advisories/repository-security-advisories/configuring-private-vulnerability-reporting-for-a-repository - /code-security/security-advisories/repository-security-advisories/configuring-private-vulnerability-reporting-for-an-organization - - /code-security/repository-security-advisories/adding-a-collaborator-to-a-repository-security-advisory - - /code-security/repository-security-advisories/collaborating-in-a-temporary-private-fork-to-resolve-a-repository-security-vulnerability - - /code-security/repository-security-advisories/creating-a-repository-security-advisory - - /code-security/repository-security-advisories/editing-a-repository-security-advisory - - /code-security/repository-security-advisories/permission-levels-for-repository-security-advisories - - /code-security/repository-security-advisories/publishing-a-repository-security-advisory - - /code-security/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory - - /code-security/repository-security-advisories/withdrawing-a-repository-security-advisory + - /code-security/security-advisories/repository-security-advisories/adding-a-collaborator-to-a-repository-security-advisory + - /code-security/security-advisories/repository-security-advisories/collaborating-in-a-temporary-private-fork-to-resolve-a-repository-security-vulnerability + - /code-security/security-advisories/repository-security-advisories/creating-a-repository-security-advisory + - /code-security/security-advisories/repository-security-advisories/editing-a-repository-security-advisory + - /code-security/security-advisories/repository-security-advisories/permission-levels-for-repository-security-advisories + - /code-security/security-advisories/repository-security-advisories/publishing-a-repository-security-advisory + - /code-security/security-advisories/repository-security-advisories/removing-a-collaborator-from-a-repository-security-advisory + - /code-security/security-advisories/repository-security-advisories/withdrawing-a-repository-security-advisory - /code-security/security-advisories/guidance-on-reporting-and-writing/about-coordinated-disclosure-of-security-vulnerabilities - /code-security/security-advisories/guidance-on-reporting-and-writing/best-practices-for-writing-repository-security-advisories - /code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability @@ -69,24 +69,28 @@ includeGuides: - /code-security/security-overview/about-the-security-overview - /code-security/security-overview/filtering-alerts-in-the-security-overview - /code-security/security-overview/viewing-the-security-overview - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/customizing-dependency-updates - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/enabling-and-disabling-dependabot-version-updates - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/listing-dependencies-configured-for-version-updates + - /code-security/dependabot/dependabot-version-updates/about-dependabot-version-updates + - /code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions + - /code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + - /code-security/dependabot/dependabot-version-updates/customizing-dependency-updates + - /code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates + - /code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot + - /code-security/dependabot/dependabot-version-updates/listing-dependencies-configured-for-version-updates - /code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot - - /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates - - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies - - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates - - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/browsing-security-vulnerabilities-in-the-github-advisory-database - - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/editing-security-advisories-in-the-github-advisory-database - - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-dependabot-security-updates - - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/configuring-notifications-for-vulnerable-dependencies - - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-dependabot-errors - - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/troubleshooting-the-detection-of-vulnerable-dependencies - - /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository + - /code-security/dependabot/working-with-dependabot/removing-dependabot-access-to-public-registries + - /code-security/dependabot/working-with-dependabot/managing-pull-requests-for-dependency-updates + - /code-security/dependabot/dependabot-alerts/about-dependabot-alerts + - /code-security/dependabot/dependabot-alerts/configuring-dependabot-alerts + - /code-security/dependabot/dependabot-security-updates/about-dependabot-security-updates + - /code-security/security-advisories/global-security-advisories/about-the-github-advisory-database + - /code-security/security-advisories/global-security-advisories/about-global-security-advisories + - /code-security/security-advisories/global-security-advisories/browsing-security-advisories-in-the-github-advisory-database + - /code-security/security-advisories/global-security-advisories/editing-security-advisories-in-the-github-advisory-database + - /code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates + - /code-security/dependabot/dependabot-alerts/configuring-notifications-for-dependabot-alerts + - /code-security/dependabot/working-with-dependabot/troubleshooting-dependabot-errors + - /code-security/dependabot/working-with-dependabot/troubleshooting-the-detection-of-vulnerable-dependencies + - /code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts - /code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review - /code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph - /code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api From 285daec086bd48c12016f18739f2c00523539a69 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 27 Feb 2023 08:49:51 -0500 Subject: [PATCH 2/2] Throw error if spotting old enterprise-server links (#35106) --- lib/update-internal-links.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/update-internal-links.js b/lib/update-internal-links.js index db785517b0..ddaa92c1c4 100644 --- a/lib/update-internal-links.js +++ b/lib/update-internal-links.js @@ -272,6 +272,16 @@ function getNewHref(href, context, opts) { // we always want respect that and put it back in. if (withoutLanguage.includes(`/${nonEnterpriseDefaultVersion}/`)) { newHref = `/${nonEnterpriseDefaultVersion}${redirectedWithoutLanguage}` + } else if (withoutLanguage.startsWith('/enterprise-server/')) { + const msg = + "Old /enterprise-server/ links that don't include a @version is no longer supported. " + + 'If you see this, manually fix that link to use enterprise-server@latest.' + if (opts.strict) { + throw new Error(msg) + } else { + console.warn(msg) + return + } } else if (withoutLanguage.startsWith('/enterprise-server@latest')) { // getRedirect() will always replace `enterprise-server@latest` with // whatever the latest number is. E.g. `enterprise-server@3.9`.