Skip to content

Commit b1aa297

Browse files
committed
some refactor
1 parent 55740c2 commit b1aa297

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

cmd/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"flag"
55
"fmt"
6+
"github.com/variantdev/go-actions"
67
"github.com/variantdev/go-actions/pkg/pullvet"
78
"os"
89
)
@@ -44,7 +45,7 @@ func main() {
4445

4546
fs.Parse(os.Args[2:])
4647

47-
pr, err := pullvet.GetPullRequest()
48+
pr, err := actions.PullRequest()
4849
if err != nil {
4950
fmt.Fprintf(os.Stderr, "%v\n", err)
5051
os.Exit(1)

cmd/pullvet/pullvet.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"flag"
55
"fmt"
6+
"github.com/variantdev/go-actions"
67
"github.com/variantdev/go-actions/pkg/pullvet"
78
"os"
89
)
@@ -21,7 +22,7 @@ func main() {
2122

2223
flag.Parse()
2324

24-
pr, err := pullvet.GetPullRequest()
25+
pr, err := actions.PullRequest()
2526
if err != nil {
2627
fmt.Fprintf(os.Stderr, "%v\n", err)
2728
os.Exit(1)

event.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,23 @@ func CheckSuiteEvent() (*github.CheckSuiteEvent, error) {
4747
}
4848
return evt.(*github.CheckSuiteEvent), nil
4949
}
50+
51+
func PullRequest() (*github.PullRequest, error) {
52+
var pr *github.PullRequest
53+
checkSuite, err := CheckSuiteEvent()
54+
if err != nil {
55+
checkRun, err := CheckRunEvent()
56+
if err != nil {
57+
pull, err := PullRequestEvent()
58+
if err != nil {
59+
return nil, err
60+
}
61+
pr = pull.PullRequest
62+
} else {
63+
pr = checkRun.CheckRun.PullRequests[0]
64+
}
65+
} else {
66+
pr = checkSuite.CheckSuite.PullRequests[0]
67+
}
68+
return pr, nil
69+
}

pkg/pullvet/pullvet.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"flag"
55
"fmt"
66
"github.com/google/go-github/github"
7-
"github.com/variantdev/go-actions"
87
"github.com/variantdev/go-actions/pkg/cmd"
98
"os"
109
"regexp"
@@ -131,22 +130,3 @@ func formatFailures(failures []string) string {
131130
return strings.Join(lines, "\n")
132131
}
133132

134-
func GetPullRequest() (*github.PullRequest, error) {
135-
var pr *github.PullRequest
136-
checkSuite, err := actions.CheckSuiteEvent()
137-
if err != nil {
138-
checkRun, err := actions.CheckRunEvent()
139-
if err != nil {
140-
pull, err := actions.PullRequestEvent()
141-
if err != nil {
142-
return nil, err
143-
}
144-
pr = pull.PullRequest
145-
} else {
146-
pr = checkRun.CheckRun.PullRequests[0]
147-
}
148-
} else {
149-
pr = checkSuite.CheckSuite.PullRequests[0]
150-
}
151-
return pr, nil
152-
}

0 commit comments

Comments
 (0)