IT'S ALIVE

GaryPWhite · Feb 28, 2020 · f5d1403 · f5d1403
1 parent 0b50ee6
commit f5d1403
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 21 deletions.
diff --git a/main.go b/main.go
@@ -82,15 +82,15 @@ func main() {
 		},
 		Commands: []*cli.Command{
 			{
-				Name:  "tag",
-				Usage: "Tag one Pull Request (--pr, --pull-request) with a specified tags JSON array (--tags, --t)",
+				Name:  "label",
+				Usage: "label one Pull Request (-pr, -pull-request) with a specified tags JSON array (-tags, -t)",
 				Action: func(c *cli.Context) error {
-					tagger, err := makeTagger(c.String("enterprise-URL"), c.String("git-api-key"), c.String("tags"))
+					tc, err := makeTagger(c.String("enterprise-URL"), c.String("git-api-key"), c.String("tags"))
 					if err != nil {
 						return err
 					}
-					owner, repo, pullRequestNumber, err := getPullRequestDetails(c.String("pull-request"))
-					pr, _, err := tagger.Client.PullRequests.Get(
+					owner, repo, pullRequestNumber, err := tagger.GetPullRequestDetails(c.String("pull-request"))
+					pr, _, err := tc.Client.PullRequests.Get(
 						context.Background(),
 						owner,
 						repo,
@@ -99,7 +99,7 @@ func main() {
 					if err != nil {
 						return err
 					}
-					return tagger.PostTagsToPullRequest(pr)
+					return tc.PostTagsToPullRequest(pr)
 				},
 				Flags: []cli.Flag{
 					&cli.StringFlag{

diff --git a/pkg/tagger/writer.go b/pkg/tagger/writer.go
@@ -3,18 +3,38 @@ package tagger
 import (
 	context "context"
 	"fmt"
+	"strconv"
+	"strings"
 
 	github "github.com/google/go-github/github"
 )
 
+// GetPullRequestDetails will provide the necessary fields for fetching from the GH client through parsing a URL
+func GetPullRequestDetails(prURL string) (owner, repo string, pullRequestNumber int, err error) {
+	// assuming a url with trailing ..../owner/repo/pull/number....
+	splitStrings := strings.Split(strings.Trim(prURL, "/"), "/")
+	lenStrings := len(splitStrings)
+	if lenStrings < 4 { // sanity check -- even partial URL will have at least 4
+		err = fmt.Errorf("Invalid PR input, should be like https://github.com/garypwhite/tag-your-git/pull/10, got %s", prURL)
+		return
+	}
+	owner = splitStrings[lenStrings-4]
+	repo = splitStrings[lenStrings-3]
+	pullRequestNumber, err = strconv.Atoi(splitStrings[lenStrings-1])
+	return
+}
+
 // PostTagsToPullRequest will post the tags found in t tagger to pull request pr
 func (t Tagger) PostTagsToPullRequest(pr *github.PullRequest) error {
-	prRepo := pr.Base.GetRepo()
+	owner, repo, number, err := GetPullRequestDetails(pr.GetIssueURL())
+	if err != nil {
+		return err
+	}
 	files, _, err := t.Client.PullRequests.ListFiles(
 		context.Background(),
-		*prRepo.Owner.Name,
-		*prRepo.Name,
-		*pr.Number,
+		owner,
+		repo,
+		number,
 		&github.ListOptions{PerPage: 3000},
 	)
 	if err != nil {
@@ -35,9 +55,9 @@ func (t Tagger) PostTagsToPullRequest(pr *github.PullRequest) error {
 	// after finding all appropriate tags, post them to PR
 	t.Client.Issues.AddLabelsToIssue(
 		context.Background(),
-		*prRepo.Owner.Name,
-		*prRepo.Name,
-		*pr.Number,
+		owner,
+		repo,
+		number,
 		tagList,
 	) // here you might notice that t-y-g doesn't care about duplicates. Waiting to see if that's an issue or not with the API.
 	return nil

diff --git a/main_test.go → pkg/tagger/writer_test.go b/main_test.go → pkg/tagger/writer_test.go
@@ -1,4 +1,4 @@
-package main
+package tagger
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ func fixutures() (owner string, repo string, pullRequestID int) {
 func TestGetPullRequestDetailsNoTrailing(t *testing.T) {
 	owner, repo, pullRequestID := fixutures()
 	fullURL := fmt.Sprintf("https://github.com/%s/%s/pull/%d", owner, repo, pullRequestID)
-	cOwner, cRepo, cPullRequestID, err := getPullRequestDetails(fullURL)
+	cOwner, cRepo, cPullRequestID, err := GetPullRequestDetails(fullURL)
 	assert.Equal(t, owner, cOwner)
 	assert.Equal(t, repo, cRepo)
 	assert.Equal(t, pullRequestID, cPullRequestID)
@@ -27,7 +27,7 @@ func TestGetPullRequestDetailsNoTrailing(t *testing.T) {
 func TestGetPullRequestDetailsWithTrailing(t *testing.T) {
 	owner, repo, pullRequestID := fixutures()
 	fullURL := fmt.Sprintf("https://github.com/%s/%s/pull/%d/", owner, repo, pullRequestID)
-	cOwner, cRepo, cPullRequestID, err := getPullRequestDetails(fullURL)
+	cOwner, cRepo, cPullRequestID, err := GetPullRequestDetails(fullURL)
 	assert.Equal(t, owner, cOwner)
 	assert.Equal(t, repo, cRepo)
 	assert.Equal(t, pullRequestID, cPullRequestID)
@@ -37,7 +37,7 @@ func TestGetPullRequestDetailsWithTrailing(t *testing.T) {
 func TestGetPullRequestDetailsWithNoHTTPS(t *testing.T) {
 	owner, repo, pullRequestID := fixutures()
 	fullURL := fmt.Sprintf("github.com/%s/%s/pull/%d/", owner, repo, pullRequestID)
-	cOwner, cRepo, cPullRequestID, err := getPullRequestDetails(fullURL)
+	cOwner, cRepo, cPullRequestID, err := GetPullRequestDetails(fullURL)
 	assert.Equal(t, owner, cOwner)
 	assert.Equal(t, repo, cRepo)
 	assert.Equal(t, pullRequestID, cPullRequestID)
@@ -47,7 +47,7 @@ func TestGetPullRequestDetailsWithNoHTTPS(t *testing.T) {
 func TestGetPullRequestDetailsWithSSHPrefix(t *testing.T) {
 	owner, repo, pullRequestID := fixutures()
 	fullURL := fmt.Sprintf("ssh://github.com/%s/%s/pull/%d/", owner, repo, pullRequestID)
-	cOwner, cRepo, cPullRequestID, err := getPullRequestDetails(fullURL)
+	cOwner, cRepo, cPullRequestID, err := GetPullRequestDetails(fullURL)
 	assert.Equal(t, owner, cOwner)
 	assert.Equal(t, repo, cRepo)
 	assert.Equal(t, pullRequestID, cPullRequestID)
@@ -57,19 +57,19 @@ func TestGetPullRequestDetailsWithSSHPrefix(t *testing.T) {
 func TestGetPullRequestDetailsWithGitPrefix(t *testing.T) {
 	owner, repo, pullRequestID := fixutures()
 	fullURL := fmt.Sprintf("git://github.com/%s/%s/pull/%d/", owner, repo, pullRequestID)
-	cOwner, cRepo, cPullRequestID, err := getPullRequestDetails(fullURL)
+	cOwner, cRepo, cPullRequestID, err := GetPullRequestDetails(fullURL)
 	assert.Equal(t, owner, cOwner)
 	assert.Equal(t, repo, cRepo)
 	assert.Equal(t, pullRequestID, cPullRequestID)
 	assert.Empty(t, err)
 }
 
 func TestErrorOnGarbageInput(t *testing.T) {
-	_, _, _, err := getPullRequestDetails("heyo this is a bunch of CRUSJKDHJSAIUHDAISJDKLFJLDKJLJF no sasdflklsjah!JKLSD/.12,./,/3.4,/23,./4,23er7d867c78scy bjkn434n 9y89y3r ")
+	_, _, _, err := GetPullRequestDetails("heyo this is a bunch of CRUSJKDHJSAIUHDAISJDKLFJLDKJLJF no sasdflklsjah!JKLSD/.12,./,/3.4,/23,./4,23er7d867c78scy bjkn434n 9y89y3r ")
 	assert.NotEmpty(t, err)
 }
 
 func TestErrorOnEmptyInput(t *testing.T) {
-	_, _, _, err := getPullRequestDetails("")
+	_, _, _, err := GetPullRequestDetails("")
 	assert.NotEmpty(t, err)
 }