Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup permissions for shipyard maintained repos #211

Merged
merged 26 commits into from
Nov 5, 2024
Merged
Changes from 14 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
94bba16
permissions: add shipyard team
aschmahmann Aug 20, 2024
49a84fc
permissions(kubo): switch to teams and remove more admins and unnecce…
aschmahmann Aug 20, 2024
592e521
permissions(kubo): remove Jorropo from kubo maintainers team
aschmahmann Aug 20, 2024
bd1cecd
permissions(boxo): remove most admins and downgrade merge and repos g…
aschmahmann Aug 20, 2024
fe7e606
permissions(rainbow): reduce admins
aschmahmann Aug 20, 2024
265f480
permissions(someguy): reduce admins
aschmahmann Aug 20, 2024
9f4cd1a
permissions(helia-http-gateway): use teams, add shipyard as maintaine…
aschmahmann Aug 20, 2024
277b1a1
permissions(helia-dev): remove whizzzkid
aschmahmann Aug 20, 2024
574faff
permissions(helia): reduce admins, remove github-mgmt stewards pull p…
aschmahmann Aug 20, 2024
faf4a43
permissions(helia-service-worker-gateway): switch admins to teams, re…
aschmahmann Aug 20, 2024
25d5ddd
permissions(helia-cli): switch admins to teams, remove github-mgmt st…
aschmahmann Aug 20, 2024
846063a
permissions(helia-delegated-routing-v1-http-api): switch admins to te…
aschmahmann Aug 20, 2024
19b61c5
permissions(helia-remote-pinning): add shipyard as maintainers, remov…
aschmahmann Aug 20, 2024
d2bb753
permissions(helia-verified-fetch): reduce admins, remove github-mgmt …
aschmahmann Aug 20, 2024
1ee6821
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Aug 25, 2024
1e78c92
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Sep 1, 2024
2107e7c
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Sep 8, 2024
aa41b23
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Sep 15, 2024
2f1308f
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Sep 22, 2024
2b2c2d7
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Sep 29, 2024
b9870df
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Oct 6, 2024
9d09e4a
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Oct 13, 2024
0e65246
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Oct 20, 2024
5c1d96a
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Oct 27, 2024
7ec08a7
Merge branch 'master' into permissions/cleanup-shipyard-maintained-repos
ipfs-mgmt-read-write[bot] Nov 3, 2024
16e78e8
Update github/ipfs.yml
aschmahmann Nov 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 39 additions & 76 deletions github/ipfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -641,15 +641,13 @@ repositories:
squash_merge_commit_title: PR_TITLE
teams:
admin:
- admin
- ipdx
- kubo maintainers
- w3dt-stewards
maintain:
- shipyard
push:
- Merge - Go
- Repos - Go
pull:
- github-mgmt stewards
topics:
- go
- ipfs
Expand Down Expand Up @@ -3385,9 +3383,6 @@ repositories:
restrict_dismissals: false
required_status_checks:
strict: true
collaborators:
admin:
- achingbrain
default_branch: main
description: Run helia as a daemon process
files:
Expand All @@ -3405,8 +3400,8 @@ repositories:
teams:
admin:
- helia-dev
pull:
- github-mgmt stewards
maintain:
- shipyard
Comment on lines 3403 to +3407
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@achingbrain @SgtPooki I added Shipyard as maintainers for some repos where there were no ambient admin permissions for the "admin" or w3dt-stewards teams. It might be that these are unnecessary or should just be push permissions. Happy to downgrade if you think that makes more sense.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be fine, and we haven't touched helia-cli in a while, and likely won't

push:
- Repos - JavaScript
topics:
Expand All @@ -3421,8 +3416,6 @@ repositories:
allow_update_branch: true
archived: false
collaborators:
admin:
- achingbrain
push:
- web3-bot
default_branch: main
Expand All @@ -3443,9 +3436,8 @@ repositories:
admin:
- helia-dev
- ipdx
- w3dt-stewards
pull:
- github-mgmt stewards
Comment on lines -3450 to -3451
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ipfs/ipdx any idea why these pull permissions got added everywhere in fe64a02?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! This is because github-mgmt stewards group is designated as moderator and security manager as per #189

So, unfortunately, they're going to come back, but you don't necessarily have to restore them yourself. The apply should go through anyway, and the config will be updated during the weekly sync.

maintain:
- shipyard
push:
- Repos - JavaScript
topics:
Expand All @@ -3455,10 +3447,6 @@ repositories:
advanced_security: false
allow_update_branch: true
archived: false
collaborators:
admin:
- SgtPooki
- whizzzkid
default_branch: main
description: Run Helia NodeJS in a Docker Container.
files:
Expand All @@ -3476,8 +3464,8 @@ repositories:
teams:
admin:
- helia-dev
pull:
- github-mgmt stewards
maintain:
- shipyard
topics:
- docker
- helia-nodejs
Expand All @@ -3493,9 +3481,6 @@ repositories:
advanced_security: false
allow_update_branch: false
archived: false
collaborators:
admin:
- SgtPooki
default_branch: main
description: A library that helps Helia consumers pin content via the
https://ipfs.github.io/pinning-services-api-spec/. Initial design at
Expand All @@ -3515,8 +3500,8 @@ repositories:
teams:
admin:
- helia-dev
pull:
- github-mgmt stewards
maintain:
- shipyard
topics:
- helia
- ipfs-helia
Expand Down Expand Up @@ -3552,9 +3537,8 @@ repositories:
admin:
- helia-dev
- ipdx
- w3dt-stewards
pull:
- github-mgmt stewards
maintain:
- shipyard
push:
- Repos - JavaScript
visibility: public
Expand Down Expand Up @@ -3603,9 +3587,8 @@ repositories:
admin:
- helia-dev
- ipdx
- w3dt-stewards
pull:
- github-mgmt stewards
maintain:
- shipyard
push:
- Repos - JavaScript
topics:
Expand Down Expand Up @@ -5256,9 +5239,7 @@ repositories:
enforce_admins: false
lock_branch: false
push_restrictions:
- /aschmahmann
- /gmasgras
- /thattommyhall
- ipfs/kubo-maintainers
Comment on lines 5198 to +5199
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ipfs/ipdx how can I set this to push restrictions on, but with no associated group? IIUC there's nothing you can do anyway to stop admins from pushing (or maintainers from pushing with approval) so adding groups here seems unnecessary provided you can keep the restrictions enabled.

require_conversation_resolution: false
require_signed_commits: false
required_linear_history: false
Expand All @@ -5269,8 +5250,7 @@ repositories:
enforce_admins: false
lock_branch: false
push_restrictions:
- /aschmahmann
- /gmasgras
- ipfs/kubo-maintainers
require_conversation_resolution: false
require_signed_commits: false
required_linear_history: false
Expand All @@ -5280,6 +5260,8 @@ repositories:
blocks_creations: false
enforce_admins: false
lock_branch: false
push_restrictions:
- ipfs/kubo-maintainers
require_conversation_resolution: false
require_signed_commits: false
required_linear_history: false
Expand All @@ -5303,11 +5285,6 @@ repositories:
blocks_creations: false
enforce_admins: true
lock_branch: false
push_restrictions:
- /aschmahmann
- /hsanjuan
- /Stebalien
- /whyrusleeping
require_conversation_resolution: false
require_signed_commits: false
required_linear_history: false
Expand All @@ -5317,12 +5294,6 @@ repositories:
blocks_creations: false
enforce_admins: false
lock_branch: false
push_restrictions:
- /aschmahmann
- /hacdias
- /Jorropo
- /Stebalien
- /whyrusleeping
require_conversation_resolution: false
require_signed_commits: false
required_linear_history: false
Expand All @@ -5340,11 +5311,6 @@ repositories:
- go-test
- sharness-test
strict: true
collaborators:
admin:
- lidel
push:
- dennis-tra
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dennis-tra I'm removing your permissions here and there will be a follow up PR to add you to the IPFS org and from there you can get added to any teams you need to be.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, thanks for the heads-up! 👍

default_branch: master
description: An IPFS implementation in Go
files:
Expand All @@ -5361,15 +5327,12 @@ repositories:
squash_merge_commit_title: COMMIT_OR_PR_TITLE
teams:
admin:
- admin
- ipdx
- kubo maintainers
- w3dt-stewards
maintain:
- shipyard
pull:
- contributors
- github-mgmt stewards
push:
- Maintainers
- Merge - Go
- Repos - Go
topics:
Expand Down Expand Up @@ -5809,12 +5772,10 @@ repositories:
squash_merge_commit_title: COMMIT_OR_PR_TITLE
teams:
admin:
- admin
- ipdx
aschmahmann marked this conversation as resolved.
Show resolved Hide resolved
- kubo maintainers
- w3dt-stewards
pull:
- github-mgmt stewards
maintain:
- shipyard
Comment on lines +5732 to +5733
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lidel WDYT about giving push to repos Go for rainbow and someguy?

Copy link
Member

@lidel lidel Aug 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably ok, that group already has "maintain" in boxo, so push will make it easier for existing community to submit PRs.

ps. there is a separate long-term meta-worry in that there is way too many people in https://github.com/orgs/ipfs/teams/repos-go, and if our intention is to limit security risks / access, we should plan to subset that group.

topics:
- http
- ipfs-gateway
Expand Down Expand Up @@ -5916,13 +5877,6 @@ repositories:
require_conversation_resolution: false
require_signed_commits: false
required_linear_history: false
collaborators:
admin:
- 2color
- aschmahmann
- lidel
- MarcoPolo
- SgtPooki
default_branch: main
description: "[WIP EXPERIMENT] IPFS Gateway implemented in Service Worker"
files:
Expand All @@ -5936,9 +5890,9 @@ repositories:
squash_merge_commit_message: COMMIT_MESSAGES
squash_merge_commit_title: COMMIT_OR_PR_TITLE
teams:
pull:
- github-mgmt stewards
admin:
- helia-dev
- shipyard
topics:
- helia
- ipfs-gateway
Expand Down Expand Up @@ -6021,12 +5975,10 @@ repositories:
squash_merge_commit_title: COMMIT_OR_PR_TITLE
teams:
admin:
- admin
- ipdx
- kubo maintainers
- w3dt-stewards
pull:
- github-mgmt stewards
maintain:
- shipyard
topics:
- ipfs
- p2p
Expand Down Expand Up @@ -6482,7 +6434,6 @@ teams:
member:
- 2color
- SgtPooki
- whizzzkid
privacy: closed
ipdx:
members:
Expand All @@ -6509,7 +6460,6 @@ teams:
member:
- aschmahmann
- gammazero
- Jorropo
privacy: closed
Maintainers:
description: People with Maintainer access to all repositories
Expand Down Expand Up @@ -6607,6 +6557,19 @@ teams:
- vmx
- wemeetagain
privacy: closed
shipyard:
description: Members of Interplanetary Shipyard who work with or on IPFS
members:
maintainer:
- aschmahmann
- lidel
member:
- 2color
- achingbrain
- gammazero
- guillaumemichel
- MarcoPolo
- SgtPooki
Specs Stewards:
description: IPFS Specifications Stewards
members:
Expand Down
Loading