Merge pull request cli#2988 from cli/strict-status-checks-base

mislav · web-flow · commit 70d4786e372c · 2021-02-17T18:13:15.000+01:00
pr status: fix checking branch protection rules on the base branch
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -16,11 +16,10 @@ import (
 )
 
 type PullRequestsPayload struct {
-	ViewerCreated    PullRequestAndTotalCount
-	ReviewRequested  PullRequestAndTotalCount
-	CurrentPR        *PullRequest
-	DefaultBranch    string
-	StrictProtection bool
+	ViewerCreated   PullRequestAndTotalCount
+	ReviewRequested PullRequestAndTotalCount
+	CurrentPR       *PullRequest
+	DefaultBranch   string
 }
 
 type PullRequestAndTotalCount struct {
@@ -57,6 +56,12 @@ type PullRequest struct {
 	IsDraft             bool
 	MaintainerCanModify bool
 
+	BaseRef struct {
+		BranchProtectionRule struct {
+			RequiresStrictStatusChecks bool
+		}
+	}
+
 	ReviewDecision string
 
 	Commits struct {
@@ -283,10 +288,7 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu
 	type response struct {
 		Repository struct {
 			DefaultBranchRef struct {
-				Name                 string
-				BranchProtectionRule struct {
-					RequiresStrictStatusChecks bool
-				}
+				Name string
 			}
 			PullRequests edges
 			PullRequest  *PullRequest
@@ -342,6 +344,11 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu
 		headRepositoryOwner {
 			login
 		}
+		baseRef {
+			branchProtectionRule {
+				requiresStrictStatusChecks
+			}
+		}
 		isCrossRepository
 		isDraft
 		%s
@@ -467,9 +474,8 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu
 			PullRequests: reviewRequested,
 			TotalCount:   resp.ReviewRequested.TotalCount,
 		},
-		CurrentPR:        currentPR,
-		DefaultBranch:    resp.Repository.DefaultBranchRef.Name,
-		StrictProtection: resp.Repository.DefaultBranchRef.BranchProtectionRule.RequiresStrictStatusChecks,
+		CurrentPR:     currentPR,
+		DefaultBranch: resp.Repository.DefaultBranchRef.Name,
 	}
 
 	return &payload, nil
diff --git a/pkg/cmd/pr/status/status.go b/pkg/cmd/pr/status/status.go
@@ -114,7 +114,7 @@ func statusRun(opts *StatusOptions) error {
 		currentPR = nil
 	}
 	if currentPR != nil {
-		printPrs(opts.IO, 1, prPayload.StrictProtection, *currentPR)
+		printPrs(opts.IO, 1, *currentPR)
 	} else if currentPRHeadRef == "" {
 		shared.PrintMessage(opts.IO, "  There is no current branch")
 	} else {
@@ -124,15 +124,15 @@ func statusRun(opts *StatusOptions) error {
 
 	shared.PrintHeader(opts.IO, "Created by you")
 	if prPayload.ViewerCreated.TotalCount > 0 {
-		printPrs(opts.IO, prPayload.ViewerCreated.TotalCount, prPayload.StrictProtection, prPayload.ViewerCreated.PullRequests...)
+		printPrs(opts.IO, prPayload.ViewerCreated.TotalCount, prPayload.ViewerCreated.PullRequests...)
 	} else {
 		shared.PrintMessage(opts.IO, "  You have no open pull requests")
 	}
 	fmt.Fprintln(out)
 
 	shared.PrintHeader(opts.IO, "Requesting a code review from you")
 	if prPayload.ReviewRequested.TotalCount > 0 {
-		printPrs(opts.IO, prPayload.ReviewRequested.TotalCount, prPayload.StrictProtection, prPayload.ReviewRequested.PullRequests...)
+		printPrs(opts.IO, prPayload.ReviewRequested.TotalCount, prPayload.ReviewRequested.PullRequests...)
 	} else {
 		shared.PrintMessage(opts.IO, "  You have no pull requests to review")
 	}
@@ -178,7 +178,7 @@ func prSelectorForCurrentBranch(baseRepo ghrepo.Interface, prHeadRef string, rem
 	return
 }
 
-func printPrs(io *iostreams.IOStreams, totalCount int, strictProtection bool, prs ...api.PullRequest) {
+func printPrs(io *iostreams.IOStreams, totalCount int, prs ...api.PullRequest) {
 	w := io.Out
 	cs := io.ColorScheme()
 
@@ -228,15 +228,14 @@ func printPrs(io *iostreams.IOStreams, totalCount int, strictProtection bool, pr
 				fmt.Fprint(w, cs.Green("✓ Approved"))
 			}
 
-			// only check if the "up to date" setting is checked in repo settings
-			if strictProtection {
-				// add padding between reviews & merge status
-				fmt.Fprint(w, " ")
-
-				if pr.MergeStateStatus == "BEHIND" {
-					fmt.Fprint(w, cs.Yellow("- Not up to date"))
-				} else {
-					fmt.Fprint(w, cs.Green("✓ Up to date"))
+			if pr.BaseRef.BranchProtectionRule.RequiresStrictStatusChecks {
+				switch pr.MergeStateStatus {
+				case "BEHIND":
+					fmt.Fprintf(w, " %s", cs.Yellow("- Not up to date"))
+				case "UNKNOWN", "DIRTY":
+					// do not print anything
+				default:
+					fmt.Fprintf(w, " %s", cs.Green("✓ Up to date"))
 				}
 			}
 
