Update PR branch validation to apply labels,not close PR

This updates pull requests branch validation to apply labes to pull
requests: "attention/target-branch" if the target branch is not the
default and  "attention/source-branch" if the source branch is named
"master". The source branch validation leaves a warning comment as
well, suggesting  to raise a new pull request from a named branch.

Signed-off-by: Ivana Yovcheva <[email protected]>

pullRequestHandler.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"strings"
@@ -31,9 +30,8 @@ func handlePullRequest(req types.PullRequestOuter) {
 
 	client := auth.MakeClient(ctx, token)
 
-	if !passBranchValidation(ctx, req, client) {
-		return
-	}
+	headBranchValidation(ctx, req, client)
+	baseBranchValidation(ctx, req, client)
 
 	hasUnsignedCommits, err := hasUnsigned(req, client)
 
@@ -129,21 +127,28 @@ func hasUnsigned(req types.PullRequestOuter, client *github.Client) (bool, error
 	return hasUnsigned, err
 }
 
-func passBranchValidation(ctx context.Context, req types.PullRequestOuter, client *github.Client) bool {
-	if !isValidHeadAndBaseBranch(req) {
-		body := `Thank you for your contribution. You have opened a pull request from master branch or against the non-default branch.
-		Please rename your branch to a non-master and reopen the pull request against the default branch. Thank you!
-		Closing. `
+func headBranchValidation(ctx context.Context, req types.PullRequestOuter, client *github.Client) bool {
+	if isMasterHeadBranch(req) {
+		body := `Thank you for your contribution. It appears that you are submitting changes directly from your master branch,
+		we encourage you to raise a new pull request from a named branch i.e. git checkout -b my_feature. `
 
 		comment := &github.IssueComment{
 			Body: &body,
 		}
 
 		client.Issues.CreateComment(ctx, req.Repository.Owner.Login, req.Repository.Name, req.PullRequest.Number, comment)
 
-		closePullRequest(req)
+		applyLabel(ctx, "attention/source-branch", req, client)
+	}
+	return !isMasterHeadBranch(req)
+}
+
+func baseBranchValidation(ctx context.Context, req types.PullRequestOuter, client *github.Client) bool {
+	if !isAgainstDefaultBranch(req) {
+		applyLabel(ctx, "attention/target-branch", req, client)
 	}
-	return isValidHeadAndBaseBranch(req)
+
+	return isAgainstDefaultBranch(req)
 }
 
 func isValidHeadAndBaseBranch(req types.PullRequestOuter) bool {
@@ -174,23 +179,10 @@ func isSigned(msg string) bool {
 	return strings.Contains(msg, "Signed-off-by:")
 }
 
-func closePullRequest(req types.PullRequestOuter) (string, error) {
-	var buffer bytes.Buffer
-
-	newState, validTransition := checkTransition(closeConstant, req.PullRequest.State)
-
-	if !validTransition {
-		buffer.WriteString(fmt.Sprintf("Cannot close pull request with a %s state", req.PullRequest.State))
-		return buffer.String(), nil
-	}
-
-	input := &github.PullRequest{State: &newState}
-
-	client, ctx := makeClient(req.Installation.ID)
-
-	_, _, err := client.PullRequests.Edit(ctx, req.Repository.Owner.Login, req.Repository.Name, req.PullRequest.Number, input)
-	if err != nil {
-		return buffer.String(), err
+func applyLabel(ctx context.Context, label string, req types.PullRequestOuter, client *github.Client) {
+	fmt.Println("Applying label")
+	_, res, assignLabelErr := client.Issues.AddLabelsToIssue(ctx, req.Repository.Owner.Login, req.Repository.Name, req.PullRequest.Number, []string{label})
+	if assignLabelErr != nil {
+		log.Fatalf("%s limit: %d, remaining: %d", assignLabelErr, res.Limit, res.Remaining)
 	}
-	return buffer.String(), nil
 }

types/types.go

@@ -17,8 +17,7 @@ type Owner struct {
 }
 
 type PullRequest struct {
-	Number int    `json:"number"`
-	State  string `json:"state"`
+	Number int `json:"number"`
 }
 
 type InstallationRequest struct {