From 3943724d15946b2680c6081205cfa7f511308f51 Mon Sep 17 00:00:00 2001 From: Steve Loeppky Date: Mon, 12 Feb 2024 09:05:36 -0800 Subject: [PATCH 01/10] Update libp2p.yml - reduce org owners/admins --- github/libp2p.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/github/libp2p.yml b/github/libp2p.yml index c99ae1bb..460f6a63 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -3,17 +3,15 @@ members: admin: - andyschwab-admin - - aschmahmann - - daviddias - galargh - - jacobheun - - jbenet - - marten-seemann - - momack2 - raulk - Stebalien - - whyrusleeping + - p-shahi member: + - andyschwab-admin + - galargh + - raulk + - Stebalien - 2color - aamnv - aarshkshah1992 @@ -104,7 +102,6 @@ members: - nunofmn - olizilla - ortyomka - - p-shahi - petar - pipermerriam - protolambda From 001dcf2cecc91d250afbe1c0344abfe1fd6aed28 Mon Sep 17 00:00:00 2001 From: Steve Loeppky Date: Mon, 12 Feb 2024 09:07:48 -0800 Subject: [PATCH 02/10] Update libp2p.yml - rearrange fixes --- github/libp2p.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github/libp2p.yml b/github/libp2p.yml index 460f6a63..e5560bb8 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -11,7 +11,7 @@ members: - andyschwab-admin - galargh - raulk - - Stebalien + - whyrusleeping - 2color - aamnv - aarshkshah1992 From 4db8b96f572965e94282684c18301548edfe131f Mon Sep 17 00:00:00 2001 From: BigLep Date: Mon, 12 Feb 2024 17:08:55 +0000 Subject: [PATCH 03/10] fix@7875325257 [skip fix] --- github/libp2p.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/github/libp2p.yml b/github/libp2p.yml index e5560bb8..615e949b 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -4,14 +4,10 @@ members: admin: - andyschwab-admin - galargh + - p-shahi - raulk - Stebalien - - p-shahi member: - - andyschwab-admin - - galargh - - raulk - - whyrusleeping - 2color - aamnv - aarshkshah1992 @@ -25,6 +21,7 @@ members: - AlanSl - alexh - andrew + - andyschwab-admin - andyschwab - anorth - arajasek @@ -46,6 +43,7 @@ members: - flyingzumwalt - frrist - fsdiogo + - galargh - gammazero - gavinmcdermott - geoah @@ -106,6 +104,7 @@ members: - pipermerriam - protolambda - ralexstokes + - raulk - RichardLitt - richardschneider - robzajac @@ -133,6 +132,7 @@ members: - web3-bot - wemeetagain - whizzzkid + - whyrusleeping - willscott - xDimon - yiannisbot @@ -7300,6 +7300,9 @@ repositories: delete_branch_on_merge: false description: The Python implementation of the libp2p networking stack 🐍 [under development] + files: + .github/workflows/stale.yml: + content: .github/workflows/stale.yml has_discussions: true merge_commit_message: PR_TITLE merge_commit_title: MERGE_MESSAGE @@ -7675,6 +7678,9 @@ repositories: default_branch: master delete_branch_on_merge: false description: CONFIDENTIAL + files: + .github/workflows/stale.yml: + content: .github/workflows/stale.yml has_discussions: false merge_commit_message: PR_TITLE merge_commit_title: MERGE_MESSAGE From 9014c1a957a07d6fa33c2e0f02b3520e5b543099 Mon Sep 17 00:00:00 2001 From: Steve Loeppky Date: Mon, 12 Feb 2024 09:09:53 -0800 Subject: [PATCH 04/10] Update libp2p.yml - more rearrange fixes --- github/libp2p.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/github/libp2p.yml b/github/libp2p.yml index 615e949b..30d45fb3 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -8,6 +8,12 @@ members: - raulk - Stebalien member: + - aschmahmann + - daviddias + - jacobheun + - jbenet + - marten-seemann + - momack2 - 2color - aamnv - aarshkshah1992 From 5496d2e934fc3cbd1f2fc9ca31dbc41feb246a1e Mon Sep 17 00:00:00 2001 From: BigLep Date: Mon, 12 Feb 2024 17:10:59 +0000 Subject: [PATCH 05/10] fix@7875352051 [skip fix] --- github/libp2p.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/github/libp2p.yml b/github/libp2p.yml index 30d45fb3..d237e748 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -8,12 +8,6 @@ members: - raulk - Stebalien member: - - aschmahmann - - daviddias - - jacobheun - - jbenet - - marten-seemann - - momack2 - 2color - aamnv - aarshkshah1992 @@ -32,11 +26,13 @@ members: - anorth - arajasek - art-gor + - aschmahmann - autonome - BigLep - bigs - cemozerr - ChihChengLiang + - daviddias - dennis-tra - dharmapunk82 - dhuseby @@ -67,6 +63,8 @@ members: - iceseer - igor-egorov - ipfsbot + - jacobheun + - jbenet - jbenetsafer - jchris - JGAntunes @@ -88,6 +86,7 @@ members: - locotorp - magik6k - MarcoPolo + - marten-seemann - maschad - masih - mbaxter @@ -97,6 +96,7 @@ members: - miyazono - mkalinin - mkg20001 + - momack2 - mpetrunic - mvid - mxinden From 52edf0247659617169acd07b30c6467c796b3037 Mon Sep 17 00:00:00 2001 From: Steve Loeppky Date: Mon, 12 Feb 2024 09:11:59 -0800 Subject: [PATCH 06/10] Update libp2p.yml - rearrange fixes --- github/libp2p.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/github/libp2p.yml b/github/libp2p.yml index d237e748..eda46a31 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -21,7 +21,6 @@ members: - AlanSl - alexh - andrew - - andyschwab-admin - andyschwab - anorth - arajasek @@ -45,7 +44,6 @@ members: - flyingzumwalt - frrist - fsdiogo - - galargh - gammazero - gavinmcdermott - geoah @@ -110,7 +108,6 @@ members: - pipermerriam - protolambda - ralexstokes - - raulk - RichardLitt - richardschneider - robzajac From 6fc0ce2d35143e3c8def03f90c7c5e9334bd3dc1 Mon Sep 17 00:00:00 2001 From: Steve Loeppky Date: Mon, 12 Feb 2024 17:42:30 -0800 Subject: [PATCH 07/10] Update libp2p.yml - cleanup github-mgmt stewards team --- github/libp2p.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/github/libp2p.yml b/github/libp2p.yml index eda46a31..4a95da10 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -1,6 +1,11 @@ # yaml-language-server: $schema=.schema.json members: + # Admin permissions map to "org owner" permissions listed in + # https://docs.github.com/en/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#permissions-for-organization-rolesare + # These permissions are very broad, and thus, the list of people is intentionally minimal. + # Permissions are distributed across 3-4 separate organizations. + # One can request additional permissions for specific repos using ipld/github-mgmt. admin: - andyschwab-admin - galargh @@ -8166,21 +8171,18 @@ teams: # using a team instead of direct collaborators because we want to reference it in the CODEOWNERS file description: Users that are effectively org admins members: - # WARN: membership here should be treated exactly as cautiosly as having an org admin role + # WARN: membership here should be treated as cautiously as having an "org owner" role, + # since one can escalate their privileges accordingly. # ATTN: members are expected to: # - be familiar with GitHub Management # - be ready to triage/review org configuration change request in github-mgmt - maintainer: - - aschmahmann - - BigLep - - dhuseby - - marten-seemann - - mxinden + # Intentionally don't have any "maintainers" so that additional membership is done through github-mgmt rather than the GitHub UI. + # That said, since most of these people are also "org owners" ("members.admin" above), + # they can still make changes in the UI. member: - achingbrain - - MarcoPolo + - dhuseby - p-shahi - - willscott privacy: closed go-libp2p Maintainers: description: Trusted reviewers for merging into go-libp2p repositories. From e59d345b5f0806c3fc13e49d4008e9a2980c6a50 Mon Sep 17 00:00:00 2001 From: Steve Loeppky Date: Thu, 15 Feb 2024 20:41:43 -0800 Subject: [PATCH 08/10] Further reducing libp2p org owner permissions --- github/libp2p.yml | 56 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/github/libp2p.yml b/github/libp2p.yml index 4a95da10..9e84de9d 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -1,17 +1,25 @@ # yaml-language-server: $schema=.schema.json +# This org leans hard into managing github permissions and settings with ipfs/github-mgmt. +# One can request additional permissions for specific repos using ipfs/github-mgmt. members: # Admin permissions map to "org owner" permissions listed in # https://docs.github.com/en/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#permissions-for-organization-rolesare - # These permissions are very broad, and thus, the list of people is intentionally minimal. - # Permissions are distributed across 3-4 separate organizations. - # One can request additional permissions for specific repos using ipld/github-mgmt. + # These permissions are very broad, and thus the list of people is intentionally minimal. + # Day-to-day administrating is done by those in the "github-mgmt Stewards" team (see team below). + # "github-mgmt Stewards" team can still escalate into org owner permissions if/when needed. + # This minimal owner set plus supporting rationale was documented and discussed in https://github.com/ipfs/ipfs/issues/511. admin: + # Why @andyschwab-admin? + # 1. leader of [Sodal](https://sodal.io/) + # 2. has close access to [sead](https://www.sead.ai/), which is charged with sysadmin for critical systems within the wider Protocol Labs Network + # 3. general long-standing sysadmin for these organizations with his past roles at PL Inc + # 4. This isn't andyschwab's day-to-day GitHub account - andyschwab-admin + # Why @galargh? + # 1. co-founder of [IPDX](https://ipdx.co), and IPDX is contracted to look after GitHub for this organization. + # 2. Multiple years of experience managing GitHub organizations of open source projects, including this org. - galargh - - p-shahi - - raulk - - Stebalien member: - 2color - aamnv @@ -109,10 +117,12 @@ members: - nunofmn - olizilla - ortyomka + - p-shahi - petar - pipermerriam - protolambda - ralexstokes + - raulk - RichardLitt - richardschneider - robzajac @@ -121,6 +131,7 @@ members: - salmad3 - SgtPooki - snazha-blkio + - Stebalien - stongo - stuckinaboot - sukunrt @@ -8167,8 +8178,14 @@ teams: - salmad3 privacy: closed github-mgmt stewards: - # NOTE: created to capture users with push+ access to github-mgmt repository - # using a team instead of direct collaborators because we want to reference it in the CODEOWNERS file + # Notes: + # 1. These members have push+ access to the github-mgmt repository (in addition to the ipdx team and the org owners listed in "members.admin" above). + # 2. This team also has the org-level "moderator" and "security manager" role. + # This is configured through the GitHub UI, not in GitHub management. + # (Org-level role documentation: https://docs.github.com/en/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization) + # 3. Having a team instead of direct collaborators on the github-mgmt repository also enables easy reference in the github-mgmt CODEOWNERS file. + # 4. Leaning on "github-mgmt stewards" for day-to-day admin over true org owners was done + # as part of the effort to reduce org owners in https://github.com/ipfs/ipfs/issues/511 description: Users that are effectively org admins members: # WARN: membership here should be treated as cautiously as having an "org owner" role, @@ -8176,13 +8193,30 @@ teams: # ATTN: members are expected to: # - be familiar with GitHub Management # - be ready to triage/review org configuration change request in github-mgmt - # Intentionally don't have any "maintainers" so that additional membership is done through github-mgmt rather than the GitHub UI. - # That said, since most of these people are also "org owners" ("members.admin" above), - # they can still make changes in the UI. + # INFO: Intentionally don't have any "maintainers" so that additional membership is done through github-mgmt rather than the GitHub UI. + # INFO: There are others who could certainly qualify to be members of this team. + # There is a balance to be had to ensure there are enough knowledgeable people available to support the needs/requests of the github org, + # and reducing risk by not having too many with the escalation path that this role affords. member: + # Why @achingbrain? + # 1. Long-time and active libp2p maintainer, especially to js-libp2p. + # 2. JS leader at IP Shipyard, which is an organization receiving significant grant funding for libp2p development and maintenance. - achingbrain + # Why @dhuseby? + # 1. Project community leader interfacing with multiple implementation teams. - dhuseby + # Why p-shahi? + # 1. TPM for libp2p implementations like go-libp2p and js-libp2p as part of IP Shipyard and cross-implementation technical work. + # 2. Active and experienced with github-mgmt in helping engineering teams the last year. - p-shahi + # Why @raulk? + # 1. Lots of previous libp2p project leadership experience. + # 2. Taking active leadership role in 2024 libp2p Foundation. + - raulk + # Why @Stebalien? + # 1. Not involved in the libp2p day-to-day currently, but has a lot of historical knowledge. Provides an informed outside perspective. + # 2. Familiar with github-mgmt responsibilities in other orgs. + - Stebalien privacy: closed go-libp2p Maintainers: description: Trusted reviewers for merging into go-libp2p repositories. From 6adedf555ed23c3a20748462dcf14d12644f5999 Mon Sep 17 00:00:00 2001 From: Steve Loeppky Date: Thu, 15 Feb 2024 20:50:21 -0800 Subject: [PATCH 09/10] Update libp2p.yml --- github/libp2p.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/github/libp2p.yml b/github/libp2p.yml index 9e84de9d..b373ddb7 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -1,7 +1,5 @@ # yaml-language-server: $schema=.schema.json -# This org leans hard into managing github permissions and settings with ipfs/github-mgmt. -# One can request additional permissions for specific repos using ipfs/github-mgmt. members: # Admin permissions map to "org owner" permissions listed in # https://docs.github.com/en/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#permissions-for-organization-rolesare From 6258d1eb59bd2c2993b2f678d63dcfe63253f4f7 Mon Sep 17 00:00:00 2001 From: Steve Loeppky Date: Thu, 15 Feb 2024 20:51:41 -0800 Subject: [PATCH 10/10] Update libp2p.yml --- github/libp2p.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github/libp2p.yml b/github/libp2p.yml index b373ddb7..088757bf 100644 --- a/github/libp2p.yml +++ b/github/libp2p.yml @@ -6,7 +6,7 @@ members: # These permissions are very broad, and thus the list of people is intentionally minimal. # Day-to-day administrating is done by those in the "github-mgmt Stewards" team (see team below). # "github-mgmt Stewards" team can still escalate into org owner permissions if/when needed. - # This minimal owner set plus supporting rationale was documented and discussed in https://github.com/ipfs/ipfs/issues/511. + # This minimal owner set plus supporting rationale was documented and discussed in https://github.com/ipfs/ipfs/issues/511 . admin: # Why @andyschwab-admin? # 1. leader of [Sodal](https://sodal.io/)