From 5239a28ce93ea07957279ebc1aa0a9e9503d7ee9 Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Tue, 24 May 2022 17:51:11 +0530 Subject: [PATCH 01/13] Update encrypted-secrets.md --- content/actions/security-guides/encrypted-secrets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/security-guides/encrypted-secrets.md b/content/actions/security-guides/encrypted-secrets.md index f94e6f43582f..d9be7097d86b 100644 --- a/content/actions/security-guides/encrypted-secrets.md +++ b/content/actions/security-guides/encrypted-secrets.md @@ -67,7 +67,7 @@ When generating credentials, we recommend that you grant the minimum permissions {% endnote %} -## Creating encrypted secrets for a repository +## Creating encrypted secrets for a repository {% data reusables.actions.permissions-statement-secrets-repository %} From 233604bd818f72928da9274ed0c73fd23ef7ed0b Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Wed, 25 May 2022 19:44:59 +0530 Subject: [PATCH 02/13] Update reusable to the latest changes --- data/reusables/actions/sidebar-secret.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/actions/sidebar-secret.md b/data/reusables/actions/sidebar-secret.md index 896d920ff404..23470cffdc2a 100644 --- a/data/reusables/actions/sidebar-secret.md +++ b/data/reusables/actions/sidebar-secret.md @@ -1,5 +1,5 @@ {% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} -1. In the left sidebar, click **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**. +1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**, then click **Actions**. {% else %} 1. In the left sidebar, click **Secrets**. {% endif %} From 90740c14d461a133a78fd6c877e26ab1aef23b9a Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Wed, 25 May 2022 19:46:49 +0530 Subject: [PATCH 03/13] Remove unwanted reusable reference --- .../managing-encrypted-secrets-for-dependabot.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md b/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md index c6f149b16ad7..4335388ce8a4 100644 --- a/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md +++ b/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md @@ -49,7 +49,6 @@ The name of a {% data variables.product.prodname_dependabot %} secret: {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% data reusables.actions.sidebar-secret %} {% data reusables.dependabot.dependabot-secrets-button %} 1. Click **New repository secret**. 1. Type a name for your secret in the **Name** input box. From 60f3006ec5569c761a062a0c52fb71932139d2fc Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Wed, 25 May 2022 20:01:17 +0530 Subject: [PATCH 04/13] Remove TODO comment --- content/actions/security-guides/encrypted-secrets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/security-guides/encrypted-secrets.md b/content/actions/security-guides/encrypted-secrets.md index d9be7097d86b..f94e6f43582f 100644 --- a/content/actions/security-guides/encrypted-secrets.md +++ b/content/actions/security-guides/encrypted-secrets.md @@ -67,7 +67,7 @@ When generating credentials, we recommend that you grant the minimum permissions {% endnote %} -## Creating encrypted secrets for a repository +## Creating encrypted secrets for a repository {% data reusables.actions.permissions-statement-secrets-repository %} From 013d0e3809c9190b7806584c38cbdcf456f9a2f9 Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Sat, 4 Jun 2022 15:18:16 +0530 Subject: [PATCH 05/13] Create new reusable for GitHub Codespaces --- data/reusables/codespaces/sidebar-secret.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 data/reusables/codespaces/sidebar-secret.md diff --git a/data/reusables/codespaces/sidebar-secret.md b/data/reusables/codespaces/sidebar-secret.md new file mode 100644 index 000000000000..e4d315213105 --- /dev/null +++ b/data/reusables/codespaces/sidebar-secret.md @@ -0,0 +1 @@ +1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**, then click **{% data product.prodname_codespaces %}**. From 0a0b47535534727a20f9cde8715199057c3222de Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Sat, 4 Jun 2022 15:20:32 +0530 Subject: [PATCH 06/13] Create new reusable for dependabot --- data/reusables/dependabot/sidebar-secret.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 data/reusables/dependabot/sidebar-secret.md diff --git a/data/reusables/dependabot/sidebar-secret.md b/data/reusables/dependabot/sidebar-secret.md new file mode 100644 index 000000000000..c2962a8f98d7 --- /dev/null +++ b/data/reusables/dependabot/sidebar-secret.md @@ -0,0 +1 @@ +1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**, then click **{% data variables.product.prodname_dependabot %}**. From f19dace23ce7b96ef0537b61f81e8d4b02a86530 Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Sat, 4 Jun 2022 15:21:20 +0530 Subject: [PATCH 07/13] Fix a thing --- data/reusables/codespaces/sidebar-secret.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/codespaces/sidebar-secret.md b/data/reusables/codespaces/sidebar-secret.md index e4d315213105..62d94a9ba985 100644 --- a/data/reusables/codespaces/sidebar-secret.md +++ b/data/reusables/codespaces/sidebar-secret.md @@ -1 +1 @@ -1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**, then click **{% data product.prodname_codespaces %}**. +1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**, then click **{% data variables.product.prodname_codespaces %}**. From 2a3ee30b7ff891420ebd7370afacc06b84079a21 Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Mon, 6 Jun 2022 10:04:03 +0530 Subject: [PATCH 08/13] Change to new reusables --- .../managing-encrypted-secrets-for-dependabot.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md b/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md index 4335388ce8a4..4ab0d0a0182e 100644 --- a/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md +++ b/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md @@ -49,6 +49,7 @@ The name of a {% data variables.product.prodname_dependabot %} secret: {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} +{% data reusables.dependabot.sidebar-secret %} {% data reusables.dependabot.dependabot-secrets-button %} 1. Click **New repository secret**. 1. Type a name for your secret in the **Name** input box. @@ -67,7 +68,7 @@ When creating a secret in an organization, you can use a policy to limit which r {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -{% data reusables.actions.sidebar-secret %} +{% data reusables.dependabot.sidebar-secret %} {% data reusables.dependabot.dependabot-secrets-button %} 1. Click **New organization secret**. 1. Type a name for your secret in the **Name** input box. From 4d1ea195f381a0f6254712f54f29bfff50e7d8f9 Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Mon, 6 Jun 2022 10:25:08 +0530 Subject: [PATCH 09/13] Remove unwanted reusable --- .../managing-encrypted-secrets-for-dependabot.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md b/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md index 4ab0d0a0182e..7b75165e7682 100644 --- a/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md +++ b/content/code-security/dependabot/working-with-dependabot/managing-encrypted-secrets-for-dependabot.md @@ -50,7 +50,6 @@ The name of a {% data variables.product.prodname_dependabot %} secret: {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.dependabot.sidebar-secret %} -{% data reusables.dependabot.dependabot-secrets-button %} 1. Click **New repository secret**. 1. Type a name for your secret in the **Name** input box. 1. Enter the value for your secret. @@ -69,7 +68,6 @@ When creating a secret in an organization, you can use a policy to limit which r {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.dependabot.sidebar-secret %} -{% data reusables.dependabot.dependabot-secrets-button %} 1. Click **New organization secret**. 1. Type a name for your secret in the **Name** input box. 1. Enter the **Value** for your secret. From b2da1f4e20c6efa58ce77abdf8553846704f0e3c Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Mon, 6 Jun 2022 10:27:14 +0530 Subject: [PATCH 10/13] Delete new reusable as already present Will rename the present reusable to this in next commit --- data/reusables/dependabot/sidebar-secret.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 data/reusables/dependabot/sidebar-secret.md diff --git a/data/reusables/dependabot/sidebar-secret.md b/data/reusables/dependabot/sidebar-secret.md deleted file mode 100644 index c2962a8f98d7..000000000000 --- a/data/reusables/dependabot/sidebar-secret.md +++ /dev/null @@ -1 +0,0 @@ -1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**, then click **{% data variables.product.prodname_dependabot %}**. From bc60e15a696842331d2c036ba4ce89317d9c3ef7 Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Mon, 6 Jun 2022 10:27:46 +0530 Subject: [PATCH 11/13] Rename dependabot-secrets-button.md to sidebar-secret.md --- .../{dependabot-secrets-button.md => sidebar-secret.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/reusables/dependabot/{dependabot-secrets-button.md => sidebar-secret.md} (100%) diff --git a/data/reusables/dependabot/dependabot-secrets-button.md b/data/reusables/dependabot/sidebar-secret.md similarity index 100% rename from data/reusables/dependabot/dependabot-secrets-button.md rename to data/reusables/dependabot/sidebar-secret.md From f26a90816263882c9a44183b0195aa462e674508 Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Mon, 6 Jun 2022 10:38:55 +0530 Subject: [PATCH 12/13] Implement new reusables for codespaces --- ...s-for-your-repository-and-organization-for-codespaces.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md index c02b4c005c2b..0568e76df69c 100644 --- a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md +++ b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md @@ -41,7 +41,7 @@ To create secrets for an organization repository, you must have administrator ac {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets** then click **{% data variables.product.prodname_codespaces %}**. +{% data reusables.codespaces.sidebar-secret %} 2. At the top of the page, click **New repository secret**. 3. Type a name for your secret in the **Name** input box. 4. Enter the value for your secret. @@ -55,7 +55,7 @@ When creating a secret in an organization, you can use a policy to limit which r {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets** then click **{% data variables.product.prodname_codespaces %}**. +{% data reusables.codespaces.sidebar-secret %} 2. At the top of the page, click **New organization secret**. 3. Type a name for your secret in the **Name** input box. 4. Enter the **Value** for your secret. @@ -69,7 +69,7 @@ You can check which access policies are applied to a secret in your organization {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} -{% data reusables.actions.sidebar-secret %} +{% data reusables.codespaces.sidebar-secret %} 1. The list of secrets includes any configured permissions and policies. For example: ![Secrets list](/assets/images/help/settings/actions-org-secrets-list.png) 1. For more details on the configured permissions for each secret, click **Update**. From 4be51a136ed363bfc71ec80df1b0fab682134398 Mon Sep 17 00:00:00 2001 From: PSJ <51746608+thispsj@users.noreply.github.com> Date: Wed, 27 Jul 2022 08:51:36 +0530 Subject: [PATCH 13/13] =?UTF-8?q?Fix=20Merge=20Conflict(s)=20=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...our-repository-and-organization-for-github-codespaces.md} | 5 +++++ 1 file changed, 5 insertions(+) rename content/codespaces/managing-codespaces-for-your-organization/{managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md => managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md} (96%) diff --git a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md similarity index 96% rename from content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md rename to content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md index 0568e76df69c..9f281523fc47 100644 --- a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md +++ b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md @@ -11,6 +11,8 @@ topics: - Codespaces - Secret store - Security +redirect_from: + - /codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces --- @@ -42,6 +44,7 @@ To create secrets for an organization repository, you must have administrator ac {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.codespaces.sidebar-secret %} + 2. At the top of the page, click **New repository secret**. 3. Type a name for your secret in the **Name** input box. 4. Enter the value for your secret. @@ -56,6 +59,7 @@ When creating a secret in an organization, you can use a policy to limit which r {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.codespaces.sidebar-secret %} + 2. At the top of the page, click **New organization secret**. 3. Type a name for your secret in the **Name** input box. 4. Enter the **Value** for your secret. @@ -70,6 +74,7 @@ You can check which access policies are applied to a secret in your organization {% data reusables.organizations.navigate-to-org %} {% data reusables.organizations.org_settings %} {% data reusables.codespaces.sidebar-secret %} + 1. The list of secrets includes any configured permissions and policies. For example: ![Secrets list](/assets/images/help/settings/actions-org-secrets-list.png) 1. For more details on the configured permissions for each secret, click **Update**.