Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the go-scm, docker/cli and docker/docker libraries. #4205

Merged
merged 1 commit into from
Sep 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.13
require (
github.com/aws/aws-sdk-go v1.31.12 // indirect
github.com/cloudevents/sdk-go/v2 v2.1.0
github.com/docker/cli v20.10.2+incompatible // indirect
github.com/docker/docker v20.10.2+incompatible // indirect
github.com/docker/cli v20.10.8+incompatible // indirect
github.com/docker/docker v20.10.8+incompatible // indirect
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
github.com/ghodss/yaml v1.0.0
github.com/go-openapi/spec v0.20.2
Expand All @@ -17,9 +17,8 @@ require (
github.com/googleapis/gnostic v0.5.3 // indirect
github.com/hashicorp/go-multierror v1.1.0
github.com/hashicorp/golang-lru v0.5.4
github.com/jenkins-x/go-scm v1.5.117
github.com/jenkins-x/go-scm v1.10.10
github.com/mitchellh/go-homedir v1.1.0
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 // indirect
github.com/pkg/errors v0.9.1
github.com/tektoncd/plumbing v0.0.0-20210514044347-f8a9689d5bd5
go.opencensus.io v0.23.0
Expand Down
28 changes: 20 additions & 8 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/pullrequest/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ func TestUpload_Invalid_Status(t *testing.T) {
}

expectedErrors := []string{
"invalid status: \"State\" is empty or has invalid value: {unknown Tekton Status with empty State field https://tekton.dev}",
"invalid status: \"Label\" should not be empty: {success Status without label https://tekton.dev}",
"invalid status: \"State\" is empty or has invalid value: {unknown Tekton Status with empty State field https://tekton.dev }",
"invalid status: \"Label\" should not be empty: {success Status without label https://tekton.dev }",
}
err := h.Upload(ctx, r)
if err == nil {
Expand Down
2 changes: 1 addition & 1 deletion test/pullrequest/testdata/golden/base.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Ref":"master","Sha":"c7becbd850add03130ec9797600711b0d6ecaf34","Repo":{"ID":"27785726","Namespace":"wlynch","Name":"test","FullName":"wlynch/test","Perm":{"Pull":false,"Push":false,"Admin":false},"Branch":"master","Private":false,"Clone":"https://github.com/wlynch/test.git","CloneSSH":"git@github.com:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}}
{"Ref":"master","Sha":"c7becbd850add03130ec9797600711b0d6ecaf34","Repo":{"ID":"27785726","Namespace":"wlynch","Name":"test","FullName":"wlynch/test","Perm":{"Pull":false,"Push":false,"Admin":false},"Branch":"master","Private":false,"Archived":false,"Clone":"https://github.com/wlynch/test.git","CloneSSH":"git@github.com:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}}
2 changes: 1 addition & 1 deletion test/pullrequest/testdata/golden/comments/494418247.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"ID":494418247,"Body":"test comment","Author":{"ID":0,"Login":"wlynch","Name":"","Email":"","Avatar":"https://avatars3.githubusercontent.com/u/1844673?v=4","Link":"","Created":"0001-01-01T00:00:00Z","Updated":"0001-01-01T00:00:00Z"},"Link":"https://github.com/wlynch/test/pull/1#issuecomment-494418247","Created":"2019-05-21T14:34:46Z","Updated":"2019-05-21T14:34:46Z"}
{"ID":494418247,"Body":"test comment","Author":{"ID":0,"Login":"wlynch","Name":"","Email":"","Avatar":"https://avatars3.githubusercontent.com/u/1844673?v=4","Link":"","Created":"0001-01-01T00:00:00Z","Updated":"0001-01-01T00:00:00Z"},"Link":"https://github.com/wlynch/test/pull/1#issuecomment-494418247","Version":0,"Created":"2019-05-21T14:34:46Z","Updated":"2019-05-21T14:34:46Z"}
2 changes: 1 addition & 1 deletion test/pullrequest/testdata/golden/head.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Ref":"dev","Sha":"db165c3a71dc45d096aebd0f49f07ec565ad1e08","Repo":{"ID":"27785726","Namespace":"wlynch","Name":"test","FullName":"wlynch/test","Perm":{"Pull":false,"Push":false,"Admin":false},"Branch":"master","Private":false,"Clone":"https://github.com/wlynch/test.git","CloneSSH":"git@github.com:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}}
{"Ref":"dev","Sha":"db165c3a71dc45d096aebd0f49f07ec565ad1e08","Repo":{"ID":"27785726","Namespace":"wlynch","Name":"test","FullName":"wlynch/test","Perm":{"Pull":false,"Push":false,"Admin":false},"Branch":"master","Private":false,"Archived":false,"Clone":"https://github.com/wlynch/test.git","CloneSSH":"git@github.com:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}}
2 changes: 1 addition & 1 deletion test/pullrequest/testdata/golden/pr.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Number":1,"Title":"test","Body":"","Labels":[{"ID":0,"URL":"https://api.github.com/repos/wlynch/test/labels/my-label","Name":"my-label","Description":"","Color":"ededed"}],"Sha":"db165c3a71dc45d096aebd0f49f07ec565ad1e08","Ref":"refs/pull/1/head","Source":"dev","Target":"master","Base":{"Ref":"master","Sha":"c7becbd850add03130ec9797600711b0d6ecaf34","Repo":{"ID":"27785726","Namespace":"wlynch","Name":"test","FullName":"wlynch/test","Perm":{"Pull":false,"Push":false,"Admin":false},"Branch":"master","Private":false,"Clone":"https://github.com/wlynch/test.git","CloneSSH":"git@github.com:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}},"Head":{"Ref":"dev","Sha":"db165c3a71dc45d096aebd0f49f07ec565ad1e08","Repo":{"ID":"27785726","Namespace":"wlynch","Name":"test","FullName":"wlynch/test","Perm":{"Pull":false,"Push":false,"Admin":false},"Branch":"master","Private":false,"Clone":"https://github.com/wlynch/test.git","CloneSSH":"git@github.com:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}},"Fork":"wlynch/test","Link":"https://github.com/wlynch/test/pull/1.diff","State":"open","Closed":false,"Draft":false,"Merged":false,"Mergeable":false,"Rebaseable":false,"MergeableState":"","MergeSha":"0b5320d67796506663ef41e5c5fa0b7bf8a06f58","Author":{"ID":1844673,"Login":"wlynch","Name":"","Email":"","Avatar":"https://avatars3.githubusercontent.com/u/1844673?v=4","Link":"https://github.com/wlynch","Created":"0001-01-01T00:00:00Z","Updated":"0001-01-01T00:00:00Z"},"Assignees":null,"Milestone":{"Number":0,"ID":0,"Title":"","Description":"","Link":"","State":""},"Created":"2018-05-15T16:22:34Z","Updated":"2019-12-26T16:37:05Z"}
{"Number":1,"Title":"test","Body":"","Labels":[{"ID":0,"URL":"https://api.github.com/repos/wlynch/test/labels/my-label","Name":"my-label","Description":"","Color":"ededed"}],"Sha":"db165c3a71dc45d096aebd0f49f07ec565ad1e08","Ref":"refs/pull/1/head","Source":"dev","Target":"master","Base":{"Ref":"master","Sha":"c7becbd850add03130ec9797600711b0d6ecaf34","Repo":{"ID":"27785726","Namespace":"wlynch","Name":"test","FullName":"wlynch/test","Perm":{"Pull":false,"Push":false,"Admin":false},"Branch":"master","Private":false,"Archived":false,"Clone":"https://github.com/wlynch/test.git","CloneSSH":"git@github.com:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}},"Head":{"Ref":"dev","Sha":"db165c3a71dc45d096aebd0f49f07ec565ad1e08","Repo":{"ID":"27785726","Namespace":"wlynch","Name":"test","FullName":"wlynch/test","Perm":{"Pull":false,"Push":false,"Admin":false},"Branch":"master","Private":false,"Archived":false,"Clone":"https://github.com/wlynch/test.git","CloneSSH":"git@github.com:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}},"Fork":"wlynch/test","State":"open","Closed":false,"Draft":false,"Merged":false,"Mergeable":false,"Rebaseable":false,"MergeableState":"","MergeSha":"0b5320d67796506663ef41e5c5fa0b7bf8a06f58","Author":{"ID":1844673,"Login":"wlynch","Name":"","Email":"","Avatar":"https://avatars3.githubusercontent.com/u/1844673?v=4","Link":"https://github.com/wlynch","Created":"0001-01-01T00:00:00Z","Updated":"0001-01-01T00:00:00Z"},"Assignees":null,"Reviewers":null,"Milestone":{"Number":0,"ID":0,"Title":"","Description":"","Link":"","State":"","DueDate":null},"Created":"2018-05-15T16:22:34Z","Updated":"2019-12-26T16:37:05Z","Link":"https://github.com/wlynch/test/pull/1","DiffLink":"https://github.com/wlynch/test/pull/1.diff"}
2 changes: 1 addition & 1 deletion test/pullrequest/testdata/golden/status/tekton-e2e.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"State":"success","Label":"tekton-e2e","Desc":"tekton-e2e","Target":"https://tekton.dev"}
{"State":"success","Label":"tekton-e2e","Desc":"tekton-e2e","Target":"https://tekton.dev", "Link":"https://api.github.com/repos/wlynch/test/statuses/db165c3a71dc45d096aebd0f49f07ec565ad1e08"}
Loading