Merge pull request drone#29 from jstrachan/stuff

fix: add another example program + add GraphQL api

Author: jenkins-x-bot

go.mod

@@ -1,8 +1,13 @@
 module github.com/jenkins-x/go-scm
 
 require (
+	github.com/ghodss/yaml v1.0.0
 	github.com/google/go-cmp v0.3.0
 	github.com/h2non/gock v1.0.9
+	github.com/pkg/errors v0.8.1
+	github.com/shurcooL/githubv4 v0.0.0-20190718010115-4ba037080260
+	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
+	github.com/sirupsen/logrus v1.4.2 // indirect
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76

go.sum

@@ -6,6 +6,8 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ
 github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -21,6 +23,7 @@ github.com/h2non/gock v1.0.9/go.mod h1:CZMcB0Lg5IWnr9bF79pPMg9WeV6WumxQiUJ1UvdO1
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -30,10 +33,20 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/shurcooL/githubv4 v0.0.0-20190718010115-4ba037080260 h1:xKXiRdBUtMVp64NaxACcyX4kvfmHJ9KrLU+JvyB1mdM=
+github.com/shurcooL/githubv4 v0.0.0-20190718010115-4ba037080260/go.mod h1:hAF0iLZy4td2EX+/8Tw+4nodhlMrwN3HupfaXj3zkGo=
+github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f h1:tygelZueB1EtXkPI6mQ4o9DQ0+FKW41hTbunoXZCTqk=
+github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f/go.mod h1:AuYgA5Kyo4c7HfUmvRGs/6rGlMMV/6B1bVnB9JxJEEg=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -48,6 +61,8 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -59,6 +74,7 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76 h1:vxMYBaJgczGAIpJAOBco2eHuFYIyDdNIebt60jxLauA=
 k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76/go.mod h1:M2fZgZL9DbLfeJaPBCDqSqNsdsmLN+V29knYJnIXlMA=

scm/client.go

@@ -75,6 +75,11 @@ type (
 		Size int
 	}
 
+	// GraphQLService the API to performing GraphQL queries
+	GraphQLService interface {
+		Query(ctx context.Context, q interface{}, vars map[string]interface{}) error
+	}
+
 	// Client manages communication with a version control
 	// system API.
 	Client struct {
@@ -97,6 +102,7 @@ type (
 		Reviews       ReviewService
 		Users         UserService
 		Webhooks      WebhookService
+		GraphQL       GraphQLService
 
 		// DumpResponse optionally specifies a function to
 		// dump the the response body for debugging purposes.

scm/const.go

@@ -6,6 +6,7 @@ package scm
 
 import (
 	"encoding/json"
+	"strings"
 )
 
 // State represents the commit state.
@@ -20,6 +21,7 @@ const (
 	StateFailure
 	StateCanceled
 	StateError
+	StateExpected
 )
 
 // String returns a string representation of the State
@@ -37,13 +39,37 @@ func (s State) String() string {
 		return "failure"
 	case StateCanceled:
 		return "cancelled"
+	case StateExpected:
+		return "expected"
 	case StateError:
 		return "error"
 	default:
 		return "unknown"
 	}
 }
 
+// ToState converts the given text to a state
+func ToState(s string) State {
+	switch strings.ToLower(s) {
+	case "pending":
+		return StatePending
+	case "running":
+		return StateRunning
+	case "success":
+		return StateSuccess
+	case "failure":
+		return StateFailure
+	case "cancelled":
+		return StateCanceled
+	case "expected":
+		return StateExpected
+	case "error":
+		return StateError
+	default:
+		return StateUnknown
+	}
+}
+
 // Action identifies webhook actions.
 type Action int
 

scm/driver/bitbucket/issue.go

@@ -14,6 +14,11 @@ type issueService struct {
 	client *wrapper
 }
 
+func (s *issueService) Search(context.Context, scm.SearchOptions) ([]*scm.SearchIssue, *scm.Response, error) {
+	// TODO implemment
+	return nil, nil, nil
+}
+
 func (s *issueService) AssignIssue(ctx context.Context, repo string, number int, logins []string) (*scm.Response, error) {
 	panic("implement me")
 }

scm/driver/fake/issue.go

@@ -16,6 +16,11 @@ type issueService struct {
 
 const botName = "k8s-ci-robot"
 
+func (s *issueService) Search(context.Context, scm.SearchOptions) ([]*scm.SearchIssue, *scm.Response, error) {
+	// TODO implemment
+	return nil, nil, nil
+}
+
 func (s *issueService) ListEvents(ctx context.Context, repo string, number int, opts scm.ListOptions) ([]*scm.ListedIssueEvent, *scm.Response, error) {
 	f := s.data
 	return append([]*scm.ListedIssueEvent{}, f.IssueEvents[number]...), nil, nil

scm/driver/gitea/issue.go

@@ -16,6 +16,11 @@ type issueService struct {
 	client *wrapper
 }
 
+func (s *issueService) Search(context.Context, scm.SearchOptions) ([]*scm.SearchIssue, *scm.Response, error) {
+	// TODO implemment
+	return nil, nil, nil
+}
+
 func (s *issueService) AssignIssue(ctx context.Context, repo string, number int, logins []string) (*scm.Response, error) {
 	panic("implement me")
 }

scm/driver/github/github.go

@@ -9,13 +9,22 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
+	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/jenkins-x/go-scm/scm"
+	githubql "github.com/shurcooL/githubv4"
 )
 
+// Abort requests that don't return in 5 mins. Longest graphql calls can
+// take up to 2 minutes. This limit should ensure all successful calls return
+// but will prevent an indefinite stall if GitHub never responds.
+const maxRequestTime = 5 * time.Minute
+
 // New returns a new GitHub API client.
 func New(uri string) (*scm.Client, error) {
 	base, err := url.Parse(uri)
@@ -38,9 +47,37 @@ func New(uri string) (*scm.Client, error) {
 	client.Reviews = &reviewService{client}
 	client.Users = &userService{client}
 	client.Webhooks = &webhookService{client}
+
+	graphqlEndpoint := scm.UrlJoin(uri, "/graphql")
+	client.GraphQL = &dynamicGraphQLClient{client, graphqlEndpoint}
+
 	return client.Client, nil
 }
 
+type dynamicGraphQLClient struct {
+	wrapper         *wrapper
+	graphqlEndpoint string
+}
+
+func (d *dynamicGraphQLClient) Query(ctx context.Context, q interface{}, vars map[string]interface{}) error {
+	httpClient := d.wrapper.Client.Client
+	if httpClient != nil {
+
+		transport := httpClient.Transport
+		if transport != nil {
+			query := githubql.NewEnterpriseClient(
+				d.graphqlEndpoint,
+				&http.Client{
+					Timeout:   maxRequestTime,
+					Transport: transport,
+				})
+			return query.Query(ctx, q, vars)
+		}
+	}
+	fmt.Println("WARNING: no http transport configured for GraphQL and GitHub")
+	return nil
+}
+
 // NewDefault returns a new GitHub API client using the
 // default api.github.com address.
 func NewDefault() *scm.Client {

scm/driver/github/issue.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/jenkins-x/go-scm/scm"
@@ -17,6 +18,36 @@ type issueService struct {
 	client *wrapper
 }
 
+type searchIssue struct {
+	issue
+	Score             float32 `json:"score"`
+	AuthorAssociation string  `json:"author_association"`
+	URL               string  `json:"url"`
+	RepositoryURL     string  `json:"repository_url"`
+	LabelsURL         string  `json:"labels_url"`
+	CommentsURL       string  `json:"comments_url"`
+	EventsURL         string  `json:"events_url"`
+	Comments          int     `json:"comments"`
+}
+
+type searchResults struct {
+	TotalCount        int            `json:"total_count"`
+	IncompleteResults bool           `json:"incomplete_results"`
+	Items             []*searchIssue `json:"items"`
+}
+
+func (s *issueService) Search(ctx context.Context, opts scm.SearchOptions) ([]*scm.SearchIssue, *scm.Response, error) {
+	suffix := encodeIssueSearchOptions(opts)
+	query := opts.QueryArgument()
+	if suffix != "" {
+		query += "&" + suffix
+	}
+	path := fmt.Sprintf("/search/issues?q=%s", query)
+	out := searchResults{}
+	res, err := s.client.do(ctx, "GET", path, nil, &out)
+	return convertSearchIssueList(out.Items), res, err
+}
+
 // AssignIssue adds logins to org/repo#number, returning an error if any login is missing after making the call.
 //
 // See https://developer.github.com/v3/issues/assignees/#add-assignees-to-an-issue
@@ -237,6 +268,35 @@ func convertIssueList(from []*issue) []*scm.Issue {
 	return to
 }
 
+// helper function to convert from the gogs issue list to
+// the common issue structure.
+func convertSearchIssueList(from []*searchIssue) []*scm.SearchIssue {
+	to := []*scm.SearchIssue{}
+	for _, v := range from {
+		issue := convertIssue(&v.issue)
+		searchIssue := &scm.SearchIssue{
+			Issue: *issue,
+		}
+		populateRepositoryFromURL(&searchIssue.Repository, v.RepositoryURL)
+		to = append(to, searchIssue)
+	}
+	return to
+}
+
+func populateRepositoryFromURL(repo *scm.Repository, u string) {
+	if u == "" {
+		return
+	}
+	paths := strings.Split(strings.TrimSuffix(u, "/"), "/")
+	l := len(paths)
+	if l > 0 {
+		repo.Name = paths[l-1]
+	}
+	if l > 1 {
+		repo.Namespace = paths[l-2]
+	}
+}
+
 // helper function to convert from the gogs issue structure to
 // the common issue structure.
 func convertIssue(from *issue) *scm.Issue {