From acebb2f52a6c5d0680d90901d1efa1946ce25096 Mon Sep 17 00:00:00 2001 From: Isaac Brown <101839405+isaacmbrown@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:49:33 +0000 Subject: [PATCH 1/2] [GEI 1d] Move content in "Granting the migrator role" article (#48704) Co-authored-by: Tim Rogers --- ...ion-logs-for-github-enterprise-importer.md | 2 +- ...for-a-migration-between-github-products.md | 42 +++++- ...om-githubcom-to-github-enterprise-cloud.md | 2 +- ...prise-server-to-github-enterprise-cloud.md | 2 +- ...om-githubcom-to-github-enterprise-cloud.md | 2 +- ...-of-a-migration-between-github-products.md | 4 +- ...ccess-for-a-migration-from-azure-devops.md | 31 +++- ...azure-devops-to-github-enterprise-cloud.md | 2 +- ...azure-devops-to-github-enterprise-cloud.md | 2 +- ...s-for-a-migration-from-bitbucket-server.md | 31 +++- ...ucket-server-to-github-enterprise-cloud.md | 2 +- ...ucket-server-to-github-enterprise-cloud.md | 2 +- ...tor-role-for-github-enterprise-importer.md | 135 ------------------ .../index.md | 1 - .../about-the-migrator-role.md | 7 + .../grant-migrator-role-graphql.md | 47 ++++++ .../grant-migrator-tasks.md | 2 +- 17 files changed, 166 insertions(+), 150 deletions(-) delete mode 100644 content/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer.md create mode 100644 data/reusables/enterprise-migration-tool/about-the-migrator-role.md create mode 100644 data/reusables/enterprise-migration-tool/grant-migrator-role-graphql.md diff --git a/content/migrations/using-github-enterprise-importer/completing-your-migration-with-github-enterprise-importer/accessing-your-migration-logs-for-github-enterprise-importer.md b/content/migrations/using-github-enterprise-importer/completing-your-migration-with-github-enterprise-importer/accessing-your-migration-logs-for-github-enterprise-importer.md index e306905bace0..bdf214128478 100644 --- a/content/migrations/using-github-enterprise-importer/completing-your-migration-with-github-enterprise-importer/accessing-your-migration-logs-for-github-enterprise-importer.md +++ b/content/migrations/using-github-enterprise-importer/completing-your-migration-with-github-enterprise-importer/accessing-your-migration-logs-for-github-enterprise-importer.md @@ -41,7 +41,7 @@ People with read access to a repository can access the migration log for the rep ## Downloading a repository migration log with the {% data variables.product.prodname_cli %} -Organization owners and people with the migrator role can download migration logs using the {% data variables.product.prodname_cli %}. For more information about the migrator role, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +Organization owners and organization members with the migrator role can download migration logs using the {% data variables.product.prodname_cli %}. You can download the latest migration log for an individual repository with the `download-logs` command. The exact command depends on your migration source. diff --git a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products.md b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products.md index de79375eed5a..e3ba5e93988d 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products.md +++ b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products.md @@ -10,6 +10,8 @@ redirect_from: - /early-access/github/migrating-with-github-enterprise-importer/running-a-migration-with-github-enterprise-importer/managing-access-for-github-enterprise-importer - /early-access/enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/managing-access-for-github-enterprise-importer - /migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/managing-access-for-github-enterprise-importer + - /early-access/enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer + - /migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer --- ## About required access for {% data variables.product.prodname_importer_proper_name %} @@ -28,9 +30,22 @@ Additionally, if you use IP allow lists with the source or destination, you may If you're migrating from {% data variables.product.prodname_ghe_server %} 3.8 or higher for the first time, you also need someone with access to the {% data variables.enterprise.management_console %} to set up blob storage for {% data variables.location.product_location_enterprise %}. +## About the migrator role + +{% data reusables.enterprise-migration-tool.about-the-migrator-role %} + +{% note %} + +**Notes:** +- If you're migrating a repository between two organizations on {% data variables.product.prodname_dotcom_the_website %}, you can grant the migrator role to the same person or team for both organizations, but you must grant each separately. +- You cannot grant the migrator role for enterprise accounts. Therefore, you can only run an organization migration if you're an owner of the destination enterprise. However, you can grant the migrator role to that enterprise owner for the source organization. +- The {% data variables.product.prodname_cli %} does not support granting the migrator role for organizations on {% data variables.product.prodname_ghe_server %}, so you must be an organization owner of the source organization to migrate repositories from {% data variables.product.prodname_ghe_server %}. + +{% endnote %} + ## Required roles -For the source and destination of the migration, different roles are required for different tasks. For some tasks, you can grant the migrator role to a user or team. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +For the source and destination of the migration, different roles are required for different tasks. ### Source organization @@ -76,6 +91,31 @@ Reclaiming mannequins | {% octicon "dash" aria-label="Not applicable" %} | `admi Running a migration (source organization) | {% octicon "dash" aria-label="Not applicable" %} | `read:org`, `repo` | `read:org`, `repo` | Running an organization migration (destination enterprise) | `read:enterprise`, `admin:org`, `repo`, `workflow` | {% octicon "dash" aria-label="Not applicable" %} | {% octicon "dash" aria-label="Not applicable" %} | +## Granting the migrator role + +To allow someone other than an organization owner to run a repository migration or download migration logs, you can grant the migrator role to a user or team. For more information, see "[About the migrator role](#about-the-migrator-role)." + +You can grant the migrator role using either the {% data variables.product.prodname_gei_cli %} or the GraphQL API. + +- "[Granting the migrator role with the {% data variables.product.prodname_gei_cli_short %}](#granting-the-migrator-role-with-the-ado2gh-extension)" +- "[Granting the migrator role with the GraphQL API](#granting-the-migrator-role-with-the-graphql-api)" + +### Granting the migrator role with the {% data variables.product.prodname_gei_cli_short %} + +To grant the migrator role using the CLI, you must have installed the {% data variables.product.prodname_gei_cli %}. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-githubcom-to-github-enterprise-cloud#step-1-install-the-gei-extension-of-the-github-cli)." + +1. On {% data variables.product.prodname_dotcom_the_website %}, create and record a {% data variables.product.pat_generic %} that meets all the requirements for granting the migrator role. For more information, see "[Creating a {% data variables.product.pat_generic %} for {% data variables.product.prodname_importer_proper_name %}](#creating-a-personal-access-token-for-github-enterprise-importer)." +{% data reusables.enterprise-migration-tool.grant-migrator-role-pat %} +1. Use the `gh gei grant-migrator-role` command, replacing ORGANIZATION with the organization you want to grant the migrator role for, ACTOR with the user or team name, and TYPE with `USER` or `TEAM`. + + ```shell copy + gh gei grant-migrator-role --github-org ORGANIZATION --actor ACTOR --actor-type TYPE + ``` + +### Granting the migrator role with the GraphQL API + +{% data reusables.enterprise-migration-tool.grant-migrator-role-graphql %} + ## Creating a {% data variables.product.pat_generic %} for {% data variables.product.prodname_importer_proper_name %} {% data reusables.enterprise-migration-tool.creating-a-pat-steps %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-organizations-from-githubcom-to-github-enterprise-cloud.md b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-organizations-from-githubcom-to-github-enterprise-cloud.md index b84cb91a1673..5bff48a4f0fe 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-organizations-from-githubcom-to-github-enterprise-cloud.md +++ b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-organizations-from-githubcom-to-github-enterprise-cloud.md @@ -27,7 +27,7 @@ redirect_from: ## Prerequisites {% data reusables.enterprise-migration-tool.migration-prerequisites %} -- For the source organization, you must be an organization owner or have the migrator role. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +- For the source organization, you must be an organization owner or have the migrator role. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#about-the-migrator-role)." - For the destination enterprise account, you must be an enterprise owner. {% api %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-github-enterprise-server-to-github-enterprise-cloud.md b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-github-enterprise-server-to-github-enterprise-cloud.md index 359a3e25a56a..e579328641c9 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-github-enterprise-server-to-github-enterprise-cloud.md +++ b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-github-enterprise-server-to-github-enterprise-cloud.md @@ -50,7 +50,7 @@ To migrate your repositories from {% data variables.product.prodname_ghe_server ## Prerequisites {% data reusables.enterprise-migration-tool.migration-prerequisites %} -- You must be either an organization owner or be granted the migrator role for both the source and destination organizations. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +- In both the source and destination organizations, you must be either an organization owner or be granted the migrator role. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#about-the-migrator-role)." - If you use {% data variables.product.prodname_ghe_server %} 3.8 or higher, you need access to the {% data variables.enterprise.management_console %}. {% api %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-githubcom-to-github-enterprise-cloud.md b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-githubcom-to-github-enterprise-cloud.md index 373a23938c1f..36bdef97e88c 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-githubcom-to-github-enterprise-cloud.md +++ b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-githubcom-to-github-enterprise-cloud.md @@ -27,7 +27,7 @@ redirect_from: ## Prerequisites {% data reusables.enterprise-migration-tool.migration-prerequisites %} -- You must be either an organization owner or be granted the migrator role for both the source and destination organizations. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +- In both the source and destination organization, you must be either an organization owner or be granted the migrator role. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#about-the-migrator-role)." {% api %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/overview-of-a-migration-between-github-products.md b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/overview-of-a-migration-between-github-products.md index 65abc460a3a8..6eba448ac783 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-between-github-products/overview-of-a-migration-between-github-products.md +++ b/content/migrations/using-github-enterprise-importer/migrating-between-github-products/overview-of-a-migration-between-github-products.md @@ -78,7 +78,7 @@ To migrate an organization, you must be an organization owner for the source org Additionally, you must be an enterprise owner on the destination enterprise account. You cannot grant the migrator role for enterprise accounts. 1. Confirm that the person who will run your migrations is an enterprise owner of the destination enterprise account. -1. If that person is not an organization owner for the source organization, grant them the migrator role for the organization. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +1. If that person is not an organization owner for the source organization, grant them the migrator role for the organization. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#about-the-migrator-role)." {% data reusables.enterprise-migration-tool.confirm-migrator-has-correct-pats %} For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#required-scopes-for-personal-access-tokens)." #### Deciding who will run repository migrations @@ -86,7 +86,7 @@ Additionally, you must be an enterprise owner on the destination enterprise acco To migrate a repository, you must be an organization owner for both the source organization and the destination organization, or an organization owner must grant you the migrator role for each organization where you're not an owner. 1. Decide whether you want an organization owner to perform your migrations, or whether you need to grant the migrator role to someone else. -{% data reusables.enterprise-migration-tool.grant-migrator-tasks %} +{% data reusables.enterprise-migration-tool.grant-migrator-tasks %} For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#about-the-migrator-role)." {% note %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md b/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md index e553b98782d3..9aa9556b2da6 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md +++ b/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops.md @@ -21,9 +21,13 @@ To migrate a repository from Azure DevOps to GitHub, you need sufficient access Additionally, if you use IP allow lists with the source or destination, you may need to configure the allow lists to allow access by {% data variables.product.prodname_importer_proper_name %}. +## About the migrator role + +{% data reusables.enterprise-migration-tool.about-the-migrator-role %} + ## Required roles for {% data variables.product.company_short %} -For the destination organization on {% data variables.product.prodname_dotcom %}, different roles are required for different tasks. For some tasks, you can grant the migrator role to a user or team. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +For the destination organization on {% data variables.product.prodname_dotcom %}, different roles are required for different tasks. {% data reusables.enterprise-migration-tool.gei-required-roles %} @@ -43,6 +47,31 @@ Your Azure DevOps {% data variables.product.pat_generic %} must have `work item If you want to migrate from multiple organizations, allow the {% data variables.product.pat_generic %} to access all accessible organizations. For more information, see [Use {% data variables.product.pat_generic %}s](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=azure-devops&tabs=preview-page#create-a-pat) in Microsoft Docs. +## Granting the migrator role + +To allow someone other than an organization owner to run a migration or download migration logs, you can grant the migrator role to a user or team. For more information, see "[About the migrator role](#about-the-migrator-role)." + +You can grant the migrator role using either the {% data variables.product.prodname_ado2gh_cli %} or the GraphQL API. + +- "[Granting the migrator role with the {% data variables.product.prodname_ado2gh_cli_short %}](#granting-the-migrator-role-with-the-ado2gh-extension)" +- "[Granting the migrator role with the GraphQL API](#granting-the-migrator-role-with-the-graphql-api)" + +### Granting the migrator role with the {% data variables.product.prodname_ado2gh_cli_short %} + +To grant the migrator role using the CLI, you must have installed the {% data variables.product.prodname_ado2gh_cli %}. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud#step-1-install-the-ado2gh-extension-of-the-github-cli)." + +1. On {% data variables.product.prodname_dotcom_the_website %}, create and record a {% data variables.product.pat_generic %} that meets all the requirements for granting the migrator role. For more information, see "[Creating a {% data variables.product.pat_generic %} for {% data variables.product.prodname_dotcom %}](#creating-a-personal-access-token-for-github)." +{% data reusables.enterprise-migration-tool.grant-migrator-role-pat %} +1. Use the `gh ado2gh grant-migrator-role` command, replacing ORGANIZATION with the organization you want to grant the migrator role for, ACTOR with the user or team name, and TYPE with `USER` or `TEAM`. + + ```shell copy + gh ado2gh grant-migrator-role --github-org ORGANIZATION --actor ACTOR --actor-type TYPE + ``` + +### Granting the migrator role with the GraphQL API + +{% data reusables.enterprise-migration-tool.grant-migrator-role-graphql %} + ## Creating a {% data variables.product.pat_generic %} for {% data variables.product.prodname_dotcom %} {% data reusables.enterprise-migration-tool.creating-a-pat-steps %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md b/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md index 0e18d877c405..5d0590e9df73 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md +++ b/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/migrating-repositories-from-azure-devops-to-github-enterprise-cloud.md @@ -27,7 +27,7 @@ redirect_from: ## Prerequisites {% data reusables.enterprise-migration-tool.migration-prerequisites %} -- For the destination organization on {% data variables.product.prodname_dotcom_the_website %}, you need to be an organization owner or have the migrator role. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +- For the destination organization on {% data variables.product.prodname_dotcom_the_website %}, you need to be an organization owner or have the migrator role. For more information about the migrator role, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops#about-the-migrator-role)." {% api %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md b/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md index 13461d71f331..ecb2016e609b 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md +++ b/content/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/overview-of-a-migration-from-azure-devops-to-github-enterprise-cloud.md @@ -64,7 +64,7 @@ Service hooks are not migrated from ADO, so you will need to recreate them separ To migrate a repository, you must be an organization owner for the destination organization, or an organization owner must grant you the migrator role. 1. Decide whether you want an organization owner of the destination organization to perform your migrations, or whether you need to grant the migrator role to someone else. -{% data reusables.enterprise-migration-tool.grant-migrator-tasks %} +{% data reusables.enterprise-migration-tool.grant-migrator-tasks %} For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops#about-the-migrator-role)." {% data reusables.enterprise-migration-tool.confirm-migrator-has-correct-pats %} For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops#required-scopes-for-personal-access-tokens)." ### What organizational structure do we want in {% data variables.product.prodname_dotcom %}? diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server.md b/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server.md index 6a12c4650783..e62a43ca97f2 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server.md +++ b/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server.md @@ -21,9 +21,13 @@ To migrate a repository from Bitbucket Server to GitHub, you need sufficient acc Additionally, if you use IP allow lists in the destination organization, you may need to configure the allow lists to allow access by {% data variables.product.prodname_importer_proper_name %}. +## About the migrator role + +{% data reusables.enterprise-migration-tool.about-the-migrator-role %} + ## Required roles for {% data variables.product.company_short %} -For the destination organization on {% data variables.product.prodname_dotcom %}, different roles are required for different tasks. For some tasks, you can grant the migrator role to a user or team. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +For the destination organization on {% data variables.product.prodname_dotcom %}, different roles are required for different tasks. {% data reusables.enterprise-migration-tool.gei-required-roles %} @@ -66,6 +70,31 @@ If your Bitbucket Server instance runs on Linux, you must use an SSH key that me If you receive an error like `cipher name aes256-ctr for openssh key file is not supported` when running a migration, your SSH private key uses an unsupported cipher. For more information about how to generate a compatible private key, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/completing-your-migration-with-github-enterprise-importer/troubleshooting-your-migration-with-github-enterprise-importer#cipher-name-is-not-supported)." +## Granting the migrator role + +To allow someone other than an organization owner to run a migration or download migration logs, you can grant the migrator role to a user or team. For more information, see "[About the migrator role](#about-the-migrator-role)." + +You can grant the migrator role using either the {% data variables.product.prodname_bbs2gh_cli %} or the GraphQL API. + +- "[Granting the migrator role with the {% data variables.product.prodname_bbs2gh_cli_short %}](#granting-the-migrator-role-with-the-bbs2gh-extension)" +- "[Granting the migrator role with the GraphQL API](#granting-the-migrator-role-with-the-graphql-api)" + +### Granting the migrator role with the {% data variables.product.prodname_bbs2gh_cli_short %} + +To grant the migrator role using the CLI, you must have installed the {% data variables.product.prodname_bbs2gh_cli %}. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/migrating-repositories-from-bitbucket-server-to-github-enterprise-cloud#step-1-install-the-bbs2gh-extension-of-the-github-cli)." + +1. On {% data variables.product.prodname_dotcom_the_website %}, create and record a {% data variables.product.pat_generic %} that meets all the requirements for granting the migrator role. For more information, see "[Creating a {% data variables.product.pat_generic %} for {% data variables.product.prodname_importer_proper_name %}](#creating-a-personal-access-token-for-github-enterprise-importer)." +{% data reusables.enterprise-migration-tool.grant-migrator-role-pat %} +1. Use the `gh bbs2gh grant-migrator-role` command, replacing ORGANIZATION with the organization you want to grant the migrator role for, ACTOR with the user or team name, and TYPE with `USER` or `TEAM`. + + ```shell copy + gh bbs2gh grant-migrator-role --github-org ORGANIZATION --actor ACTOR --actor-type TYPE + ``` + +### Granting the migrator role with the GraphQL API + +{% data reusables.enterprise-migration-tool.grant-migrator-role-graphql %} + ## Creating a {% data variables.product.pat_generic %} for {% data variables.product.prodname_importer_proper_name %} {% data reusables.enterprise-migration-tool.creating-a-pat-steps %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/migrating-repositories-from-bitbucket-server-to-github-enterprise-cloud.md b/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/migrating-repositories-from-bitbucket-server-to-github-enterprise-cloud.md index dfec9edc3856..2ea725ae0a2a 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/migrating-repositories-from-bitbucket-server-to-github-enterprise-cloud.md +++ b/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/migrating-repositories-from-bitbucket-server-to-github-enterprise-cloud.md @@ -21,7 +21,7 @@ At this time, migrating from Bitbucket Server with the {% data variables.product ## Prerequisites {% data reusables.enterprise-migration-tool.migration-prerequisites %} -- For the destination organization on {% data variables.product.prodname_dotcom_the_website %}, you must be an organization owner or have the migrator role. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +- For the destination organization on {% data variables.product.prodname_dotcom_the_website %}, you must be an organization owner or have the migrator role. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server#about-the-migrator-role)." - You need the username and password for a Bitbucket Server account with admin or super admin permissions. ## Step 1: Install the {% data variables.product.prodname_bbs2gh_cli %} diff --git a/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/overview-of-a-migration-from-bitbucket-server-to-github-enterprise-cloud.md b/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/overview-of-a-migration-from-bitbucket-server-to-github-enterprise-cloud.md index 99ec71de010a..9eaef828ce80 100644 --- a/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/overview-of-a-migration-from-bitbucket-server-to-github-enterprise-cloud.md +++ b/content/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/overview-of-a-migration-from-bitbucket-server-to-github-enterprise-cloud.md @@ -63,7 +63,7 @@ You must also have required permissions and access to your Bitbucket Server inst - If your Bitbucket Server instance runs Windows, file sharing (SMB) access to the instance 1. Decide whether you want an organization owner of the destination organization to perform your migrations, or whether you need to grant the migrator role to someone else. -{% data reusables.enterprise-migration-tool.grant-migrator-tasks %} +{% data reusables.enterprise-migration-tool.grant-migrator-tasks %} For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server#about-the-migrator-role)." {% data reusables.enterprise-migration-tool.confirm-migrator-has-correct-pats %} For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server#required-scopes-for-personal-access-tokens)." 1. Confirm the migrator has admin or super admin permissions and SFTP access for your Bitbucket Server instance. diff --git a/content/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer.md b/content/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer.md deleted file mode 100644 index a613b4e3283c..000000000000 --- a/content/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer.md +++ /dev/null @@ -1,135 +0,0 @@ ---- -title: Granting the migrator role for GitHub Enterprise Importer -shortTitle: Grant migrator role -intro: 'To allow someone who isn''t an organization owner to run migrations, you can grant a person or team the migrator role.' -versions: - fpt: '*' - ghes: '*' - ghec: '*' -permissions: Organization owners can grant the migrator role. -defaultTool: cli -redirect_from: - - /early-access/enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer ---- - -## About the migrator role - -To remove the need for organization owners to complete migrations, {% data variables.product.prodname_dotcom_the_website %} includes a distinct role for using {% data variables.product.prodname_importer_proper_name %}. Granting the migrator role allows you to designate other teams or individuals to handle your migrations. - -You can grant the migrator role to an individual user or a team. We strongly recommend that you assign the migrator role to a team. Then, you can further customize who can run a migration by adjusting team membership. For more information about changing team membership, see "[AUTOTITLE](/organizations/organizing-members-into-teams/adding-organization-members-to-a-team)" or "[AUTOTITLE](/organizations/organizing-members-into-teams/removing-organization-members-from-a-team)." - -You can only grant the migrator role for an organization on {% data variables.product.prodname_dotcom_the_website %}. If you're migrating a repository between two organizations on {% data variables.product.prodname_dotcom_the_website %}, you can grant the migrator role to the same person or team for both organizations, but you must grant each separately. - -{% note %} - -**Note:** You cannot grant the migrator role for enterprise accounts. Therefore, you can only run an organization migration if you're an owner of the destination enterprise. However, you can grant the migrator role to that enterprise owner for the source organization. - -{% endnote %} - -After you grant the migrator role, make sure the migrator uses a {% data variables.product.pat_generic %} that meets all the requirements for running migrations. For the details of those requirements, see the appropriate article for your migration path. - -- "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops#required-scopes-for-personal-access-tokens)" -- "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server#required-scopes-for-personal-access-tokens)" -- "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#required-scopes-for-personal-access-tokens)" - -{% cli %} - -{% data reusables.enterprise-migration-tool.gei-tool-switcher-api %} - -## Granting the migrator role with the {% data variables.product.prodname_ado2gh_cli_short %} - -1. On {% data variables.product.prodname_dotcom_the_website %}, create and record a {% data variables.product.pat_generic %} that meets all the requirements for granting the migrator role. For a full list of requirements, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops#creating-a-personal-access-token-for-github)." -{% data reusables.enterprise-migration-tool.grant-migrator-role-pat %} -1. Use the `gh ado2gh grant-migrator-role` command, replacing ORGANIZATION with the organization you want to grant the migrator role for, ACTOR with the user or team name, and TYPE with `USER` or `TEAM`. - - ```shell copy - gh ado2gh grant-migrator-role --github-org ORGANIZATION --actor ACTOR --actor-type TYPE - ``` - -## Granting the migrator role with the {% data variables.product.prodname_bbs2gh_cli_short %} - -1. On {% data variables.product.prodname_dotcom_the_website %}, create and record a {% data variables.product.pat_generic %} that meets all the requirements for granting the migrator role. For a full list of requirements, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server#creating-a-personal-access-token-for-github-enterprise-importer)." -{% data reusables.enterprise-migration-tool.grant-migrator-role-pat %} -1. Use the `gh bbs2gh grant-migrator-role` command, replacing ORGANIZATION with the organization you want to grant the migrator role for, ACTOR with the user or team name, and TYPE with `USER` or `TEAM`. - - ```shell copy - gh bbs2gh grant-migrator-role --github-org ORGANIZATION --actor ACTOR --actor-type TYPE - ``` - -## Granting the migrator role with the {% data variables.product.prodname_gei_cli_short %} - -{% note %} - -**Note:** The {% data variables.product.prodname_cli %} does not support granting the migrator role for organizations on {% data variables.product.prodname_ghe_server %}, so you must be an organization owner of the source organization to migrate repositories from {% data variables.product.prodname_ghe_server %}. - -{% endnote %} - -1. On {% data variables.product.prodname_dotcom_the_website %}, create and record a {% data variables.product.pat_generic %} that meets all the requirements for granting the migrator role. For a full list of requirements, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#creating-a-personal-access-token-for-github-enterprise-importer)." -{% data reusables.enterprise-migration-tool.grant-migrator-role-pat %} -1. Use the `gh gei grant-migrator-role` command, replacing ORGANIZATION with the organization you want to grant the migrator role for, ACTOR with the user or team name, and TYPE with `USER` or `TEAM`. - - ```shell copy - gh gei grant-migrator-role --github-org ORGANIZATION --actor ACTOR --actor-type TYPE - ``` - -{% endcli %} - -{% api %} - -{% data reusables.enterprise-migration-tool.gei-tool-switcher-cli %} - -## Granting the migrator role with the GraphQL API - -You can use the `grantMigratorRole` GraphQL mutation to assign the migrator role and the `revokeMigratorRole` mutation to revoke the migrator role. - -You must use a {% data variables.product.pat_generic %} (PAT) that meets all access requirements. For more information, see the appropriate article for your migration path. - -- "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-azure-devops-to-github-enterprise-cloud/managing-access-for-a-migration-from-azure-devops#required-scopes-for-personal-access-tokens)" -- "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-from-bitbucket-server-to-github-enterprise-cloud/managing-access-for-a-migration-from-bitbucket-server#required-scopes-for-personal-access-tokens)" -- "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#required-scopes-for-personal-access-tokens)" - -### `grantMigratorRole` mutation - -This GraphQL mutation sets the migration role. - -```graphql -mutation grantMigratorRole ( - $organizationId: ID!, - $actor: String!, - $actor_type: ActorType! -) { - grantMigratorRole( input: { - organizationId: $organizationId, - actor: $actor, - actorType: $actor_type - }) - { success } -} -``` - -| Query variable | Description | -|----|----| -| `organizationId` | The `ownerId` (or organization ID) for your organization, from the `GetOrgInfo` query. -| `actor` | The team or username who you want to assign the migration role to. -| `actor_type` | Specify whether the migrator is a `USER` or `TEAM`. - -### `revokeMigratorRole` mutation - -This mutation removes the migrator role. - -```graphql -mutation revokeMigratorRole ( - $organizationId: ID!, - $actor: String!, - $actor_type: ActorType! -) { - revokeMigratorRole( input: { - organizationId: $organizationId, - actor: $actor, - actorType: $actor_type - }) - { success } -} -``` - -{% endapi %} diff --git a/content/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/index.md b/content/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/index.md index 8aa149873ad3..e60ec695c7a9 100644 --- a/content/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/index.md +++ b/content/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/index.md @@ -7,7 +7,6 @@ versions: ghes: '*' ghec: '*' children: - - /granting-the-migrator-role-for-github-enterprise-importer - /preparing-to-run-a-migration-with-github-enterprise-importer redirect_from: - /early-access/enterprise-importer/preparing-to-migrate-with-github-enterprise-importer diff --git a/data/reusables/enterprise-migration-tool/about-the-migrator-role.md b/data/reusables/enterprise-migration-tool/about-the-migrator-role.md new file mode 100644 index 000000000000..7822564a1f2e --- /dev/null +++ b/data/reusables/enterprise-migration-tool/about-the-migrator-role.md @@ -0,0 +1,7 @@ +To remove the need for organization owners to complete migrations, {% data variables.product.prodname_dotcom_the_website %} includes a distinct role for using {% data variables.product.prodname_importer_proper_name %}. Granting the migrator role allows you to designate other teams or individuals to handle your migrations. You can only grant the migrator role for an organization on {% data variables.product.prodname_dotcom_the_website %}. + +You can grant the migrator role to an individual user or a team. We strongly recommend that you assign the migrator role to a team. Then, you can further customize who can run a migration by adjusting team membership. For more information about changing team membership, see "[AUTOTITLE](/organizations/organizing-members-into-teams/adding-organization-members-to-a-team)" or "[AUTOTITLE](/organizations/organizing-members-into-teams/removing-organization-members-from-a-team)." + +To grant the migrator role, see "[Granting the migrator role](#granting-the-migrator-role)." + +After you grant the migrator role, make sure the migrator uses a {% data variables.product.pat_generic %} that meets all the requirements for running migrations. diff --git a/data/reusables/enterprise-migration-tool/grant-migrator-role-graphql.md b/data/reusables/enterprise-migration-tool/grant-migrator-role-graphql.md new file mode 100644 index 000000000000..d2b6a41bdcf0 --- /dev/null +++ b/data/reusables/enterprise-migration-tool/grant-migrator-role-graphql.md @@ -0,0 +1,47 @@ +You can use the `grantMigratorRole` GraphQL mutation to assign the migrator role and the `revokeMigratorRole` mutation to revoke the migrator role. + +You must use a {% data variables.product.pat_generic %} (PAT) that meets all access requirements. For more information, see the "[Required scopes for {% data variables.product.pat_generic %}s](#required-scopes-for-personal-access-tokens)." + +#### `grantMigratorRole` mutation + +This GraphQL mutation sets the migration role. + +```graphql +mutation grantMigratorRole ( + $organizationId: ID!, + $actor: String!, + $actor_type: ActorType! +) { + grantMigratorRole( input: { + organizationId: $organizationId, + actor: $actor, + actorType: $actor_type + }) + { success } +} +``` + +| Query variable | Description | +|----|----| +| `organizationId` | The `ownerId` (or organization ID) for your organization, from the `GetOrgInfo` query. +| `actor` | The team or username who you want to assign the migration role to. +| `actor_type` | Specify whether the migrator is a `USER` or `TEAM`. + +#### `revokeMigratorRole` mutation + +This mutation removes the migrator role. + +```graphql +mutation revokeMigratorRole ( + $organizationId: ID!, + $actor: String!, + $actor_type: ActorType! +) { + revokeMigratorRole( input: { + organizationId: $organizationId, + actor: $actor, + actorType: $actor_type + }) + { success } +} +``` diff --git a/data/reusables/enterprise-migration-tool/grant-migrator-tasks.md b/data/reusables/enterprise-migration-tool/grant-migrator-tasks.md index abf827af85b2..c0b32e58d813 100644 --- a/data/reusables/enterprise-migration-tool/grant-migrator-tasks.md +++ b/data/reusables/enterprise-migration-tool/grant-migrator-tasks.md @@ -1,2 +1,2 @@ 1. If you chose to grant the migrator role, decide which person or team you'll grant the role to. -1. Grant the migrator role to the person or team. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/granting-the-migrator-role-for-github-enterprise-importer)." +1. Grant the migrator role to the person or team. From c216f1915e6490875e4d9ff6eb87897fb559e048 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Wed, 17 Jan 2024 08:00:14 -0500 Subject: [PATCH 2/2] Delete remaining 89 mentions of 'gahe' in data/features (#48724) --- .../defining-custom-patterns-for-secret-scanning.md | 13 +++++-------- ...protection-for-repositories-and-organizations.md | 4 ++-- data/features/limit-app-access-requests.yml | 1 - data/features/limit-branches-tags-in-push.yml | 1 - data/features/link-existing-branches-to-issue.yml | 1 - data/features/lock-branch.yml | 1 - data/features/math-backtick-syntax.yml | 1 - data/features/math-fenced-blocks.yml | 1 - data/features/math.yml | 1 - data/features/mermaid.yml | 1 - data/features/motion-management.yml | 1 - data/features/nested-reusable-workflow.yml | 1 - data/features/only-notify-requested-members.yml | 1 - data/features/org-enable-code-scanning.yml | 1 - data/features/org-owners-limit-forks-creation.yml | 1 - data/features/org-profile-pin-private.yml | 1 - data/features/partial-reruns-with-reusable.yml | 1 - data/features/pat-v2-enterprise.yml | 1 - data/features/pat-v2-org-admin-api.yml | 1 - data/features/pat-v2.yml | 1 - data/features/placeholder.yml | 1 - data/features/pr-tree-view.yml | 1 - .../prevent-org-admin-add-outside-collaborator.yml | 1 - data/features/previous-release-tag.yml | 1 - data/features/private-actions.yml | 1 - data/features/profile-name-enterprise-setting.yml | 1 - data/features/profile-time-zone.yml | 1 - data/features/projects-in-issue-forms.yml | 1 - data/features/projects-v1-create-repo-project.yml | 1 - data/features/projects-v1.yml | 1 - data/features/projects-v2-column-limits.yml | 1 - .../projects-v2-org-templates-improvements.yml | 1 - data/features/projects-v2-org-templates.yml | 1 - data/features/pull-request-comment-on-file.yml | 1 - .../push-protection-custom-link-orgs-beta.yml | 1 - data/features/push-protection-custom-link-orgs.yml | 1 - data/features/query-pack-compatibility.yml | 1 - data/features/re-run-jobs.yml | 1 - data/features/read-audit-scope.yml | 1 - data/features/releases-set-latest-release.yml | 1 - .../remove-code-scanning-configurations.yml | 1 - data/features/rename-and-transfer-repository.yml | 1 - data/features/reopen-dependabot-alerts.yml | 1 - .../repositories-forks-page-improvement.yml | 1 - data/features/repository-activity-view.yml | 1 - data/features/required-deployments.yml | 1 - data/features/rest-permissions-header.yml | 1 - data/features/restrict-groups-to-workflows.yml | 1 - data/features/restrict-pushes-create-branch.yml | 1 - data/features/secret-scanning-alert-audit-log.yml | 1 - .../secret-scanning-audit-log-custom-patterns.yml | 1 - data/features/secret-scanning-backfill-email.yml | 1 - data/features/secret-scanning-backfills.yml | 1 - .../secret-scanning-custom-enterprise-35.yml | 6 ------ .../secret-scanning-custom-enterprise-36.yml | 6 ------ .../secret-scanning-custom-link-on-block.yml | 1 - ...canning-custom-pattern-push-protection-audit.yml | 1 - data/features/secret-scanning-dismissal-comment.yml | 1 - .../secret-scanning-enterprise-level-api.yml | 1 - data/features/secret-scanning-enterprise-level.yml | 1 - .../secret-scanning-notification-settings.yml | 1 - ...ecret-scanning-partner-documentation-link-UI.yml | 1 - .../secret-scanning-push-protection-bypasses.yml | 1 - ...ret-scanning-push-protection-custom-patterns.yml | 1 - .../secret-scanning-push-protection-email.yml | 1 - .../secret-scanning-push-protection-web-ui.yml | 1 - data/features/secret-scanning-push-protection.yml | 1 - data/features/secret-scanning-validity-check.yml | 1 - data/features/security-advisories-ghes-ghae.yml | 1 - .../security-advisories-reason-for-change.yml | 1 - ...urity-feature-enablement-policies-dependabot.yml | 1 - .../security-feature-enablement-policies.yml | 1 - data/features/security-managers.yml | 1 - data/features/security-overview-acv-filters.yml | 1 - data/features/security-overview-alert-views.yml | 1 - data/features/security-overview-dependabot-acv.yml | 1 - .../features/security-overview-displayed-alerts.yml | 1 - ...ecurity-overview-feature-specific-alert-page.yml | 1 - .../security-overview-org-risk-coverage.yml | 1 - .../security-overview-team-write-access.yml | 1 - data/features/ssh-cert-policy-allow-u2s-tokens.yml | 1 - data/features/ssh-commit-verification.yml | 1 - data/features/streaming-datadog.yml | 1 - data/features/syncing-fork-web-ui.yml | 1 - data/features/target-runner-groups.yml | 1 - data/features/task-lists-v1.yml | 1 - data/features/team-discussions.yml | 1 - data/features/token-audit-log.yml | 1 - data/features/upload-expired-or-revoked-gpg-key.yml | 1 - data/features/viewscreen-and-notebooks.yml | 1 - data/features/workflow-nav-2022.yml | 1 - src/content-render/tests/liquid.js | 12 ------------ src/frame/tests/page.js | 1 - 93 files changed, 7 insertions(+), 122 deletions(-) delete mode 100644 data/features/secret-scanning-custom-enterprise-35.yml delete mode 100644 data/features/secret-scanning-custom-enterprise-36.yml diff --git a/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md b/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md index 1687a4de48f4..3a18237d18b3 100644 --- a/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md +++ b/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md @@ -59,10 +59,9 @@ Before defining a custom pattern, you must ensure that {% data variables.product {% data reusables.repositories.navigate-to-code-security-and-analysis %} {% data reusables.repositories.navigate-to-ghas-settings %} {% data reusables.advanced-security.secret-scanning-new-custom-pattern %} -{% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %}{% ifversion secret-scanning-custom-enterprise-35 or custom-pattern-dry-run-ga %} +{% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %}{% ifversion custom-pattern-dry-run-ga %} 1. When you're ready to test your new custom pattern, to identify matches in the repository without creating alerts, click **Save and dry run**. {% data reusables.advanced-security.secret-scanning-dry-run-results %} -{%- ifversion secret-scanning-custom-enterprise-35 %}{% indented_data_reference reusables.secret-scanning.beta-dry-runs spaces=3 %}{% endif %} {% endif %} {% data reusables.advanced-security.secret-scanning-create-custom-pattern %}{% ifversion secret-scanning-push-protection-custom-patterns %} 1. Optionally, to enable push protection for your custom pattern, click **Enable**. @@ -125,11 +124,10 @@ Before defining a custom pattern, you must ensure that you enable {% data variab {% data reusables.repositories.navigate-to-ghas-settings %} {% data reusables.advanced-security.secret-scanning-new-custom-pattern %} {% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %} -{%- ifversion secret-scanning-custom-enterprise-35 or custom-pattern-dry-run-ga %} +{%- ifversion custom-pattern-dry-run-ga %} 1. When you're ready to test your new custom pattern, to identify matches in select repositories without creating alerts, click **Save and dry run**. {% data reusables.advanced-security.secret-scanning-dry-run-select-repos %} {% data reusables.advanced-security.secret-scanning-dry-run-results %} -{%- ifversion secret-scanning-custom-enterprise-35 %}{% indented_data_reference reusables.secret-scanning.beta-dry-runs spaces=3 %}{% endif %} {%- endif %} {% data reusables.advanced-security.secret-scanning-create-custom-pattern %}{% ifversion secret-scanning-push-protection-custom-patterns %} 1. Optionally, to enable push protection for your custom pattern, click **Enable**. For more information, see "[AUTOTITLE](/code-security/secret-scanning/protecting-pushes-with-secret-scanning#enabling-secret-scanning-as-a-push-protection-in-an-organization-for-a-custom-pattern)." @@ -148,7 +146,7 @@ Before defining a custom pattern, you must ensure that you enable secret scannin {% note %} -{% ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga %} +{% ifversion custom-pattern-dry-run-ga %} **Notes:** - At the enterprise level, only the creator of a custom pattern can edit the pattern, and use it in a dry run. - {% data reusables.secret-scanning.dry-runs-enterprise-permissions %} @@ -167,11 +165,10 @@ Before defining a custom pattern, you must ensure that you enable secret scannin {% data reusables.enterprise-accounts.advanced-security-security-features %}{% endif %} 1. Under "Secret scanning custom patterns", click **New pattern**. {% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %} -{%- ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga %} +{%- ifversion custom-pattern-dry-run-ga %} 1. When you're ready to test your new custom pattern, to identify matches in the enterprise without creating alerts, click **Save and dry run**. {% data reusables.advanced-security.secret-scanning-dry-run-select-enterprise-repos %} {% data reusables.advanced-security.secret-scanning-dry-run-results %} -{%- ifversion secret-scanning-custom-enterprise-36 %}{% indented_data_reference reusables.secret-scanning.beta-dry-runs spaces=3 %}{% endif %} {%- endif %} {% data reusables.advanced-security.secret-scanning-create-custom-pattern %}{% ifversion secret-scanning-push-protection-custom-patterns %} 1. Optionally, to enable push protection for your custom pattern, click **Enable**. For more information, see "[AUTOTITLE](/code-security/secret-scanning/protecting-pushes-with-secret-scanning)." @@ -184,7 +181,7 @@ After your pattern is created, {% data variables.product.prodname_secret_scannin When you save a change to a custom pattern, this closes all the {% data variables.secret-scanning.alerts %} that were created using the previous version of the pattern. {% data reusables.secret-scanning.view-custom-pattern %} 1. Under "{% data variables.product.prodname_secret_scanning_caps %}", to the right of the custom pattern you want to edit, click {% octicon "pencil" aria-label="Edit pattern" %}. -{%- ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga %} +{%- ifversion custom-pattern-dry-run-ga %} 1. When you're ready to test your edited custom pattern, to identify matches without creating alerts, click **Save and dry run**. {%- endif %} 1. When you have reviewed and tested your changes, click **Publish changes**.{% ifversion secret-scanning-push-protection-custom-patterns %} diff --git a/content/code-security/secret-scanning/push-protection-for-repositories-and-organizations.md b/content/code-security/secret-scanning/push-protection-for-repositories-and-organizations.md index 704272a84780..5750eeb11a43 100644 --- a/content/code-security/secret-scanning/push-protection-for-repositories-and-organizations.md +++ b/content/code-security/secret-scanning/push-protection-for-repositories-and-organizations.md @@ -121,7 +121,7 @@ You can enable {% data variables.product.prodname_secret_scanning %} as a push p {% data reusables.secret-scanning.push-protection-enterprise-note %} -Before enabling push protection for a custom pattern at enterprise level, you must also{% ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga %} test your custom patterns using dry runs. {% data reusables.secret-scanning.dry-runs-enterprise-permissions %}{% else %} test your custom patterns in a repository before defining them for your entire enterprise, as there is no dry-run functionality. That way, you can avoid creating excess false-positive {% data variables.secret-scanning.alerts %}.{% endif %} +Before enabling push protection for a custom pattern at enterprise level, you must also{% ifversion custom-pattern-dry-run-ga %} test your custom patterns using dry runs. {% data reusables.secret-scanning.dry-runs-enterprise-permissions %}{% else %} test your custom patterns in a repository before defining them for your entire enterprise, as there is no dry-run functionality. That way, you can avoid creating excess false-positive {% data variables.secret-scanning.alerts %}.{% endif %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %}{% ifversion security-feature-enablement-policies %} @@ -130,7 +130,7 @@ Before enabling push protection for a custom pattern at enterprise level, you mu {% data reusables.enterprise-accounts.advanced-security-policies %} {% data reusables.enterprise-accounts.advanced-security-security-features %}{% endif %} {% data reusables.advanced-security.secret-scanning-edit-custom-pattern %} -{% ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga %} +{% ifversion custom-pattern-dry-run-ga %} {% note %} **Note**: At the enterprise level, you can only edit and enable push protection for custom patterns that you created. diff --git a/data/features/limit-app-access-requests.yml b/data/features/limit-app-access-requests.yml index 28248b9a18f2..01e1254c54f9 100644 --- a/data/features/limit-app-access-requests.yml +++ b/data/features/limit-app-access-requests.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.8' - ghae: '>=3.8' diff --git a/data/features/limit-branches-tags-in-push.yml b/data/features/limit-branches-tags-in-push.yml index 998ff001cac5..5003edfa4ae5 100644 --- a/data/features/limit-branches-tags-in-push.yml +++ b/data/features/limit-branches-tags-in-push.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>=3.7' diff --git a/data/features/link-existing-branches-to-issue.yml b/data/features/link-existing-branches-to-issue.yml index fc3fb4d7d1ab..15175443ec63 100644 --- a/data/features/link-existing-branches-to-issue.yml +++ b/data/features/link-existing-branches-to-issue.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>= 3.7' diff --git a/data/features/lock-branch.yml b/data/features/lock-branch.yml index d2e92315f6b3..9e300a72b40e 100644 --- a/data/features/lock-branch.yml +++ b/data/features/lock-branch.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.8' - ghae: '>= 3.8' diff --git a/data/features/math-backtick-syntax.yml b/data/features/math-backtick-syntax.yml index 220d2e7709ff..b082abc0da13 100644 --- a/data/features/math-backtick-syntax.yml +++ b/data/features/math-backtick-syntax.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>3.9' - ghae: '>3.9' diff --git a/data/features/math-fenced-blocks.yml b/data/features/math-fenced-blocks.yml index 1561bf80aaa2..af1d710cd7e6 100644 --- a/data/features/math-fenced-blocks.yml +++ b/data/features/math-fenced-blocks.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.8' - ghae: '>= 3.8' diff --git a/data/features/math.yml b/data/features/math.yml index 3b39b39aecb8..8b30869da581 100644 --- a/data/features/math.yml +++ b/data/features/math.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/mermaid.yml b/data/features/mermaid.yml index 2ecb5f087ab6..f197c420283a 100644 --- a/data/features/mermaid.yml +++ b/data/features/mermaid.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>= 3.7' diff --git a/data/features/motion-management.yml b/data/features/motion-management.yml index 1ca0cc5f2c97..e27221d20e96 100644 --- a/data/features/motion-management.yml +++ b/data/features/motion-management.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/nested-reusable-workflow.yml b/data/features/nested-reusable-workflow.yml index 11d6587fb002..8af1aa71a499 100644 --- a/data/features/nested-reusable-workflow.yml +++ b/data/features/nested-reusable-workflow.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>= 3.7' diff --git a/data/features/only-notify-requested-members.yml b/data/features/only-notify-requested-members.yml index 2b9ca93c2ee1..e109b98fa1dc 100644 --- a/data/features/only-notify-requested-members.yml +++ b/data/features/only-notify-requested-members.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.4' - ghae: '>= 3.4' diff --git a/data/features/org-enable-code-scanning.yml b/data/features/org-enable-code-scanning.yml index 016897aaa341..43d0b27c7030 100644 --- a/data/features/org-enable-code-scanning.yml +++ b/data/features/org-enable-code-scanning.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>3.8' - ghae: '>3.8' diff --git a/data/features/org-owners-limit-forks-creation.yml b/data/features/org-owners-limit-forks-creation.yml index 7705caa038c9..53314e30a088 100644 --- a/data/features/org-owners-limit-forks-creation.yml +++ b/data/features/org-owners-limit-forks-creation.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.8' - ghae: '>=3.8' diff --git a/data/features/org-profile-pin-private.yml b/data/features/org-profile-pin-private.yml index b2119590ad34..b7efaaf002dc 100644 --- a/data/features/org-profile-pin-private.yml +++ b/data/features/org-profile-pin-private.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/partial-reruns-with-reusable.yml b/data/features/partial-reruns-with-reusable.yml index c0854e2f80a8..202b63d4d7f1 100644 --- a/data/features/partial-reruns-with-reusable.yml +++ b/data/features/partial-reruns-with-reusable.yml @@ -3,4 +3,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.5' - ghae: '>= 3.5' diff --git a/data/features/pat-v2-enterprise.yml b/data/features/pat-v2-enterprise.yml index fcaf66a795d7..126b6b907b2d 100644 --- a/data/features/pat-v2-enterprise.yml +++ b/data/features/pat-v2-enterprise.yml @@ -4,4 +4,3 @@ versions: ghec: '*' ghes: '>=3.10' - ghae: '>=3.10' diff --git a/data/features/pat-v2-org-admin-api.yml b/data/features/pat-v2-org-admin-api.yml index f02d958d5569..5f92ddc6c77e 100644 --- a/data/features/pat-v2-org-admin-api.yml +++ b/data/features/pat-v2-org-admin-api.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.10' - ghae: '>=3.10' diff --git a/data/features/pat-v2.yml b/data/features/pat-v2.yml index 123608badb45..9cdd5f6d19bd 100644 --- a/data/features/pat-v2.yml +++ b/data/features/pat-v2.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.10' - ghae: '>=3.10' diff --git a/data/features/placeholder.yml b/data/features/placeholder.yml index 17ea1d65740f..b00dd0d29f4f 100644 --- a/data/features/placeholder.yml +++ b/data/features/placeholder.yml @@ -2,4 +2,3 @@ versions: ghes: '>3.0' ghec: '*' - ghae: '*' diff --git a/data/features/pr-tree-view.yml b/data/features/pr-tree-view.yml index 46d7f368c75c..3fe48f5144db 100644 --- a/data/features/pr-tree-view.yml +++ b/data/features/pr-tree-view.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/prevent-org-admin-add-outside-collaborator.yml b/data/features/prevent-org-admin-add-outside-collaborator.yml index 69d5ccc4810b..6f04314a5011 100644 --- a/data/features/prevent-org-admin-add-outside-collaborator.yml +++ b/data/features/prevent-org-admin-add-outside-collaborator.yml @@ -1,4 +1,3 @@ versions: ghec: '*' ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/previous-release-tag.yml b/data/features/previous-release-tag.yml index 5da10930725b..9a60f5a14dcb 100644 --- a/data/features/previous-release-tag.yml +++ b/data/features/previous-release-tag.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/private-actions.yml b/data/features/private-actions.yml index efcdf7398b59..886af11aee01 100644 --- a/data/features/private-actions.yml +++ b/data/features/private-actions.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.8' - ghae: '>=3.8' diff --git a/data/features/profile-name-enterprise-setting.yml b/data/features/profile-name-enterprise-setting.yml index c2bcd46198fd..fd6c1531e51c 100644 --- a/data/features/profile-name-enterprise-setting.yml +++ b/data/features/profile-name-enterprise-setting.yml @@ -1,4 +1,3 @@ # Reference: Issue #6996 ability to show users' first/last name instead of username in issue/PR comment titles for public and internal repos versions: ghes: '>=3.6' - ghae: '>=3.6' diff --git a/data/features/profile-time-zone.yml b/data/features/profile-time-zone.yml index 069f139458a6..e57535a55ac5 100644 --- a/data/features/profile-time-zone.yml +++ b/data/features/profile-time-zone.yml @@ -2,4 +2,3 @@ versions: fpt: '*' ghec: '*' ghes: '>3.7' - ghae: '>3.7' diff --git a/data/features/projects-in-issue-forms.yml b/data/features/projects-in-issue-forms.yml index 27bac8a18071..e37d245bf815 100644 --- a/data/features/projects-in-issue-forms.yml +++ b/data/features/projects-in-issue-forms.yml @@ -3,4 +3,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.11' - ghae: '>=3.11' diff --git a/data/features/projects-v1-create-repo-project.yml b/data/features/projects-v1-create-repo-project.yml index 272cbe1da080..d095bd44f449 100644 --- a/data/features/projects-v1-create-repo-project.yml +++ b/data/features/projects-v1-create-repo-project.yml @@ -1,4 +1,3 @@ # Ability to create new repository level classic projects versions: ghes: '*' - ghae: '*' diff --git a/data/features/projects-v1.yml b/data/features/projects-v1.yml index c217fc003d65..b39cb4732cc0 100644 --- a/data/features/projects-v1.yml +++ b/data/features/projects-v1.yml @@ -5,4 +5,3 @@ versions: fpt: '*' ghec: '*' ghes: '*' - ghae: '*' diff --git a/data/features/projects-v2-column-limits.yml b/data/features/projects-v2-column-limits.yml index e9f42696382a..0c6c4db47e13 100644 --- a/data/features/projects-v2-column-limits.yml +++ b/data/features/projects-v2-column-limits.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.10' - ghae: '>=3.10' diff --git a/data/features/projects-v2-org-templates-improvements.yml b/data/features/projects-v2-org-templates-improvements.yml index 958fc4960c2d..3f12f4706f41 100644 --- a/data/features/projects-v2-org-templates-improvements.yml +++ b/data/features/projects-v2-org-templates-improvements.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.11' - ghae: '>=3.11' diff --git a/data/features/projects-v2-org-templates.yml b/data/features/projects-v2-org-templates.yml index 991763ff55c7..73b43c3dc919 100644 --- a/data/features/projects-v2-org-templates.yml +++ b/data/features/projects-v2-org-templates.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.10' - ghae: '>=3.10' diff --git a/data/features/pull-request-comment-on-file.yml b/data/features/pull-request-comment-on-file.yml index 918a24f61045..7a401346df8e 100644 --- a/data/features/pull-request-comment-on-file.yml +++ b/data/features/pull-request-comment-on-file.yml @@ -3,4 +3,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.9' - ghae: '>= 3.9' diff --git a/data/features/push-protection-custom-link-orgs-beta.yml b/data/features/push-protection-custom-link-orgs-beta.yml index 6e7e793c9031..5f8dc4ec170c 100644 --- a/data/features/push-protection-custom-link-orgs-beta.yml +++ b/data/features/push-protection-custom-link-orgs-beta.yml @@ -5,4 +5,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>= 3.7' diff --git a/data/features/push-protection-custom-link-orgs.yml b/data/features/push-protection-custom-link-orgs.yml index 79fffc5cffb1..82b9ce2f42ce 100644 --- a/data/features/push-protection-custom-link-orgs.yml +++ b/data/features/push-protection-custom-link-orgs.yml @@ -5,4 +5,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>= 3.7' diff --git a/data/features/query-pack-compatibility.yml b/data/features/query-pack-compatibility.yml index 776f7ddb22c2..14213cf01b6e 100644 --- a/data/features/query-pack-compatibility.yml +++ b/data/features/query-pack-compatibility.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.9' - ghae: '>=3.9' diff --git a/data/features/re-run-jobs.yml b/data/features/re-run-jobs.yml index 99072497b563..30aa1ffcf6b0 100644 --- a/data/features/re-run-jobs.yml +++ b/data/features/re-run-jobs.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.5' - ghae: '>= 3.5' diff --git a/data/features/read-audit-scope.yml b/data/features/read-audit-scope.yml index fc50915e91bb..b9716e669254 100644 --- a/data/features/read-audit-scope.yml +++ b/data/features/read-audit-scope.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.8' - ghae: '>= 3.8' diff --git a/data/features/releases-set-latest-release.yml b/data/features/releases-set-latest-release.yml index 352447f4f576..7a2741afaeb5 100644 --- a/data/features/releases-set-latest-release.yml +++ b/data/features/releases-set-latest-release.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.8' - ghae: '>= 3.8' diff --git a/data/features/remove-code-scanning-configurations.yml b/data/features/remove-code-scanning-configurations.yml index 6e07097998f8..e15a5095508d 100644 --- a/data/features/remove-code-scanning-configurations.yml +++ b/data/features/remove-code-scanning-configurations.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>3.8' - ghae: '>3.8' diff --git a/data/features/rename-and-transfer-repository.yml b/data/features/rename-and-transfer-repository.yml index 9a84d971c0eb..f8f97160d57a 100644 --- a/data/features/rename-and-transfer-repository.yml +++ b/data/features/rename-and-transfer-repository.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.9' - ghae: '>=3.9' diff --git a/data/features/reopen-dependabot-alerts.yml b/data/features/reopen-dependabot-alerts.yml index 39093360fb7d..65b41ef09704 100644 --- a/data/features/reopen-dependabot-alerts.yml +++ b/data/features/reopen-dependabot-alerts.yml @@ -3,4 +3,3 @@ versions: fpt: '*' ghec: '*' ghes: '>3.4' - ghae: '>= 3.5' diff --git a/data/features/repositories-forks-page-improvement.yml b/data/features/repositories-forks-page-improvement.yml index 4db1e199fc7c..a4d740d5c68f 100644 --- a/data/features/repositories-forks-page-improvement.yml +++ b/data/features/repositories-forks-page-improvement.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>= 3.9' - ghae: '>= 3.9' diff --git a/data/features/repository-activity-view.yml b/data/features/repository-activity-view.yml index 38dd0a9cdc2d..90a936416f69 100644 --- a/data/features/repository-activity-view.yml +++ b/data/features/repository-activity-view.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>= 3.11' - ghae: '> 3.9' diff --git a/data/features/required-deployments.yml b/data/features/required-deployments.yml index f6cbe5be0cd7..358dca6ccdba 100644 --- a/data/features/required-deployments.yml +++ b/data/features/required-deployments.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.5' - ghae: '>= 3.6' diff --git a/data/features/rest-permissions-header.yml b/data/features/rest-permissions-header.yml index fadf54092e20..f175c008da36 100644 --- a/data/features/rest-permissions-header.yml +++ b/data/features/rest-permissions-header.yml @@ -3,4 +3,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.11' - ghae: '>=3.11' diff --git a/data/features/restrict-groups-to-workflows.yml b/data/features/restrict-groups-to-workflows.yml index e2a626caf870..fb6251221df9 100644 --- a/data/features/restrict-groups-to-workflows.yml +++ b/data/features/restrict-groups-to-workflows.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.5' - ghae: '>= 3.5' diff --git a/data/features/restrict-pushes-create-branch.yml b/data/features/restrict-pushes-create-branch.yml index ee53e390230b..bfdc7e9cfba0 100644 --- a/data/features/restrict-pushes-create-branch.yml +++ b/data/features/restrict-pushes-create-branch.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>=3.7' diff --git a/data/features/secret-scanning-alert-audit-log.yml b/data/features/secret-scanning-alert-audit-log.yml index 8d08d08af1fa..207f3bab9162 100644 --- a/data/features/secret-scanning-alert-audit-log.yml +++ b/data/features/secret-scanning-alert-audit-log.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/secret-scanning-audit-log-custom-patterns.yml b/data/features/secret-scanning-audit-log-custom-patterns.yml index d370262d1927..03cbe5433581 100644 --- a/data/features/secret-scanning-audit-log-custom-patterns.yml +++ b/data/features/secret-scanning-audit-log-custom-patterns.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.5' - ghae: '>= 3.5' diff --git a/data/features/secret-scanning-backfill-email.yml b/data/features/secret-scanning-backfill-email.yml index b81090cb70db..d4d1ba216eb9 100644 --- a/data/features/secret-scanning-backfill-email.yml +++ b/data/features/secret-scanning-backfill-email.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.10' - ghae: '>=3.10' diff --git a/data/features/secret-scanning-backfills.yml b/data/features/secret-scanning-backfills.yml index f48e487c8ece..899222fcef9d 100644 --- a/data/features/secret-scanning-backfills.yml +++ b/data/features/secret-scanning-backfills.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.8' - ghae: '>= 3.8' diff --git a/data/features/secret-scanning-custom-enterprise-35.yml b/data/features/secret-scanning-custom-enterprise-35.yml deleted file mode 100644 index 401673791cc9..000000000000 --- a/data/features/secret-scanning-custom-enterprise-35.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Issues: changes to custom patterns for secret scanning -# #6367: updates for the "organization level dry runs (Public Beta)" -# #5499: updates for the "repository level dry runs (Public Beta)" -versions: - ghes: '>3.4 <3.7' - ghae: '>= 3.5' diff --git a/data/features/secret-scanning-custom-enterprise-36.yml b/data/features/secret-scanning-custom-enterprise-36.yml deleted file mode 100644 index aac8ede19297..000000000000 --- a/data/features/secret-scanning-custom-enterprise-36.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Issues: changes to custom patterns for secret scanning -# #6904: updates for "enterprise account level dry runs (Public Beta)" -# #7297: updates for dry runs on editing patterns (Public Beta) -versions: - ghes: '>3.5 <3.7' - ghae: '>= 3.6' diff --git a/data/features/secret-scanning-custom-link-on-block.yml b/data/features/secret-scanning-custom-link-on-block.yml index b72b50676ffd..7f0a595d72e1 100644 --- a/data/features/secret-scanning-custom-link-on-block.yml +++ b/data/features/secret-scanning-custom-link-on-block.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.8' - ghae: '>=3.8' diff --git a/data/features/secret-scanning-custom-pattern-push-protection-audit.yml b/data/features/secret-scanning-custom-pattern-push-protection-audit.yml index c32a9314d743..7aac4cc463e8 100644 --- a/data/features/secret-scanning-custom-pattern-push-protection-audit.yml +++ b/data/features/secret-scanning-custom-pattern-push-protection-audit.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '> 3.8' - ghae: '> 3.8' diff --git a/data/features/secret-scanning-dismissal-comment.yml b/data/features/secret-scanning-dismissal-comment.yml index d19884102a21..8dce53006c7f 100644 --- a/data/features/secret-scanning-dismissal-comment.yml +++ b/data/features/secret-scanning-dismissal-comment.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.8' - ghae: '>=3.8' diff --git a/data/features/secret-scanning-enterprise-level-api.yml b/data/features/secret-scanning-enterprise-level-api.yml index 1b32a42a101b..6bb159d563c7 100644 --- a/data/features/secret-scanning-enterprise-level-api.yml +++ b/data/features/secret-scanning-enterprise-level-api.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.8' - ghae: '>=3.8' diff --git a/data/features/secret-scanning-enterprise-level.yml b/data/features/secret-scanning-enterprise-level.yml index e95d04f55c97..d5ed29691322 100644 --- a/data/features/secret-scanning-enterprise-level.yml +++ b/data/features/secret-scanning-enterprise-level.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.7' - ghae: '>=3.7' diff --git a/data/features/secret-scanning-notification-settings.yml b/data/features/secret-scanning-notification-settings.yml index 3ee3af06b793..67f94852e4b5 100644 --- a/data/features/secret-scanning-notification-settings.yml +++ b/data/features/secret-scanning-notification-settings.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>= 3.9' - ghae: '>= 3.9' diff --git a/data/features/secret-scanning-partner-documentation-link-UI.yml b/data/features/secret-scanning-partner-documentation-link-UI.yml index 938bab399b15..4cc5866bb24a 100644 --- a/data/features/secret-scanning-partner-documentation-link-UI.yml +++ b/data/features/secret-scanning-partner-documentation-link-UI.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>= 3.8' - ghae: '>= 3.8' diff --git a/data/features/secret-scanning-push-protection-bypasses.yml b/data/features/secret-scanning-push-protection-bypasses.yml index 9330b1da7823..983e37865c5f 100644 --- a/data/features/secret-scanning-push-protection-bypasses.yml +++ b/data/features/secret-scanning-push-protection-bypasses.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/secret-scanning-push-protection-custom-patterns.yml b/data/features/secret-scanning-push-protection-custom-patterns.yml index 04fbcf5673c1..c195ce010259 100644 --- a/data/features/secret-scanning-push-protection-custom-patterns.yml +++ b/data/features/secret-scanning-push-protection-custom-patterns.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.9' - ghae: '>=3.9' diff --git a/data/features/secret-scanning-push-protection-email.yml b/data/features/secret-scanning-push-protection-email.yml index d97fb0fd88cf..0642bccdfa88 100644 --- a/data/features/secret-scanning-push-protection-email.yml +++ b/data/features/secret-scanning-push-protection-email.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>= 3.7' diff --git a/data/features/secret-scanning-push-protection-web-ui.yml b/data/features/secret-scanning-push-protection-web-ui.yml index ebc3a7305a23..e3f96a9aa4cb 100644 --- a/data/features/secret-scanning-push-protection-web-ui.yml +++ b/data/features/secret-scanning-push-protection-web-ui.yml @@ -3,5 +3,4 @@ versions: fpt: '*' ghes: '>=3.6' - ghae: '>= 3.6' ghec: '*' diff --git a/data/features/secret-scanning-push-protection.yml b/data/features/secret-scanning-push-protection.yml index 2c2a94845e47..64104cda0543 100644 --- a/data/features/secret-scanning-push-protection.yml +++ b/data/features/secret-scanning-push-protection.yml @@ -3,5 +3,4 @@ versions: fpt: '*' ghes: '>=3.5' - ghae: '>= 3.5' ghec: '*' diff --git a/data/features/secret-scanning-validity-check.yml b/data/features/secret-scanning-validity-check.yml index 521a507c7413..b4352e28405e 100644 --- a/data/features/secret-scanning-validity-check.yml +++ b/data/features/secret-scanning-validity-check.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.9' - ghae: '>=3.9' diff --git a/data/features/security-advisories-ghes-ghae.yml b/data/features/security-advisories-ghes-ghae.yml index 00e84b7e7464..5e11cfbcd4a5 100644 --- a/data/features/security-advisories-ghes-ghae.yml +++ b/data/features/security-advisories-ghes-ghae.yml @@ -1,4 +1,3 @@ # Reference: Issue #6982 Community Contributions to Security Advisories - Enterprise 3.6 versions: ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/security-advisories-reason-for-change.yml b/data/features/security-advisories-reason-for-change.yml index b5a28f9147bd..af1bb4d8d3fd 100644 --- a/data/features/security-advisories-reason-for-change.yml +++ b/data/features/security-advisories-reason-for-change.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.8' - ghae: '>= 3.8' diff --git a/data/features/security-feature-enablement-policies-dependabot.yml b/data/features/security-feature-enablement-policies-dependabot.yml index 7b22f651677d..8695549ceb26 100644 --- a/data/features/security-feature-enablement-policies-dependabot.yml +++ b/data/features/security-feature-enablement-policies-dependabot.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.9' - ghae: '>=3.9' diff --git a/data/features/security-feature-enablement-policies.yml b/data/features/security-feature-enablement-policies.yml index 665a1585c456..3cb9e54585c9 100644 --- a/data/features/security-feature-enablement-policies.yml +++ b/data/features/security-feature-enablement-policies.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.8' - ghae: '>=3.8' diff --git a/data/features/security-managers.yml b/data/features/security-managers.yml index 689f14c09047..75d194541d16 100644 --- a/data/features/security-managers.yml +++ b/data/features/security-managers.yml @@ -3,5 +3,4 @@ versions: fpt: '*' ghes: '>=3.3' - ghae: '*' ghec: '*' diff --git a/data/features/security-overview-acv-filters.yml b/data/features/security-overview-acv-filters.yml index f0bdd7eaebfc..a6eaadf774f1 100644 --- a/data/features/security-overview-acv-filters.yml +++ b/data/features/security-overview-acv-filters.yml @@ -2,5 +2,4 @@ # Documentation for the addition of repo topic and team filters to the alert-centric views (Dependabot, code scanning, and secret scanning) of the security overview versions: ghes: '>3.8' - ghae: '>3.8' ghec: '*' diff --git a/data/features/security-overview-alert-views.yml b/data/features/security-overview-alert-views.yml index 0152f69fb23a..c4033bc8082c 100644 --- a/data/features/security-overview-alert-views.yml +++ b/data/features/security-overview-alert-views.yml @@ -2,5 +2,4 @@ # Documentation for security overview individual views for each type of security alert versions: ghes: '> 3.4' - ghae: '>= 3.5' ghec: '*' diff --git a/data/features/security-overview-dependabot-acv.yml b/data/features/security-overview-dependabot-acv.yml index e0ad3c14cd8f..dd8d9798a2a3 100644 --- a/data/features/security-overview-dependabot-acv.yml +++ b/data/features/security-overview-dependabot-acv.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '> 3.3' - ghae: '> 3.3' diff --git a/data/features/security-overview-displayed-alerts.yml b/data/features/security-overview-displayed-alerts.yml index 9e11931fff54..4d5f791fff8e 100644 --- a/data/features/security-overview-displayed-alerts.yml +++ b/data/features/security-overview-displayed-alerts.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>=3.7' - ghae: '>= 3.7' diff --git a/data/features/security-overview-feature-specific-alert-page.yml b/data/features/security-overview-feature-specific-alert-page.yml index 5e57e7ec5a8e..68f589e9ef4d 100644 --- a/data/features/security-overview-feature-specific-alert-page.yml +++ b/data/features/security-overview-feature-specific-alert-page.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>= 3.7' - ghae: '>= 3.7' diff --git a/data/features/security-overview-org-risk-coverage.yml b/data/features/security-overview-org-risk-coverage.yml index 544b685f1118..9d2bd936cf5f 100644 --- a/data/features/security-overview-org-risk-coverage.yml +++ b/data/features/security-overview-org-risk-coverage.yml @@ -3,5 +3,4 @@ # and the initial single-repo enablement panel for security overview coverage view. versions: ghes: '> 3.7' - ghae: '> 3.7' ghec: '*' diff --git a/data/features/security-overview-team-write-access.yml b/data/features/security-overview-team-write-access.yml index 6563e7012aed..01b8299bcc20 100644 --- a/data/features/security-overview-team-write-access.yml +++ b/data/features/security-overview-team-write-access.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '> 3.8' - ghae: '> 3.8' diff --git a/data/features/ssh-cert-policy-allow-u2s-tokens.yml b/data/features/ssh-cert-policy-allow-u2s-tokens.yml index f4561078b0b4..351970633f1b 100644 --- a/data/features/ssh-cert-policy-allow-u2s-tokens.yml +++ b/data/features/ssh-cert-policy-allow-u2s-tokens.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>= 3.9' - ghae: '>= 3.9' diff --git a/data/features/ssh-commit-verification.yml b/data/features/ssh-commit-verification.yml index 8f6b3ca72475..904828c81580 100644 --- a/data/features/ssh-commit-verification.yml +++ b/data/features/ssh-commit-verification.yml @@ -5,4 +5,3 @@ versions: fpt: '*' ghec: '*' ghes: '>= 3.7' - ghae: '>= 3.7' diff --git a/data/features/streaming-datadog.yml b/data/features/streaming-datadog.yml index f977faf40e30..b984956e6f30 100644 --- a/data/features/streaming-datadog.yml +++ b/data/features/streaming-datadog.yml @@ -3,4 +3,3 @@ versions: ghec: '*' ghes: '>= 3.8' - ghae: '>= 3.8' diff --git a/data/features/syncing-fork-web-ui.yml b/data/features/syncing-fork-web-ui.yml index 56f8f303fd64..f28f9c284def 100644 --- a/data/features/syncing-fork-web-ui.yml +++ b/data/features/syncing-fork-web-ui.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>= 3.7' diff --git a/data/features/target-runner-groups.yml b/data/features/target-runner-groups.yml index 1605cf958b53..3b9eaeeb7d40 100644 --- a/data/features/target-runner-groups.yml +++ b/data/features/target-runner-groups.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>= 3.8' - ghae: '>= 3.8' diff --git a/data/features/task-lists-v1.yml b/data/features/task-lists-v1.yml index bf5b2fc85b2a..b3a5c2584ecc 100644 --- a/data/features/task-lists-v1.yml +++ b/data/features/task-lists-v1.yml @@ -3,4 +3,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.9' - ghae: '>=3.9' diff --git a/data/features/team-discussions.yml b/data/features/team-discussions.yml index de8350064ba5..e806eec45691 100644 --- a/data/features/team-discussions.yml +++ b/data/features/team-discussions.yml @@ -2,4 +2,3 @@ # Versions for which team discussions is still supported (deprecated for all other versions) versions: ghes: '<3.12' - ghae: '*' diff --git a/data/features/token-audit-log.yml b/data/features/token-audit-log.yml index 70c216ad0076..55c463eb17d9 100644 --- a/data/features/token-audit-log.yml +++ b/data/features/token-audit-log.yml @@ -1,4 +1,3 @@ versions: ghec: '*' ghes: '>3.7' - ghae: '>3.7' diff --git a/data/features/upload-expired-or-revoked-gpg-key.yml b/data/features/upload-expired-or-revoked-gpg-key.yml index 018b9b22fe72..7cb1dedfc8d4 100644 --- a/data/features/upload-expired-or-revoked-gpg-key.yml +++ b/data/features/upload-expired-or-revoked-gpg-key.yml @@ -5,4 +5,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.6' - ghae: '>= 3.6' diff --git a/data/features/viewscreen-and-notebooks.yml b/data/features/viewscreen-and-notebooks.yml index 40a4b5adc3ed..4fe043a4479a 100644 --- a/data/features/viewscreen-and-notebooks.yml +++ b/data/features/viewscreen-and-notebooks.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.7' - ghae: '>=3.7' diff --git a/data/features/workflow-nav-2022.yml b/data/features/workflow-nav-2022.yml index 820fc58ea5e0..ac8284efcae9 100644 --- a/data/features/workflow-nav-2022.yml +++ b/data/features/workflow-nav-2022.yml @@ -4,4 +4,3 @@ versions: fpt: '*' ghec: '*' ghes: '>=3.8' - ghae: '>=3.8' diff --git a/src/content-render/tests/liquid.js b/src/content-render/tests/liquid.js index e1a7e964b3cf..a25383ecc56b 100644 --- a/src/content-render/tests/liquid.js +++ b/src/content-render/tests/liquid.js @@ -198,17 +198,5 @@ describe('liquid template parser', () => { const outputFpt = await liquid.parseAndRender(featureVersionsTemplate, req.context) expect(outputFpt.includes('placeholder content')).toBe(true) }) - - test('renders in GHAE because feature is available in GHAE', async () => { - req.context = { - currentVersion: 'github-ae@latest', - page: {}, - allVersions, - enterpriseServerReleases, - } - await featureVersionsMiddleware(req, null, () => {}) - const outputFpt = await liquid.parseAndRender(featureVersionsTemplate, req.context) - expect(outputFpt.includes('placeholder content')).toBe(true) - }) }) }) diff --git a/src/frame/tests/page.js b/src/frame/tests/page.js index d0c49911c66b..744adf721692 100644 --- a/src/frame/tests/page.js +++ b/src/frame/tests/page.js @@ -376,7 +376,6 @@ describe('Page class', () => { // the frontmatter GHES `*` is not being overwritten by the placeholder's GHES `<3.0`. expect(page.applicableVersions.includes('free-pro-team@latest')).toBe(true) expect(page.applicableVersions.includes(`enterprise-server@${latest}`)).toBe(true) - expect(page.applicableVersions.includes('github-ae@latest')).toBe(true) expect(page.applicableVersions.includes('feature')).toBe(false) expect(page.applicableVersions.includes('placeholder')).toBe(false) })