chore: enable modernize linter (argoproj#15445)

Signed-off-by: Alan Clucas <alan@clucas.org>

Author: Joibel

.golangci.yml

@@ -21,6 +21,7 @@ linters:
     - iotamixing
     - mirror
     - misspell
+    - modernize
     - nakedret
     - nilerr
     - noctx

api/openapi-spec/swagger_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type obj = map[string]interface{}
+type obj = map[string]any
 
 func TestSwagger(t *testing.T) {
 	swagger := obj{}

cmd/argo/commands/common/get.go

@@ -498,13 +498,13 @@ func printNode(w *tabwriter.Writer, node wfv1.NodeStatus, wfName, nodePrefix str
 	} else if node.TemplateName != "" {
 		fmtTemplateName = node.TemplateName
 	}
-	var args []interface{}
+	var args []any
 	duration := humanize.RelativeDurationShort(node.StartedAt.Time, node.FinishedAt.Time)
 	if node.Type == wfv1.NodeTypePod {
 		podName := util.GeneratePodName(wfName, nodeName, templateName, node.ID, podNameVersion)
-		args = []interface{}{nodePrefix, fmtNodeName, fmtTemplateName, podName, duration, node.Message, ""}
+		args = []any{nodePrefix, fmtNodeName, fmtTemplateName, podName, duration, node.Message, ""}
 	} else {
-		args = []interface{}{nodePrefix, fmtNodeName, fmtTemplateName, "", "", node.Message, ""}
+		args = []any{nodePrefix, fmtNodeName, fmtTemplateName, "", "", node.Message, ""}
 	}
 	switch getArgs.Output.String() {
 	case "wide":

cmd/argo/commands/convert.go

@@ -93,7 +93,7 @@ func convertDocument(data []byte, outputFormat string, isJSON bool) error {
 		return fmt.Errorf("failed to parse TypeMeta: %w", err)
 	}
 
-	var converted interface{}
+	var converted any
 
 	// Parse into legacy type and convert to current type
 	switch typeMeta.Kind {
@@ -128,7 +128,7 @@ func convertDocument(data []byte, outputFormat string, isJSON bool) error {
 	default:
 		// Unknown type - pass through unchanged
 		// Re-parse as generic map to preserve structure
-		var generic map[string]interface{}
+		var generic map[string]any
 		if err := yaml.Unmarshal(data, &generic); err != nil {
 			return fmt.Errorf("failed to parse unknown kind %s: %w", typeMeta.Kind, err)
 		}
@@ -138,7 +138,7 @@ func convertDocument(data []byte, outputFormat string, isJSON bool) error {
 	return outputObject(converted, outputFormat, isJSON)
 }
 
-func outputObject(obj interface{}, format string, preferJSON bool) error {
+func outputObject(obj any, format string, preferJSON bool) error {
 	var outBytes []byte
 	var err error
 

cmd/argo/commands/cron/backfill.go

@@ -213,7 +213,7 @@ func CreateMonitorWf(ctx context.Context, wf, namespace, cronWFName string, sche
 	startIdx := 0
 	var endIdx int
 	var wfNames []string
-	for i := 0; i < iterCount; i++ {
+	for i := range iterCount {
 		tmpl := monitorWfObj.GetTemplateByName("create-workflow")
 		if (TotalScheCount - i*cliOps.maxWorkflowCount) < cliOps.maxWorkflowCount {
 			endIdx = TotalScheCount

cmd/argo/commands/cron/util.go

@@ -95,48 +95,48 @@ func printCronWorkflow(ctx context.Context, wf *v1alpha1.CronWorkflow, outFmt st
 func getCronWorkflowGet(ctx context.Context, cwf *v1alpha1.CronWorkflow) string {
 	const fmtStr = "%-30s %v\n"
 
-	out := ""
-	out += fmt.Sprintf(fmtStr, "Name:", cwf.Name)
-	out += fmt.Sprintf(fmtStr, "Namespace:", cwf.Namespace)
-	out += fmt.Sprintf(fmtStr, "Created:", humanize.Timestamp(cwf.CreationTimestamp.Time))
-	out += fmt.Sprintf(fmtStr, "Schedules:", cwf.Spec.GetScheduleString())
-	out += fmt.Sprintf(fmtStr, "Suspended:", cwf.Spec.Suspend)
+	var out strings.Builder
+	out.WriteString(fmt.Sprintf(fmtStr, "Name:", cwf.Name))
+	out.WriteString(fmt.Sprintf(fmtStr, "Namespace:", cwf.Namespace))
+	out.WriteString(fmt.Sprintf(fmtStr, "Created:", humanize.Timestamp(cwf.CreationTimestamp.Time)))
+	out.WriteString(fmt.Sprintf(fmtStr, "Schedules:", cwf.Spec.GetScheduleString()))
+	out.WriteString(fmt.Sprintf(fmtStr, "Suspended:", cwf.Spec.Suspend))
 	if cwf.Spec.Timezone != "" {
-		out += fmt.Sprintf(fmtStr, "Timezone:", cwf.Spec.Timezone)
+		out.WriteString(fmt.Sprintf(fmtStr, "Timezone:", cwf.Spec.Timezone))
 	}
 	if cwf.Spec.StartingDeadlineSeconds != nil {
-		out += fmt.Sprintf(fmtStr, "StartingDeadlineSeconds:", *cwf.Spec.StartingDeadlineSeconds)
+		out.WriteString(fmt.Sprintf(fmtStr, "StartingDeadlineSeconds:", *cwf.Spec.StartingDeadlineSeconds))
 	}
 	if cwf.Spec.ConcurrencyPolicy != "" {
-		out += fmt.Sprintf(fmtStr, "ConcurrencyPolicy:", cwf.Spec.ConcurrencyPolicy)
+		out.WriteString(fmt.Sprintf(fmtStr, "ConcurrencyPolicy:", cwf.Spec.ConcurrencyPolicy))
 	}
 	if cwf.Status.LastScheduledTime != nil {
-		out += fmt.Sprintf(fmtStr, "LastScheduledTime:", humanize.Timestamp(cwf.Status.LastScheduledTime.Time))
+		out.WriteString(fmt.Sprintf(fmtStr, "LastScheduledTime:", humanize.Timestamp(cwf.Status.LastScheduledTime.Time)))
 	}
 
 	next, err := GetNextRuntime(ctx, cwf)
 	if err == nil {
-		out += fmt.Sprintf(fmtStr, "NextScheduledTime:", humanize.Timestamp(next)+" (assumes workflow-controller is in UTC)")
+		out.WriteString(fmt.Sprintf(fmtStr, "NextScheduledTime:", humanize.Timestamp(next)+" (assumes workflow-controller is in UTC)"))
 	}
 
 	if len(cwf.Status.Active) > 0 {
 		var activeWfNames []string
 		for _, activeWf := range cwf.Status.Active {
 			activeWfNames = append(activeWfNames, activeWf.Name)
 		}
-		out += fmt.Sprintf(fmtStr, "Active Workflows:", strings.Join(activeWfNames, ", "))
+		out.WriteString(fmt.Sprintf(fmtStr, "Active Workflows:", strings.Join(activeWfNames, ", ")))
 	}
 	if len(cwf.Status.Conditions) > 0 {
-		out += cwf.Status.Conditions.DisplayString(fmtStr, map[v1alpha1.ConditionType]string{v1alpha1.ConditionTypeSubmissionError: "✖"})
+		out.WriteString(cwf.Status.Conditions.DisplayString(fmtStr, map[v1alpha1.ConditionType]string{v1alpha1.ConditionTypeSubmissionError: "✖"}))
 	}
 	if len(cwf.Spec.WorkflowSpec.Arguments.Parameters) > 0 {
-		out += fmt.Sprintf(fmtStr, "Workflow Parameters:", "")
+		out.WriteString(fmt.Sprintf(fmtStr, "Workflow Parameters:", ""))
 		for _, param := range cwf.Spec.WorkflowSpec.Arguments.Parameters {
 			if !param.HasValue() {
 				continue
 			}
-			out += fmt.Sprintf(fmtStr, "  "+param.Name+":", param.GetValue())
+			out.WriteString(fmt.Sprintf(fmtStr, "  "+param.Name+":", param.GetValue()))
 		}
 	}
-	return out
+	return out.String()
 }

cmd/argoexec/commands/artifact/delete.go

@@ -114,7 +114,7 @@ func deleteArtifacts(labelSelector string, ctx context.Context, artifactGCTaskIn
 
 			task.Status.ArtifactResultsByNode[nodeName] = artResultNodeStatus
 		}
-		patch, err := json.Marshal(map[string]interface{}{"status": v1alpha1.ArtifactGCStatus{ArtifactResultsByNode: task.Status.ArtifactResultsByNode}})
+		patch, err := json.Marshal(map[string]any{"status": v1alpha1.ArtifactGCStatus{ArtifactResultsByNode: task.Status.ArtifactResultsByNode}})
 		if err != nil {
 			return err
 		}

config/ttl.go

@@ -17,7 +17,7 @@ func (l TTL) MarshalJSON() ([]byte, error) {
 }
 
 func (l *TTL) UnmarshalJSON(b []byte) error {
-	var v interface{}
+	var v any
 	if err := json.Unmarshal(b, &v); err != nil {
 		return err
 	}
@@ -27,23 +27,23 @@ func (l *TTL) UnmarshalJSON(b []byte) error {
 			*l = 0
 			return nil
 		}
-		if strings.HasSuffix(value, "d") {
-			days, err := strconv.Atoi(strings.TrimSuffix(value, "d"))
+		if before, ok := strings.CutSuffix(value, "d"); ok {
+			days, err := strconv.Atoi(before)
 			*l = TTL(time.Duration(days) * 24 * time.Hour)
 			return err
 		}
-		if strings.HasSuffix(value, "h") {
-			hours, err := strconv.Atoi(strings.TrimSuffix(value, "h"))
+		if before, ok := strings.CutSuffix(value, "h"); ok {
+			hours, err := strconv.Atoi(before)
 			*l = TTL(time.Duration(hours) * time.Hour)
 			return err
 		}
-		if strings.HasSuffix(value, "m") {
-			minutes, err := strconv.Atoi(strings.TrimSuffix(value, "m"))
+		if before, ok := strings.CutSuffix(value, "m"); ok {
+			minutes, err := strconv.Atoi(before)
 			*l = TTL(time.Duration(minutes) * time.Minute)
 			return err
 		}
-		if strings.HasSuffix(value, "s") {
-			seconds, err := strconv.Atoi(strings.TrimSuffix(value, "s"))
+		if before, ok := strings.CutSuffix(value, "s"); ok {
+			seconds, err := strconv.Atoi(before)
 			*l = TTL(time.Duration(seconds) * time.Second)
 			return err
 		}

errors/errors.go

@@ -42,7 +42,7 @@ func New(code string, message string) error {
 }
 
 // Errorf returns an error and formats according to a format specifier
-func Errorf(code string, format string, args ...interface{}) error {
+func Errorf(code string, format string, args ...any) error {
 	return New(code, fmt.Sprintf(format, args...))
 }
 
@@ -52,7 +52,7 @@ func InternalError(message string) error {
 }
 
 // InternalErrorf is a convenience function to format an Internal error
-func InternalErrorf(format string, args ...interface{}) error {
+func InternalErrorf(format string, args ...any) error {
 	return Errorf(CodeInternal, format, args...)
 }
 
@@ -65,7 +65,7 @@ func InternalWrapError(err error, message ...string) error {
 }
 
 // InternalWrapErrorf annotates the error with the ERR_INTERNAL code and a stack trace, optional message
-func InternalWrapErrorf(err error, format string, args ...interface{}) error {
+func InternalWrapErrorf(err error, format string, args ...any) error {
 	return Wrap(err, CodeInternal, fmt.Sprintf(format, args...))
 }
 

hack/api/jsonschema/main.go

@@ -42,7 +42,7 @@ func main() {
 			"$id":     "https://raw.githubusercontent.com/argoproj/argo-workflows/HEAD/api/jsonschema/schema.json",
 			"$schema": "https://json-schema.org/draft/2020-12/schema",
 			"type":    "object",
-			"oneOf": []interface{}{
+			"oneOf": []any{
 				obj{"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.ClusterWorkflowTemplate"},
 				obj{"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.CronWorkflow"},
 				obj{"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.Workflow"},