style: Upgrade linter and patch code

oxyno-zeta · oxyno-zeta · commit 67eb691b0076 · 2024-03-22T21:41:07.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
       - uses: golangci/golangci-lint-action@v4
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.56.1
+          version: v1.57.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -2,7 +2,7 @@
 # with their default values.
 # options for analysis running
 run:
-  go: "1.19"
+  go: "1.22"
   # default concurrency is a available CPU number
   concurrency: 4
   # timeout for analysis, e.g. 30s, 5m, default is 1m
@@ -42,7 +42,8 @@ run:
 # output configuration options
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
-  format: colored-line-number
+  formats:
+    - format: colored-line-number
   # print lines of code with issue, default is true
   print-issued-lines: true
   # print linter name in the end of issue text, default is true
@@ -69,8 +70,6 @@ linters-settings:
     # simplify code: gofmt with `-s` option, true by default
     simplify: true
   govet:
-    # report about shadowed variables
-    check-shadowing: true
     enable-all: true
   revive:
     # When set to false, ignores files with "GENERATED" header, similar to golint.
@@ -400,6 +399,8 @@ linters:
     - protogetter
     - sloglint
     - testifylint
+    - copyloopvar
+    - intrange
   disable:
     - deadcode
     - varcheck
@@ -430,6 +431,16 @@ issues:
     - linters:
         - lll
       source: "^//go:generate "
+    - linters:
+        - lll
+        - nlreturn
+        - wsl
+      path: pkg/s3-proxy/.*/.*/mocks/.*\.go
+    - linters:
+        - lll
+        - nlreturn
+        - wsl
+      path: pkg/s3-proxy/.*/mocks/.*\.go
     - linters:
         - gomoddirectives
       path: go.mod
diff --git a/Makefile b/Makefile
@@ -175,7 +175,7 @@ ifndef HAS_GOLANGCI_LINT
 ifndef HAS_CURL
 	$(error You must install curl)
 endif
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.56.1
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.57.1
 endif
 ifndef HAS_GIT
 	$(error You must install Git)
diff --git a/pkg/s3-proxy/config/managerimpl.go b/pkg/s3-proxy/config/managerimpl.go
@@ -213,7 +213,7 @@ func generateViperInstances(files []os.DirEntry, mainConfDir string) []*viper.Vi
 
 func (impl *managerimpl) loadConfiguration() error {
 	// Load must start by flushing all existing watcher on internal files
-	for i := 0; i < len(impl.internalFileWatchChannels); i++ {
+	for i := range len(impl.internalFileWatchChannels) {
 		ch := impl.internalFileWatchChannels[i]
 		// Send the force stop
 		ch <- true
@@ -315,13 +315,13 @@ func loadAllCredentials(out *Config) ([]*CredentialConfig, error) {
 	for _, item := range out.Targets {
 		// Check if resources are declared
 		if item.Resources != nil {
-			for j := 0; j < len(item.Resources); j++ {
+			for j := range len(item.Resources) {
 				// Store ressource
 				res := item.Resources[j]
 				// Check if basic auth configuration exists
 				if res.Basic != nil && res.Basic.Credentials != nil {
 					// Loop over creds
-					for k := 0; k < len(res.Basic.Credentials); k++ {
+					for k := range len(res.Basic.Credentials) {
 						it := res.Basic.Credentials[k]
 						// Load credential
 						err := loadCredential(it.Password)
@@ -412,7 +412,7 @@ func loadAllCredentials(out *Config) ([]*CredentialConfig, error) {
 	if out.ListTargets != nil && out.ListTargets.Resource != nil &&
 		out.ListTargets.Resource.Basic != nil && out.ListTargets.Resource.Basic.Credentials != nil {
 		// Loop over credentials declared
-		for i := 0; i < len(out.ListTargets.Resource.Basic.Credentials); i++ {
+		for i := range len(out.ListTargets.Resource.Basic.Credentials) {
 			// Store item access
 			it := out.ListTargets.Resource.Basic.Credentials[i]
 			// Load credential
diff --git a/pkg/s3-proxy/config/validation.go b/pkg/s3-proxy/config/validation.go
@@ -20,7 +20,7 @@ func validateBusinessConfig(out *Config) error {
 	for key, target := range out.Targets {
 		// Check if resources are declared
 		if target.Resources != nil {
-			for j := 0; j < len(target.Resources); j++ {
+			for j := range len(target.Resources) {
 				res := target.Resources[j]
 				// Validate resource
 				err := validateResource(fmt.Sprintf("resource %d from target %s", j, key), res, out.AuthProviders, target.Mount.Path)
@@ -32,7 +32,7 @@ func validateBusinessConfig(out *Config) error {
 		}
 		// Check mount path items
 		pathList := target.Mount.Path
-		for j := 0; j < len(pathList); j++ {
+		for j := range len(pathList) {
 			p := pathList[j]
 			// Check path value
 			err := validatePath(fmt.Sprintf("path %d in target %s", j, key), p)
@@ -78,7 +78,7 @@ func validateBusinessConfig(out *Config) error {
 		}
 		// Check mount path items
 		pathList := out.ListTargets.Mount.Path
-		for j := 0; j < len(pathList); j++ {
+		for j := range len(pathList) {
 			p := pathList[j]
 			// Check path value
 			err := validatePath(fmt.Sprintf("path %d in list targets", j), p)
@@ -202,7 +202,7 @@ func validateResource(beginErrorMessage string, res *Resource, authProviders *Au
 	// Check if resource path contains mount path item
 	pathMatch := false
 	// Loop over mount path list
-	for i := 0; i < len(mountPathList); i++ {
+	for i := range len(mountPathList) {
 		mountPath := mountPathList[i]
 		// Check
 		if strings.HasPrefix(res.Path, mountPath) {
