Merge pull request #394 from ankitm123/fix-scm

fix: bump go-scm
jenkins-x-plugins · Mar 24, 2022 · 4dfa928 · 4dfa928
2 parents 874e8d0 + 2102431
commit 4dfa928
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/OWNERS b/OWNERS
@@ -3,8 +3,12 @@ approvers:
 - jstrachan
 - rajdavies
 - tomhobson
+- ankitm123
+- babadofar
 reviewers:
 - rawlingsj
 - jstrachan
 - rajdavies
 - tomhobson
+- ankitm123
+- babadofar
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
 	github.com/hashicorp/vault/api v1.0.5-0.20190909201928-35325e2c3262 // indirect
 	github.com/jenkins-x-plugins/jx-gitops v0.3.13
-	github.com/jenkins-x/go-scm v1.10.10
+	github.com/jenkins-x/go-scm v1.11.4
 	github.com/jenkins-x/jx-api/v4 v4.1.5
 	github.com/jenkins-x/jx-helpers/v3 v3.0.127
 	github.com/jenkins-x/jx-logging/v3 v3.0.6

diff --git a/go.sum b/go.sum
@@ -729,8 +729,9 @@ github.com/jenkins-x-plugins/jx-gitops v0.3.13 h1:cgVjWK5xROCCa/6iMfjhGmywGtaWRW
 github.com/jenkins-x-plugins/jx-gitops v0.3.13/go.mod h1:ItVSTOif+r5n9K2hCPg42O67NHwVj1jRZ2NsVpIMNiY=
 github.com/jenkins-x/gen-crd-api-reference-docs v0.1.6/go.mod h1:a4dzSf/nNLMMMqultm6IlV/04xq26uICEYPkSTOahWQ=
 github.com/jenkins-x/go-scm v1.5.117/go.mod h1:PCT338UhP/pQ0IeEeMEf/hoLTYKcH7qjGEKd7jPkeYg=
-github.com/jenkins-x/go-scm v1.10.10 h1:Fuxje/9mHONI7+AQ32N/S9CXWt/0hVStbj8dBVraQz4=
 github.com/jenkins-x/go-scm v1.10.10/go.mod h1:z7xTO9/VzqW3xEbEMH2z5cpOGrZ8+nOHOWfU1ngFGxs=
+github.com/jenkins-x/go-scm v1.11.4 h1:uYEFE4Ty9nmlo8paG4ysSxmO5ii6uj7nCQIsSh+ppXU=
+github.com/jenkins-x/go-scm v1.11.4/go.mod h1:8zDNVAps5UCZ7nDVBCzkIrPaSGN4vHq+1bDrHLk6JJc=
 github.com/jenkins-x/jx-api/v4 v4.1.5 h1:EIEuEMs7qCVvU4c9YfViStH3CIMTcpdXy0jZS436ESk=
 github.com/jenkins-x/jx-api/v4 v4.1.5/go.mod h1:l11kHlFy40UGu9pdhCRxDiJcEgRubSVzybWB2jXjLcs=
 github.com/jenkins-x/jx-helpers/v3 v3.0.127 h1:9jfbCOMGaYOFLHMb9I6nvFi3WIeTiR2nW4gpHVB+fVY=

diff --git a/pkg/environments/gitops.go b/pkg/environments/gitops.go
@@ -170,7 +170,7 @@ func (o *EnvironmentPullRequestOptions) FindExistingPullRequest(scmClient *scm.C
 	}
 	ctx := context.Background()
 	labels := o.PullRequestFilter.Labels
-	prs, _, err := scmClient.PullRequests.List(ctx, repoFullName, scm.PullRequestListOptions{
+	prs, _, err := scmClient.PullRequests.List(ctx, repoFullName, &scm.PullRequestListOptions{
 		Size:   100,
 		Open:   true,
 		Labels: labels,

diff --git a/pkg/promote/promote_integration_test.go b/pkg/promote/promote_integration_test.go
@@ -489,7 +489,7 @@ func TestPromoteHelmfileAllAutomaticsInOneOrMorePRs(t *testing.T) {
 		ctx := context.Background()
 
 		for repoFullName, expectedCount := range tc.expectedPullRequestCount {
-			prs, _, err := scmClient.PullRequests.List(ctx, repoFullName, scm.PullRequestListOptions{
+			prs, _, err := scmClient.PullRequests.List(ctx, repoFullName, &scm.PullRequestListOptions{
 				Size: 100,
 				Open: true,
 			})