Make review reminders only remind current reviewer (#12191)

Author: trodge

.ci/magician/cmd/scheduled_pr_reminders.go

@@ -66,11 +66,12 @@ var scheduledPrReminders = &cobra.Command{
 			return fmt.Errorf("did not provide GITHUB_TOKEN environment variable")
 		}
 		gh := github.NewClient(nil).WithAuthToken(githubToken)
-		return execScheduledPrReminders(gh)
+		mgh := membership.NewClient(githubToken)
+		return execScheduledPrReminders(gh, mgh)
 	},
 }
 
-func execScheduledPrReminders(gh *github.Client) error {
+func execScheduledPrReminders(gh *github.Client, mgh GithubClient) error {
 	ctx := context.Background()
 	opt := &github.PullRequestListOptions{
 		State:       "open",
@@ -165,7 +166,14 @@ func execScheduledPrReminders(gh *github.Client) error {
 		)
 		sinceDays := businessDaysDiff(since, time.Now())
 		if shouldNotify(pr, state, sinceDays) {
-			comment, err := formatReminderComment(pr, state, sinceDays)
+			// Determine the current primary reviewer.
+			comments, err := mgh.GetPullRequestComments(fmt.Sprintf("%d", *pr.Number))
+			if err != nil {
+				return err
+			}
+			_, currentReviewer := membership.FindReviewerComment(comments)
+
+			reminderComment, err := formatReminderComment(pr, state, sinceDays, currentReviewer)
 			if err != nil {
 				fmt.Printf(
 					"%d/%d: PR %d: error rendering comment: %s\n",
@@ -177,15 +185,15 @@ func execScheduledPrReminders(gh *github.Client) error {
 				continue
 			}
 			if dryRun {
-				fmt.Printf("DRY RUN: Would post comment: %s\n", comment)
+				fmt.Printf("DRY RUN: Would post comment: %s\n", reminderComment)
 			} else {
 				_, _, err := gh.Issues.CreateComment(
 					ctx,
 					"GoogleCloudPlatform",
 					"magic-modules",
 					*pr.Number,
 					&github.IssueComment{
-						Body: github.String(comment),
+						Body: github.String(reminderComment),
 					},
 				)
 				if err != nil {
@@ -433,7 +441,7 @@ func shouldNotify(pr *github.PullRequest, state pullRequestReviewState, sinceDay
 	return false
 }
 
-func formatReminderComment(pullRequest *github.PullRequest, state pullRequestReviewState, sinceDays int) (string, error) {
+func formatReminderComment(pullRequest *github.PullRequest, state pullRequestReviewState, sinceDays int, currentReviewer string) (string, error) {
 	embeddedTemplate := ""
 	switch state {
 	case waitingForMerge:
@@ -454,11 +462,15 @@ func formatReminderComment(pullRequest *github.PullRequest, state pullRequestRev
 		panic(fmt.Sprintf("Unable to parse template for %s: %s", state.String(), err))
 	}
 
-	coreReviewers := []string{}
-	for _, reviewer := range pullRequest.RequestedReviewers {
-		if membership.IsCoreReviewer(*reviewer.Login) {
-			coreReviewers = append(coreReviewers, *reviewer.Login)
+	var coreReviewers []string
+	if currentReviewer == "" {
+		for _, reviewer := range pullRequest.RequestedReviewers {
+			if membership.IsCoreReviewer(*reviewer.Login) {
+				coreReviewers = append(coreReviewers, *reviewer.Login)
+			}
 		}
+	} else {
+		coreReviewers = append(coreReviewers, currentReviewer)
 	}
 
 	data := reminderCommentData{

.ci/magician/cmd/scheduled_pr_reminders_test.go

@@ -794,6 +794,7 @@ func TestFormatReminderComment(t *testing.T) {
 		sinceDays          int
 		expectedStrings    []string
 		notExpectedStrings []string
+		currentReviewer    string
 	}{
 		// waitingForMerge
 		"waitingForMerge one week": {
@@ -933,6 +934,30 @@ func TestFormatReminderComment(t *testing.T) {
 				"@other-reviewer",
 			},
 		},
+		"waitingForReview three days with current reviewer": {
+			pullRequest: &github.PullRequest{
+				User: &github.User{Login: github.String("pr-author")},
+				RequestedReviewers: []*github.User{
+					&github.User{Login: github.String(firstCoreReviewer)},
+					&github.User{Login: github.String(secondCoreReviewer)},
+					&github.User{Login: github.String("other-reviewer")},
+				},
+			},
+			state:     waitingForReview,
+			sinceDays: 3,
+			expectedStrings: []string{
+				"waiting for review for 3 weekdays",
+				"disable-review-reminders",
+				"@" + secondCoreReviewer,
+			},
+			notExpectedStrings: []string{
+				"@GoogleCloudPlatform/terraform-team",
+				"@pr-author",
+				"@other-reviewer",
+				"@" + firstCoreReviewer,
+			},
+			currentReviewer: secondCoreReviewer,
+		},
 
 		// waitingForContributor
 		"waitingForContributor two weeks": {
@@ -1048,7 +1073,7 @@ func TestFormatReminderComment(t *testing.T) {
 		t.Run(tn, func(t *testing.T) {
 			t.Parallel()
 
-			comment, err := formatReminderComment(tc.pullRequest, tc.state, tc.sinceDays)
+			comment, err := formatReminderComment(tc.pullRequest, tc.state, tc.sinceDays, tc.currentReviewer)
 			assert.Nil(t, err)
 
 			for _, s := range tc.expectedStrings {