Merge pull request #7 from DocPlanner/bugfix/Switch_from_githubql_to_guthubv4

Fix 502 bad gataway issue

Author: lupiuz

.gitignore

@@ -1,2 +1,4 @@
 .idea/
 vendor/
+
+/.vscode/launch.json

github/github-query.go

@@ -1,6 +1,6 @@
 package github
 
-import "github.com/shurcooL/githubql"
+import "github.com/shurcooL/githubv4"
 
 type githubQuery struct {
 	Repository struct {
@@ -13,36 +13,36 @@ type githubQuery struct {
 								Parents struct {
 									Edges []struct {
 										Node struct {
-											Oid     githubql.String
-											Message githubql.String
+											Oid     githubv4.String
+											Message githubv4.String
 										}
 									}
 								} `graphql:"parents(first: $parentsNumber)"`
-								Oid               githubql.String
-								Message           githubql.String
-								PushedDate        githubql.DateTime
+								Oid               githubv4.String
+								Message           githubv4.String
+								PushedDate        githubv4.DateTime
 								StatusCheckRollup struct {
-									State    githubql.String
+									State    githubv4.String
 									Contexts struct {
-										TotalCount githubql.Int
+										TotalCount githubv4.Int
 									} `graphql:"contexts(first: $parentsNumber)"`
 								}
 								CheckSuites struct {
 									Nodes []struct {
 										CheckRuns struct {
 											Nodes []struct {
-												Name       githubql.String
-												Status     githubql.String
-												Title      githubql.String
-												Conclusion githubql.String
+												Name       githubv4.String
+												Status     githubv4.String
+												Title      githubv4.String
+												Conclusion githubv4.String
 											}
-										} `graphql:"checkRuns(first: 100)"`
+										} `graphql:"checkRuns(first: 25)"`
 									}
 								} `graphql:"checkSuites(first: 10)"`
 								Status struct {
 									Contexts []struct {
-										Context githubql.String
-										State   githubql.String
+										Context githubv4.String
+										State   githubv4.String
 									}
 								}
 							}

github/manager.go

@@ -4,14 +4,14 @@ import (
 	"net/http"
 
 	"github.com/google/go-github/github"
-	"github.com/shurcooL/githubql"
+	"github.com/shurcooL/githubv4"
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 )
 
 type githubManager struct {
 	Context    context.Context
-	Client     *githubql.Client
+	Client     *githubv4.Client
 	HttpClient *http.Client
 }
 
@@ -21,7 +21,7 @@ func New(githubAccessToken string) *githubManager {
 		&oauth2.Token{AccessToken: githubAccessToken},
 	)
 	httpClient := oauth2.NewClient(ctx, src)
-	client := githubql.NewClient(httpClient)
+	client := githubv4.NewClient(httpClient)
 
 	return &githubManager{Context: ctx, Client: client, HttpClient: httpClient}
 }
@@ -35,11 +35,11 @@ func (gm *githubManager) GetCommits(owner, repo, branch string, lastCommitsNumbe
 
 	client := gm.Client
 	err := client.Query(gm.Context, &q, map[string]interface{}{
-		"owner":         githubql.String(owner),
-		"name":          githubql.String(repo),
-		"branch":        githubql.String(branch),
-		"commitsNumber": githubql.Int(lastCommitsNumber),
-		"parentsNumber": githubql.Int(1),
+		"owner":         githubv4.String(owner),
+		"name":          githubv4.String(repo),
+		"branch":        githubv4.String(branch),
+		"commitsNumber": githubv4.Int(lastCommitsNumber),
+		"parentsNumber": githubv4.Int(1),
 	})
 	if nil != err {
 		return nil, err
@@ -112,21 +112,21 @@ func hydrateCommits(q *githubQuery, specificCheckName string) []Commit {
 		if specificCheckName != "" {
 			// first check if commit has commit status set
 			for _, context := range edge.Node.Status.Contexts {
-				if githubql.String(specificCheckName) == context.Context {
-					statusSuccess = context.State == githubql.String(githubql.StatusStateSuccess)
+				if githubv4.String(specificCheckName) == context.Context {
+					statusSuccess = context.State == githubv4.String(githubv4.StatusStateSuccess)
 				}
 			}
 
 			// then check  if commit has check-run set
 			for _, checkSuite := range edge.Node.CheckSuites.Nodes {
 				for _, checkRuns := range checkSuite.CheckRuns.Nodes {
-					if githubql.String(specificCheckName) == checkRuns.Name {
-						statusSuccess = checkRuns.Conclusion == githubql.String(githubql.StatusStateSuccess)
+					if githubv4.String(specificCheckName) == checkRuns.Name {
+						statusSuccess = checkRuns.Conclusion == githubv4.String(githubv4.StatusStateSuccess)
 					}
 				}
 			}
 		} else {
-			statusSuccess = bool(edge.Node.StatusCheckRollup.State == githubql.String(githubql.StatusStateSuccess))
+			statusSuccess = bool(edge.Node.StatusCheckRollup.State == githubv4.String(githubv4.StatusStateSuccess))
 		}
 
 		fullCommitsList = append(fullCommitsList, Commit{

go.mod

@@ -3,38 +3,40 @@ module github.com/Docplanner/github-flow-manager
 go 1.16
 
 require (
-	github.com/araddon/dateparse v0.0.0-20180325234811-1d3842569f46 // indirect
-	github.com/araddon/gou v0.0.0-20180315155215-820e9f87cd05 // indirect
-	github.com/araddon/qlbridge v0.0.0-20180324211701-d31482986c59
-	github.com/dchest/siphash v1.1.0 // indirect
-	github.com/gogo/protobuf v1.0.0 // indirect
-	github.com/golang/protobuf v1.0.0 // indirect
+	github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect
+	github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61 // indirect
+	github.com/araddon/qlbridge v0.0.2
+	github.com/dchest/siphash v1.2.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/btree v1.0.0 // indirect
-	github.com/google/go-github v15.0.0+incompatible
-	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect
+	github.com/google/go-github v17.0.0+incompatible
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/uuid v1.2.0 // indirect
 	github.com/hashicorp/go-memdb v1.3.1 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/jmespath/go-jmespath v0.0.0-20151117175822-3433f3ea46d9 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jmoiron/sqlx v1.3.1 // indirect
 	github.com/leekchan/timeutil v0.0.0-20150802142658-28917288c48d // indirect
-	github.com/lytics/datemath v0.0.0-20161129202832-2c793e7cfff9 // indirect
+	github.com/lytics/datemath v0.0.0-20180727225141-3ada1c10b5de // indirect
 	github.com/lytics/logrus v0.0.0-20170528191427-4389a17ed024 // indirect
-	github.com/mattn/go-runewidth v0.0.2 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/mb0/glob v0.0.0-20160210091149-1eb79d2de6c4 // indirect
-	github.com/mssola/user_agent v0.4.1 // indirect
-	github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4
-	github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c // indirect
-	github.com/shurcooL/githubql v0.0.0-20180322230020-d8297a7d5a84
-	github.com/shurcooL/go v0.0.0-20180221041408-364c5ae8518b // indirect
-	github.com/shurcooL/graphql v0.0.0-20180302221403-3d276b9dcc6b // indirect
+	github.com/mssola/user_agent v0.5.3 // indirect
+	github.com/olekukonko/tablewriter v0.0.5
+	github.com/pborman/uuid v1.2.1 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/shurcooL/githubv4 v0.0.0-20201206200315-234843c633fa
+	github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect
 	github.com/simplereach/timeutils v1.2.0 // indirect
-	github.com/spf13/cobra v0.0.2
-	github.com/spf13/pflag v1.0.0 // indirect
+	github.com/spf13/cobra v1.1.3
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.7.0 // indirect
-	golang.org/x/net v0.0.0-20180320002117-6078986fec03
-	golang.org/x/oauth2 v0.0.0-20180314180239-fdc9e635145a
+	golang.org/x/net v0.0.0-20210525063256-abc453219eb5
+	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20180404071108-f67933eaf9e2 // indirect
-	google.golang.org/appengine v1.0.0 // indirect
+	golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
 )