fix: golang and libraries (#15)

isindir · Jun 4, 2022 · b1a6d7f · b1a6d7f
1 parent d343eb5
commit b1a6d7f
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 71 deletions.
diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
@@ -17,13 +17,13 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.17.8
+        go-version: "1.18.3"
       id: go
 
     - name: Install GoReleaser
       uses: goreleaser/goreleaser-action@v2
       with:
-        version: v1.6.3
+        version: v1.9.2
         install-only: true
 
     - name: Check out code into the Go module directory
@@ -47,13 +47,13 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.17.8
+        go-version: "1.18"
       id: go
 
     - name: Install GoReleaser
       uses: goreleaser/goreleaser-action@v2
       with:
-        version: v1.6.3
+        version: v1.7.0
         install-only: true
 
     - name: Install svu

diff --git a/.tool-versions b/.tool-versions
@@ -1,7 +1,7 @@
 # UPDATE_HERE
 # https://golang.org/dl/
-golang 1.17.8
+golang 1.18.3
 # https://github.com/goreleaser/goreleaser/releases
-goreleaser 1.6.3
+goreleaser 1.9.2
 # https://github.com/vektra/mockery/releases
-mockery 2.10.0
+mockery 2.12.3
diff --git a/bitbucket/bitbucket.go b/bitbucket/bitbucket.go
@@ -151,8 +151,8 @@ func FetchOwnerRepos(repoSha, owner, bitbucketRole string) []bitbucket.Repositor
 
 	if repos != nil && len(repos.Items) > 0 && err == nil {
 		log.Debugf(
-			"%s: Page: %d, Pagelen: %d, MaxDepth: %d, Size: %d",
-			repoSha, repos.Page, repos.Pagelen, repos.MaxDepth, repos.Size)
+			"%s: Page: %d, Pagelen: %d, Size: %d",
+			repoSha, repos.Page, repos.Pagelen, repos.Size)
 		reposToReutrn = repos.Items
 	} else {
 		log.Errorf("%s: Can't fetch repository list for '%s' '%+v'", repoSha, owner, err)

diff --git a/exec/mocks/ShellRunnerI.go b/exec/mocks/ShellRunnerI.go
diff --git a/github/github.go b/github/github.go
@@ -27,7 +27,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/google/go-github/v43/github"
+	"github.com/google/go-github/v45/github"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"

diff --git a/gitlab/gitlab.go b/gitlab/gitlab.go
@@ -218,7 +218,7 @@ func (gitProvider *GitGetGitlab) processSubgroups(
 		PerPage: 30,
 	}
 
-	subGrpOpt := &gitlab.ListSubgroupsOptions{
+	subGrpOpt := &gitlab.ListSubGroupsOptions{
 		ListOptions:  lstOpts,
 		AllAvailable: gitlab.Bool(true),
 		TopLevelOnly: gitlab.Bool(false),
@@ -251,7 +251,7 @@ func (gitProvider *GitGetGitlab) processSubgroups(
 		log.Debugf(
 			"%s: Fetching group '%d:%s' subgroups - page '%d'",
 			repoSha, groupID, groupName, subGrpOpt.ListOptions.Page)
-		groups, res, err := git.Groups.ListSubgroups(groupID, subGrpOpt, nil)
+		groups, res, err := git.Groups.ListSubGroups(groupID, subGrpOpt, nil)
 		if err != nil {
 			log.Errorf(
 				"%s: Error while trying to get subgroups for '%d:%s': %s",

diff --git a/gitlab/mocks/GitGetGitlabI.go b/gitlab/mocks/GitGetGitlabI.go
diff --git a/go.mod b/go.mod
@@ -1,18 +1,18 @@
 module github.com/isindir/git-get
 
 // UPDATE_HERE
-go 1.17
+go 1.18
 
 require (
 	github.com/fatih/color v1.13.0
-	github.com/google/go-github/v43 v43.0.0
-	github.com/ktrysmt/go-bitbucket v0.9.39
+	github.com/google/go-github/v45 v45.0.0
+	github.com/ktrysmt/go-bitbucket v0.9.46
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.4.0
 	github.com/stretchr/testify v1.7.0
-	github.com/xanzy/go-gitlab v0.59.0
-	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
-	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
+	github.com/xanzy/go-gitlab v0.68.0
+	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2
+	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -21,18 +21,18 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.1.1 // indirect
+	github.com/stretchr/objx v0.1.0 // indirect
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
-	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )