Fix author-in-team (#154)

srvaroa · web-flow · commit 29471ee1118f · 2024-10-09T21:35:15.000+02:00
Use the right GH API to resolve team membership

Signed-off-by: Galo Navarro &lt;anglorvaroa@gmail.com&gt;
diff --git a/cmd/action.go b/cmd/action.go
@@ -231,7 +231,7 @@ func newLabeler(gh *github.Client, config *labeler.LabelerConfigV1) *labeler.Lab
 			GetRawDiff: func(owner, repo string, prNumber int) (string, error) {
 				diff, _, err := gh.PullRequests.GetRaw(ctx,
 					owner, repo, prNumber,
-					github.RawOptions{github.Diff})
+					github.RawOptions{Type: github.Diff})
 				return diff, err
 			},
 			ListIssuesByRepo: func(owner, repo string) ([]*github.Issue, error) {
@@ -244,8 +244,8 @@ func newLabeler(gh *github.Client, config *labeler.LabelerConfigV1) *labeler.Lab
 					owner, repo, &github.PullRequestListOptions{})
 				return prs, err
 			},
-			IsUserMemberOfTeam: func(user, team string) (bool, error) {
-				membership, _, err := gh.Organizations.GetOrgMembership(ctx, user, team)
+			IsUserMemberOfTeam: func(org, user, team string) (bool, error) {
+				membership, _, err := gh.Teams.GetTeamMembershipBySlug(ctx, org, team, user)
 				if err != nil {
 					return false, err
 				}
diff --git a/pkg/condition_author_in_team.go b/pkg/condition_author_in_team.go
@@ -17,7 +17,11 @@ func AuthorInTeamCondition(l *Labeler) Condition {
 				return false, fmt.Errorf("author-in-team is not set in config")
 			}
 			// check if author is a member of team
-			return l.GitHubFacade.IsUserMemberOfTeam(target.Author, matcher.AuthorInTeam)
+			return l.GitHubFacade.IsUserMemberOfTeam(
+				target.Owner,
+				target.Author,
+				matcher.AuthorInTeam, // this is the team slug
+			)
 		},
 	}
 }
diff --git a/pkg/labeler.go b/pkg/labeler.go
@@ -69,7 +69,7 @@ type GitHubFacade struct {
 	GetRawDiff         func(owner, repo string, prNumber int) (string, error)
 	ListIssuesByRepo   func(owner, repo string) ([]*gh.Issue, error)
 	ListPRs            func(owner, repo string) ([]*gh.PullRequest, error)
-	IsUserMemberOfTeam func(user, team string) (bool, error)
+	IsUserMemberOfTeam func(org, user, team string) (bool, error)
 }
 
 type Labeler struct {
diff --git a/pkg/labeler_test.go b/pkg/labeler_test.go
@@ -1075,7 +1075,7 @@ func NewTestLabeler(t *testing.T, tc TestCase) Labeler {
 				return string(data), nil
 			},
 			// Will return true whenever team contains the given user name
-			IsUserMemberOfTeam: func(user, team string) (bool, error) {
+			IsUserMemberOfTeam: func(org, user, team string) (bool, error) {
 				return strings.Contains(team, user), nil
 			},
 		},

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,11 @@ func AuthorInTeamCondition(l *Labeler) Condition {`
`17`	`17`	`return false, fmt.Errorf("author-in-team is not set in config")`
`18`	`18`	`}`
`19`	`19`	`// check if author is a member of team`
`20`		`- return l.GitHubFacade.IsUserMemberOfTeam(target.Author, matcher.AuthorInTeam)`
	`20`	`+ return l.GitHubFacade.IsUserMemberOfTeam(`
	`21`	`+ target.Owner,`
	`22`	`+ target.Author,`
	`23`	`+ matcher.AuthorInTeam, // this is the team slug`
	`24`	`+ )`
`21`	`25`	`},`
`22`	`26`	`}`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ type GitHubFacade struct {`
`69`	`69`	`GetRawDiff func(owner, repo string, prNumber int) (string, error)`
`70`	`70`	`ListIssuesByRepo func(owner, repo string) ([]*gh.Issue, error)`
`71`	`71`	`ListPRs func(owner, repo string) ([]*gh.PullRequest, error)`
`72`		`- IsUserMemberOfTeam func(user, team string) (bool, error)`
	`72`	`+ IsUserMemberOfTeam func(org, user, team string) (bool, error)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`type Labeler struct {`