chore: add support for modernize (#5272)

Co-authored-by: Mia-Cross <lmarabese@scaleway.com>

Author: remyleone

.golangci.yml

@@ -53,6 +53,7 @@ linters:
     - makezero # Finds slice declarations with non-zero initial length [fast: false, auto-fix: false]
     - mirror # reports wrong mirror patterns of bytes/strings usage [fast: false, auto-fix: false]
     - misspell # Finds commonly misspelled English words in comments [fast: true, auto-fix: true]
+    - modernize # A suite of analyzers that suggest simplifications to Go code, using modern language and library features.
     - musttag # enforce field tags in (un)marshaled structs [fast: false, auto-fix: false]
     - nakedret # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false]
     - nilerr # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false]
@@ -92,6 +93,9 @@ linters:
       rules:
         - name: exported
           disabled: true
+    modernize:
+      disable:
+        - reflecttypefor
 
   exclusions:
     paths:

core/arg_specs.go

@@ -3,6 +3,7 @@ package core
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 	"time"
 
@@ -150,10 +151,8 @@ func ZoneArgSpec(zones ...scw.Zone) *ArgSpec {
 		Short:      "Zone to target. If none is passed will use default zone from the config",
 		EnumValues: enumValues,
 		ValidateFunc: func(_ *ArgSpec, value any) error {
-			for _, zone := range zones {
-				if value.(scw.Zone) == zone {
-					return nil
-				}
+			if slices.Contains(zones, value.(scw.Zone)) {
+				return nil
 			}
 			if validation.IsZone(value.(scw.Zone).String()) {
 				return nil
@@ -184,10 +183,8 @@ func RegionArgSpec(regions ...scw.Region) *ArgSpec {
 		Short:      "Region to target. If none is passed will use default region from the config",
 		EnumValues: enumValues,
 		ValidateFunc: func(_ *ArgSpec, value any) error {
-			for _, region := range regions {
-				if value.(scw.Region) == region {
-					return nil
-				}
+			if slices.Contains(regions, value.(scw.Region)) {
+				return nil
 			}
 			if validation.IsRegion(value.(scw.Region).String()) {
 				return nil

core/testing.go

@@ -14,6 +14,7 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"testing"
@@ -320,13 +321,8 @@ func folderUsesVCRv4(fullFolderPath string) bool {
 	fullPathSplit := strings.Split(fullFolderPath, string(os.PathSeparator))
 
 	folder := fullPathSplit[len(fullPathSplit)-2]
-	for _, migratedFolder := range foldersUsingVCRv4 {
-		if migratedFolder == folder {
-			return true
-		}
-	}
 
-	return false
+	return slices.Contains(foldersUsingVCRv4, folder)
 }
 
 // Run a CLI integration test. See TestConfig for configuration option

core/validate.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -225,13 +226,7 @@ func DefaultArgSpecValidateFunc() ArgSpecValidateFunc {
 }
 
 func stringExists(strs []string, s string) bool {
-	for _, s2 := range strs {
-		if s == s2 {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(strs, s)
 }
 
 // ValidateSecretKey validates a secret key ID.

internal/alias/alias.go

@@ -23,9 +23,9 @@ func (a *Alias) Args() []string {
 func (a *Alias) computeArgs() {
 	a.args = []string{}
 	for _, cmd := range a.Command {
-		argSplitterIndex := strings.Index(cmd, "=")
-		if argSplitterIndex != -1 {
-			a.args = append(a.args, cmd[:argSplitterIndex])
+		before, _, ok := strings.Cut(cmd, "=")
+		if ok {
+			a.args = append(a.args, before)
 		}
 	}
 }

internal/args/args.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"reflect"
 	"regexp"
+	"slices"
 	"strings"
 
 	"github.com/scaleway/scaleway-sdk-go/strcase"
@@ -317,10 +318,8 @@ func listArgTypeFields(base string, argType reflect.Type) []string {
 
 		return fields
 	default:
-		for _, skippedArg := range listArgTypeFieldsSkippedArguments {
-			if base == skippedArg {
-				return []string{}
-			}
+		if slices.Contains(listArgTypeFieldsSkippedArguments, base) {
+			return []string{}
 		}
 
 		return []string{base}

internal/editor/marshal.go

@@ -77,7 +77,7 @@ func addTemplate(content []byte, template string, mode MarshalMode) []byte {
 	}
 	newContent := []byte(nil)
 
-	for _, line := range strings.Split(template, "\n") {
+	for line := range strings.SplitSeq(template, "\n") {
 		newContent = append(newContent, []byte("#"+line+"\n")...)
 	}
 

internal/editor/reflect.go

@@ -2,6 +2,7 @@ package editor
 
 import (
 	"reflect"
+	"slices"
 )
 
 func areSameType(v1 reflect.Value, v2 reflect.Value) bool {
@@ -34,13 +35,7 @@ func areSameType(v1 reflect.Value, v2 reflect.Value) bool {
 }
 
 func hasTag(tags []string, actualTag string) bool {
-	for _, tag := range tags {
-		if tag == actualTag {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(tags, actualTag)
 }
 
 func valueMapperWithoutOpt(

internal/interactive/print.go

@@ -47,8 +47,8 @@ func Line(char string) string {
 
 func Center(str string) string {
 	longestLine := 0
-	lines := strings.Split(str, "\n")
-	for _, line := range lines {
+	lines := strings.SplitSeq(str, "\n")
+	for line := range lines {
 		longestLine = int(math.Max(float64(longestLine), float64(len(line))))
 	}
 

internal/namespaces/instance/v1/custom_ssh_config.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
+	"slices"
 	"strings"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
@@ -28,13 +29,7 @@ type sshConfigServer struct {
 }
 
 func (s sshConfigServer) InPrivateNetwork(id string) bool {
-	for _, pnID := range s.PrivateNetworksID {
-		if pnID == id {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(s.PrivateNetworksID, id)
 }
 
 type sshConfigInstallRequest struct {