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

Both of these were quite out of date and have enough transitive dependencies
that it's worth keeping closer to HEAD. It might be possible to detangle and
update separately, but I couldn't get it to work on my first try.

There was one manual change to error strings in pkg/pullrequest/api_test.go.
I also had to re-run codegen and update the golden test data for new fields..

Signed-off-by: Dan Lorenc <[email protected]>

go.mod

@@ -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
@@ -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

pkg/pullrequest/api_test.go

@@ -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 {

test/pullrequest/testdata/golden/base.json

@@ -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":"[email protected]: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":"[email protected]:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}}

test/pullrequest/testdata/golden/comments/494418247.json

@@ -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"}

test/pullrequest/testdata/golden/head.json

@@ -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":"[email protected]: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":"[email protected]:wlynch/test.git","Link":"https://github.com/wlynch/test","Created":"2014-12-09T20:32:35Z","Updated":"2020-01-10T18:34:39Z"}}

test/pullrequest/testdata/golden/pr.json

@@ -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":"[email protected]: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":"[email protected]: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":"[email protected]: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":"[email protected]: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"}

test/pullrequest/testdata/golden/status/tekton-e2e.json

@@ -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"}