Support outside collaborators in owners check #197
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bobertrublik
changed the title
mszostok
reviewed
May 7, 2023
internal/check/valid_owner.go
Outdated
| @@ -48,6 +48,7 @@ type ValidOwner struct { | |||
| orgName string | |||
| orgTeams []*github.Team | |||
| orgRepoName string | |||
| outsideCollaborators *map[string]struct{} | |||
There was a problem hiding this comment.
Suggested change
| outsideCollaborators *map[string]struct{} | |
| outsideCollaborators map[string]struct{} |
FYI: We don't use pointers for map. Map is already a reference type, so it does not make sens here. To learn more, see:
https://go.dev/blog/maps
internal/check/valid_owner.go
Outdated
| return newValidateError("User %q is not a member of the organization", name) | ||
| _, isOutsideCollaborator := (*v.outsideCollaborators)[userName] | ||
| if !(isMember || isOutsideCollaborator) { | ||
| return newValidateError("User %q is not an owner of the repository", name) |
There was a problem hiding this comment.
owner in the context of the repository means a bit more 🙂
Suggested change
| return newValidateError("User %q is not an owner of the repository", name) | |
| return newValidateError("The user %q is neither a collaborator nor a member of this repository.", name) |
internal/check/valid_owner.go
Outdated
| opt.Page = resp.NextPage | ||
| } | ||
|
|
||
| v.outsideCollaborators = &map[string]struct{}{} |
There was a problem hiding this comment.
Suggested change
| v.outsideCollaborators = &map[string]struct{}{} | |
| v.outsideCollaborators = map[string]struct{}{} |
bobertrublik
force-pushed
the
support-outside-collaborators
branch
from
413a776 to
46700ad
Compare
|
I applied your suggestions! :) Sorry for taking so long, I've been sick for the last two weeks. PS: I guess it would have a made more sense to apply the changes in new commits instead of modifying the original commit. |
mszostok
approved these changes
Jun 5, 2023
|
Thank you for approving. :) Is the error in the integration test caused by my changes? |
|
I just opened #222 which I believe would be a better fix for this :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Changes proposed in this pull request:
outsideCollaboratorsmapinitOutsideCollaboratorsList()function to filloutsideCollaboratorsmapvalidateGitHubUser()whether a given username is an outside collaboratorRelated issue(s)