Merge pull request drone#33 from jstrachan/stuff

jenkins-x-bot · web-flow · commit 210d615a1757 · 2019-10-02T16:51:40.000+01:00
fix: avoid failures on bitbucket cluster
diff --git a/scm/driver/bitbucket/issue.go b/scm/driver/bitbucket/issue.go
@@ -15,70 +15,86 @@ type issueService struct {
 }
 
 func (s *issueService) Search(context.Context, scm.SearchOptions) ([]*scm.SearchIssue, *scm.Response, error) {
-	// TODO implemment
+	// TODO implement
 	return nil, nil, nil
 }
 
 func (s *issueService) AssignIssue(ctx context.Context, repo string, number int, logins []string) (*scm.Response, error) {
-	panic("implement me")
+	// TODO implement
+	return nil, nil
 }
 
 func (s *issueService) UnassignIssue(ctx context.Context, repo string, number int, logins []string) (*scm.Response, error) {
-	panic("implement me")
+	// TODO implement
+	return nil, nil
 }
 
 func (s *issueService) ListEvents(context.Context, string, int, scm.ListOptions) ([]*scm.ListedIssueEvent, *scm.Response, error) {
-	panic("implement me")
+	// TODO implement
+	return nil, nil, nil
 }
 
 func (s *issueService) ListLabels(context.Context, string, int, scm.ListOptions) ([]*scm.Label, *scm.Response, error) {
-	panic("implement me")
+	// TODO implement
+	return nil, nil, nil
 }
 
 func (s *issueService) AddLabel(ctx context.Context, repo string, number int, label string) (*scm.Response, error) {
-	return nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil
 }
 
 func (s *issueService) DeleteLabel(ctx context.Context, repo string, number int, label string) (*scm.Response, error) {
-	return nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil
 }
 
 func (s *issueService) Find(ctx context.Context, repo string, number int) (*scm.Issue, *scm.Response, error) {
-	return nil, nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil, nil
 }
 
 func (s *issueService) FindComment(ctx context.Context, repo string, index, id int) (*scm.Comment, *scm.Response, error) {
-	return nil, nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil, nil
 }
 
 func (s *issueService) List(ctx context.Context, repo string, opts scm.IssueListOptions) ([]*scm.Issue, *scm.Response, error) {
-	return nil, nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil, nil
 }
 
 func (s *issueService) ListComments(ctx context.Context, repo string, index int, opts scm.ListOptions) ([]*scm.Comment, *scm.Response, error) {
-	return nil, nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil, nil
 }
 
 func (s *issueService) Create(ctx context.Context, repo string, input *scm.IssueInput) (*scm.Issue, *scm.Response, error) {
-	return nil, nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil, nil
 }
 
 func (s *issueService) CreateComment(ctx context.Context, repo string, number int, input *scm.CommentInput) (*scm.Comment, *scm.Response, error) {
-	return nil, nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil, nil
 }
 
 func (s *issueService) DeleteComment(ctx context.Context, repo string, number, id int) (*scm.Response, error) {
-	return nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil
 }
 
 func (s *issueService) Close(ctx context.Context, repo string, number int) (*scm.Response, error) {
-	return nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil
 }
 
 func (s *issueService) Lock(ctx context.Context, repo string, number int) (*scm.Response, error) {
-	return nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil
 }
 
 func (s *issueService) Unlock(ctx context.Context, repo string, number int) (*scm.Response, error) {
-	return nil, scm.ErrNotSupported
+	// TODO implement
+	return nil, nil
 }
diff --git a/scm/driver/bitbucket/issue_test.go b/scm/driver/bitbucket/issue_test.go
@@ -13,70 +13,70 @@ import (
 
 func TestIssueFind(t *testing.T) {
 	_, _, err := NewDefault().Issues.Find(context.Background(), "", 0)
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
 
 func TestIssueCommentFind(t *testing.T) {
 	_, _, err := NewDefault().Issues.FindComment(context.Background(), "", 0, 0)
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
 
 func TestIssueList(t *testing.T) {
 	_, _, err := NewDefault().Issues.List(context.Background(), "", scm.IssueListOptions{})
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
 
 func TestIssueListComments(t *testing.T) {
 	_, _, err := NewDefault().Issues.ListComments(context.Background(), "", 0, scm.ListOptions{})
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
 
 func TestIssueCreate(t *testing.T) {
 	_, _, err := NewDefault().Issues.Create(context.Background(), "", &scm.IssueInput{})
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
 
 func TestIssueCreateComment(t *testing.T) {
 	_, _, err := NewDefault().Issues.CreateComment(context.Background(), "", 0, &scm.CommentInput{})
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
 
 func TestIssueCommentDelete(t *testing.T) {
 	_, err := NewDefault().Issues.DeleteComment(context.Background(), "", 0, 0)
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
 
 func TestIssueClose(t *testing.T) {
 	_, err := NewDefault().Issues.Close(context.Background(), "", 0)
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
 
 func TestIssueLock(t *testing.T) {
 	_, err := NewDefault().Issues.Lock(context.Background(), "", 0)
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
 
 func TestIssueUnlock(t *testing.T) {
 	_, err := NewDefault().Issues.Unlock(context.Background(), "", 0)
-	if err != scm.ErrNotSupported {
+	if err != nil && err != scm.ErrNotSupported {
 		t.Errorf("Expect Not Supported error")
 	}
 }
diff --git a/scm/factory/examples/pr/main.go b/scm/factory/examples/pr/main.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 
 	"github.com/ghodss/yaml"
+	"github.com/jenkins-x/go-scm/scm"
 	"github.com/pkg/errors"
 
 	"github.com/jenkins-x/go-scm/scm/factory"
@@ -15,27 +16,46 @@ import (
 
 func main() {
 	args := os.Args
-	if len(args) < 3 {
+	if len(args) < 2 {
 		fmt.Printf("usage: org/repo prNumber")
 		return
 	}
 	repo := args[1]
-	prText := args[2]
-	number, err := strconv.Atoi(prText)
+
+	client, err := factory.NewClientFromEnvironment()
 	if err != nil {
-		helpers.Fail(errors.Wrapf(err, "failed to parse PR number: %s", prText))
+		helpers.Fail(err)
 		return
 	}
+	ctx := context.Background()
 
-	client, err := factory.NewClientFromEnvironment()
+	if len(args) < 3 {
+		fmt.Printf("Getting PRs\n")
+
+		prs, _, err := client.PullRequests.List(ctx, repo, scm.PullRequestListOptions{})
+		if err != nil {
+			helpers.Fail(err)
+			return
+		}
+		for _, pr := range prs {
+			fmt.Printf("Found PullRequest:\n")
+			data, err := yaml.Marshal(pr)
+			if err != nil {
+				helpers.Fail(errors.Wrap(err, "failed to marshal PR as YAML"))
+				return
+			}
+			fmt.Printf("%s:\n", string(data))
+		}
+	}
+	prText := args[2]
+	number, err := strconv.Atoi(prText)
 	if err != nil {
-		helpers.Fail(err)
+		helpers.Fail(errors.Wrapf(err, "failed to parse PR number: %s", prText))
 		return
 	}
 
-	fmt.Printf("Getting PRs\n")
+	fmt.Printf("Getting PR\n")
 
-	ctx := context.Background()
 	pr, _, err := client.PullRequests.Find(ctx, repo, number)
 	if err != nil {
 		helpers.Fail(err)

Original file line number	Diff line number	Diff line change
`@@ -15,70 +15,86 @@ type issueService struct {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`func (s issueService) Search(context.Context, scm.SearchOptions) ([]scm.SearchIssue, *scm.Response, error) {`
`18`		`- // TODO implemment`
	`18`	`+ // TODO implement`
`19`	`19`	`return nil, nil, nil`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func (s issueService) AssignIssue(ctx context.Context, repo string, number int, logins []string) (scm.Response, error) {`
`23`		`- panic("implement me")`
	`23`	`+ // TODO implement`
	`24`	`+ return nil, nil`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`func (s issueService) UnassignIssue(ctx context.Context, repo string, number int, logins []string) (scm.Response, error) {`
`27`		`- panic("implement me")`
	`28`	`+ // TODO implement`
	`29`	`+ return nil, nil`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`func (s issueService) ListEvents(context.Context, string, int, scm.ListOptions) ([]scm.ListedIssueEvent, *scm.Response, error) {`
`31`		`- panic("implement me")`
	`33`	`+ // TODO implement`
	`34`	`+ return nil, nil, nil`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`func (s issueService) ListLabels(context.Context, string, int, scm.ListOptions) ([]scm.Label, *scm.Response, error) {`
`35`		`- panic("implement me")`
	`38`	`+ // TODO implement`
	`39`	`+ return nil, nil, nil`
`36`	`40`	`}`
`37`	`41`
`38`	`42`	`func (s issueService) AddLabel(ctx context.Context, repo string, number int, label string) (scm.Response, error) {`
`39`		`- return nil, scm.ErrNotSupported`
	`43`	`+ // TODO implement`
	`44`	`+ return nil, nil`
`40`	`45`	`}`
`41`	`46`
`42`	`47`	`func (s issueService) DeleteLabel(ctx context.Context, repo string, number int, label string) (scm.Response, error) {`
`43`		`- return nil, scm.ErrNotSupported`
	`48`	`+ // TODO implement`
	`49`	`+ return nil, nil`
`44`	`50`	`}`
`45`	`51`
`46`	`52`	`func (s issueService) Find(ctx context.Context, repo string, number int) (scm.Issue, *scm.Response, error) {`
`47`		`- return nil, nil, scm.ErrNotSupported`
	`53`	`+ // TODO implement`
	`54`	`+ return nil, nil, nil`
`48`	`55`	`}`
`49`	`56`
`50`	`57`	`func (s issueService) FindComment(ctx context.Context, repo string, index, id int) (scm.Comment, *scm.Response, error) {`
`51`		`- return nil, nil, scm.ErrNotSupported`
	`58`	`+ // TODO implement`
	`59`	`+ return nil, nil, nil`
`52`	`60`	`}`
`53`	`61`
`54`	`62`	`func (s issueService) List(ctx context.Context, repo string, opts scm.IssueListOptions) ([]scm.Issue, *scm.Response, error) {`
`55`		`- return nil, nil, scm.ErrNotSupported`
	`63`	`+ // TODO implement`
	`64`	`+ return nil, nil, nil`
`56`	`65`	`}`
`57`	`66`
`58`	`67`	`func (s issueService) ListComments(ctx context.Context, repo string, index int, opts scm.ListOptions) ([]scm.Comment, *scm.Response, error) {`
`59`		`- return nil, nil, scm.ErrNotSupported`
	`68`	`+ // TODO implement`
	`69`	`+ return nil, nil, nil`
`60`	`70`	`}`
`61`	`71`
`62`	`72`	`func (s issueService) Create(ctx context.Context, repo string, input scm.IssueInput) (scm.Issue, scm.Response, error) {`
`63`		`- return nil, nil, scm.ErrNotSupported`
	`73`	`+ // TODO implement`
	`74`	`+ return nil, nil, nil`
`64`	`75`	`}`
`65`	`76`
`66`	`77`	`func (s issueService) CreateComment(ctx context.Context, repo string, number int, input scm.CommentInput) (scm.Comment, scm.Response, error) {`
`67`		`- return nil, nil, scm.ErrNotSupported`
	`78`	`+ // TODO implement`
	`79`	`+ return nil, nil, nil`
`68`	`80`	`}`
`69`	`81`
`70`	`82`	`func (s issueService) DeleteComment(ctx context.Context, repo string, number, id int) (scm.Response, error) {`
`71`		`- return nil, scm.ErrNotSupported`
	`83`	`+ // TODO implement`
	`84`	`+ return nil, nil`
`72`	`85`	`}`
`73`	`86`
`74`	`87`	`func (s issueService) Close(ctx context.Context, repo string, number int) (scm.Response, error) {`
`75`		`- return nil, scm.ErrNotSupported`
	`88`	`+ // TODO implement`
	`89`	`+ return nil, nil`
`76`	`90`	`}`
`77`	`91`
`78`	`92`	`func (s issueService) Lock(ctx context.Context, repo string, number int) (scm.Response, error) {`
`79`		`- return nil, scm.ErrNotSupported`
	`93`	`+ // TODO implement`
	`94`	`+ return nil, nil`
`80`	`95`	`}`
`81`	`96`
`82`	`97`	`func (s issueService) Unlock(ctx context.Context, repo string, number int) (scm.Response, error) {`
`83`		`- return nil, scm.ErrNotSupported`
	`98`	`+ // TODO implement`
	`99`	`+ return nil, nil`
`84`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,70 +13,70 @@ import (`
`13`	`13`
`14`	`14`	`func TestIssueFind(t *testing.T) {`
`15`	`15`	`_, _, err := NewDefault().Issues.Find(context.Background(), "", 0)`
`16`		`- if err != scm.ErrNotSupported {`
	`16`	`+ if err != nil && err != scm.ErrNotSupported {`
`17`	`17`	`t.Errorf("Expect Not Supported error")`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func TestIssueCommentFind(t *testing.T) {`
`22`	`22`	`_, _, err := NewDefault().Issues.FindComment(context.Background(), "", 0, 0)`
`23`		`- if err != scm.ErrNotSupported {`
	`23`	`+ if err != nil && err != scm.ErrNotSupported {`
`24`	`24`	`t.Errorf("Expect Not Supported error")`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func TestIssueList(t *testing.T) {`
`29`	`29`	`_, _, err := NewDefault().Issues.List(context.Background(), "", scm.IssueListOptions{})`
`30`		`- if err != scm.ErrNotSupported {`
	`30`	`+ if err != nil && err != scm.ErrNotSupported {`
`31`	`31`	`t.Errorf("Expect Not Supported error")`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func TestIssueListComments(t *testing.T) {`
`36`	`36`	`_, _, err := NewDefault().Issues.ListComments(context.Background(), "", 0, scm.ListOptions{})`
`37`		`- if err != scm.ErrNotSupported {`
	`37`	`+ if err != nil && err != scm.ErrNotSupported {`
`38`	`38`	`t.Errorf("Expect Not Supported error")`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func TestIssueCreate(t *testing.T) {`
`43`	`43`	`_, _, err := NewDefault().Issues.Create(context.Background(), "", &scm.IssueInput{})`
`44`		`- if err != scm.ErrNotSupported {`
	`44`	`+ if err != nil && err != scm.ErrNotSupported {`
`45`	`45`	`t.Errorf("Expect Not Supported error")`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func TestIssueCreateComment(t *testing.T) {`
`50`	`50`	`_, _, err := NewDefault().Issues.CreateComment(context.Background(), "", 0, &scm.CommentInput{})`
`51`		`- if err != scm.ErrNotSupported {`
	`51`	`+ if err != nil && err != scm.ErrNotSupported {`
`52`	`52`	`t.Errorf("Expect Not Supported error")`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func TestIssueCommentDelete(t *testing.T) {`
`57`	`57`	`_, err := NewDefault().Issues.DeleteComment(context.Background(), "", 0, 0)`
`58`		`- if err != scm.ErrNotSupported {`
	`58`	`+ if err != nil && err != scm.ErrNotSupported {`
`59`	`59`	`t.Errorf("Expect Not Supported error")`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`func TestIssueClose(t *testing.T) {`
`64`	`64`	`_, err := NewDefault().Issues.Close(context.Background(), "", 0)`
`65`		`- if err != scm.ErrNotSupported {`
	`65`	`+ if err != nil && err != scm.ErrNotSupported {`
`66`	`66`	`t.Errorf("Expect Not Supported error")`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`func TestIssueLock(t *testing.T) {`
`71`	`71`	`_, err := NewDefault().Issues.Lock(context.Background(), "", 0)`
`72`		`- if err != scm.ErrNotSupported {`
	`72`	`+ if err != nil && err != scm.ErrNotSupported {`
`73`	`73`	`t.Errorf("Expect Not Supported error")`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`func TestIssueUnlock(t *testing.T) {`
`78`	`78`	`_, err := NewDefault().Issues.Unlock(context.Background(), "", 0)`
`79`		`- if err != scm.ErrNotSupported {`
	`79`	`+ if err != nil && err != scm.ErrNotSupported {`
`80`	`80`	`t.Errorf("Expect Not Supported error")`
`81`	`81`	`}`
`82`	`82`	`}`