chore(deps): update dependencies (#51)

* update sprig

* fix linting

* fix(lint): update linter

---------

Co-authored-by: I503834 <jan.fokken@sap.com>

Author: blackhatcrazy

.buildvars.yml

@@ -1,5 +1,5 @@
 go_version: "1.20"
-golangci_version: v1.52.2
+golangci_version: v1.55.2
 goreleaser_version: v1.16.2
 
-coverage_min: 80
+coverage_min: 80

.golangci.yml

@@ -3,18 +3,16 @@ run:
   tests: true
   skip-dirs-use-default: true
   skip-files:
-  - ".*tmp/.*.go$"
+    - ".*tmp/.*.go$"
 linters-settings:
   depguard:
-    list-type: denylist
-    packages:
-      # logging is allowed only by logutils.Log, logrus
-      # is allowed to use only in logutils package
-      - github.com/sirupsen/logrus
-      - logutils.Log
-    packages-with-error-message:
-      - github.com/sirupsen/logrus: "logging is allowed only by the local log package"
-      - logutils.Log: "logging is allowed only by the local log package"
+    rules:
+      main:
+        deny:
+          - pkg: "github.com/sirupsen/logrus"
+            desc: "logging is allowed only by the local log package"
+          - pkg: "logutils.Log"
+            desc: "logging is allowed only by the local log package"
   dupl:
     threshold: 100
   funlen:
@@ -47,10 +45,10 @@ linters-settings:
       - condition
       - return
     ignored-numbers:
-      - '0'
-      - '1'
-      - '2'
-      - '3'
+      - "0"
+      - "1"
+      - "2"
+      - "3"
     ignored-functions:
       - strings.SplitN
   revive:
@@ -124,4 +122,4 @@ linters:
   # - nestif
   # - prealloc
   # - testpackage
-  # - wsl
+  # - wsl

cmd/coco/commands/root.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/SAP/configuration-tools-for-gitops/v2/pkg/git"
 	"github.com/SAP/configuration-tools-for-gitops/v2/pkg/log"
 	"github.com/SAP/configuration-tools-for-gitops/v2/pkg/version"
 	"github.com/spf13/cobra"
@@ -152,13 +151,8 @@ func initConfig() {
 	}
 
 	if ok := consistentGitSetup(
-		viper.GetString(gitPathKey),
 		viper.GetString(gitURLKey),
-		viper.GetString("git-token"),
 		viper.GetString(gitRemoteKey),
-		viper.GetString("git.defaultBranch"),
-		overWriteGitDepth, // viper.GetInt(gitDepth),
-		logLvl,
 	); !ok {
 		os.Exit(1)
 	}
@@ -176,9 +170,7 @@ func initConfig() {
 	}
 }
 
-func consistentGitSetup(
-	path, url, token, remote, defaultBranch string, gitDepth int, logLvl log.Level,
-) bool {
+func consistentGitSetup(url, remote string) bool {
 	if remote == "" {
 		return true
 	}
@@ -197,14 +189,6 @@ func consistentGitSetup(
 		)
 		return false
 	}
-	if _, err := git.New(
-		path, url, token, remote, defaultBranch, gitDepth, logLvl,
-	); err != nil {
-		log.Sugar.Errorf(
-			"failed to validate repository in path \"%s\": %s", path, err,
-		)
-		return false
-	}
 	return true
 }
 

cmd/coco/dependencies/graph.go

@@ -39,7 +39,7 @@ func constructGraph(path, depFileName string) (
 ) {
 	fs, err := dependencies(path, depFileName, []string{}, []string{}, []string{})
 	if err != nil {
-		return
+		return nil, nil, err
 	}
 
 	downToUp = make(g.DownToUp, len(fs))

cmd/coco/generate/templatefunctions.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	gotemplate "text/template"
 
-	"github.com/Masterminds/sprig"
+	"github.com/Masterminds/sprig/v3"
 )
 
 func tmplFuncs() gotemplate.FuncMap {

go.mod

@@ -3,66 +3,69 @@ module github.com/SAP/configuration-tools-for-gitops/v2
 go 1.20
 
 require (
-	github.com/Masterminds/sprig v2.22.0+incompatible
-	github.com/fatih/color v1.15.0
-	github.com/go-git/go-billy/v5 v5.4.1
-	github.com/go-git/go-git/v5 v5.7.0
+	github.com/Masterminds/sprig/v3 v3.2.3
+	github.com/fatih/color v1.16.0
+	github.com/go-git/go-billy/v5 v5.5.0
+	github.com/go-git/go-git/v5 v5.11.0
 	github.com/google/go-github/v51 v51.0.0
-	github.com/spf13/cobra v1.7.0
+	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.16.0
+	github.com/spf13/viper v1.18.2
 	github.com/yourbasic/graph v0.0.0-20210606180040-8ecfec1c2869
-	go.uber.org/zap v1.24.0
-	golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
-	golang.org/x/oauth2 v0.9.0
-	golang.org/x/sys v0.13.0
+	go.uber.org/zap v1.26.0
+	golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
+	golang.org/x/oauth2 v0.15.0
+	golang.org/x/sys v0.15.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	dario.cat/mergo v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver v1.5.0 // indirect
+	github.com/Masterminds/semver/v3 v3.2.1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec // indirect
-	github.com/acomagu/bufpipe v1.0.4 // indirect
-	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/imdario/mergo v0.3.11 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/skeema/knownhosts v1.1.1 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/skeema/knownhosts v1.2.1 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/mod v0.11.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.10.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.16.1 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )