chore: go fix for 1.26

Author: bakito

.toolbox.mk

@@ -20,9 +20,9 @@ TB_MOCKGEN ?= $(TB_LOCALBIN)/mockgen
 TB_SEMVER ?= $(TB_LOCALBIN)/semver
 
 ## Tool Versions
-TB_GOLANGCI_LINT_VERSION ?= v2.9.0
+TB_GOLANGCI_LINT_VERSION ?= v2.10.1
 TB_GOLANGCI_LINT_VERSION_NUM ?= $(call STRIP_V,$(TB_GOLANGCI_LINT_VERSION))
-TB_GORELEASER_VERSION ?= v2.13.3
+TB_GORELEASER_VERSION ?= v2.14.1
 TB_GORELEASER_VERSION_NUM ?= $(call STRIP_V,$(TB_GORELEASER_VERSION))
 TB_HELM_DOCS_VERSION ?= v1.14.2
 TB_MOCKGEN_VERSION ?= v0.6.0

cmd/main.go

@@ -211,7 +211,7 @@ func (m *Main) addToManager(r manager.Runnable) {
 }
 
 // CustomConfigValue get a custom config value
-func (m *Main) CustomConfigValue(name string) interface{} {
+func (m *Main) CustomConfigValue(name string) any {
 	if v, ok := m.Config.Custom[name]; ok {
 		return v
 	}

pkg/config/config.go

@@ -130,7 +130,7 @@ func findOwner(obj client.Object, namespace string, name string, cl client.Reade
 		if ob, ok := obj.(metav1.Object); ok {
 			for _, or := range ob.GetOwnerReferences() {
 				var us runtime.Unstructured = &unstructured.Unstructured{
-					Object: map[string]interface{}{
+					Object: map[string]any{
 						"kind":       or.Kind,
 						"apiVersion": or.APIVersion,
 					},

pkg/config/config_test.go

@@ -170,9 +170,9 @@ var _ = Describe("Config", func() {
 					})
 				mockReader.EXPECT().Get(ctx, gm.Any(), gm.AssignableToTypeOf(&unstructured.Unstructured{})).
 					Do(func(ctx context.Context, key client.ObjectKey, us *unstructured.Unstructured, opts ...client.GetOption) error {
-						us.Object["metadata"] = map[string]interface{}{
-							"ownerReferences": []interface{}{
-								map[string]interface{}{
+						us.Object["metadata"] = map[string]any{
+							"ownerReferences": []any{
+								map[string]any{
 									"kind": "Deployment",
 									"name": "deployment-1",
 								},
@@ -182,7 +182,7 @@ var _ = Describe("Config", func() {
 					})
 				mockReader.EXPECT().Get(ctx, gm.Any(), gm.AssignableToTypeOf(&unstructured.Unstructured{})).
 					Do(func(ctx context.Context, key client.ObjectKey, us *unstructured.Unstructured, opts ...client.GetOption) error {
-						us.Object["metadata"] = map[string]interface{}{
+						us.Object["metadata"] = map[string]any{
 							"name": "deployment-1",
 						}
 						us.Object["kind"] = "Deployment"

pkg/config/types.go

@@ -35,8 +35,8 @@ type Config struct {
 	Metrics               Metrics                       `json:"metrics"`
 	HealthProbePort       int                           `json:"healthProbePort"`
 	// LatestMetricsLabel if true, each result metric is also created with executionID=latest
-	LatestMetricsLabel bool                   `json:"latestMetricsLabel"`
-	Custom             map[string]interface{} `json:"custom"`
+	LatestMetricsLabel bool           `json:"latestMetricsLabel"`
+	Custom             map[string]any `json:"custom"`
 	// CallbackServiceName if left blank, the pod IP is used for callback
 	CallbackServiceName string `json:"callbackServiceName"`
 	CallbackServicePort int    `json:"callbackServicePort"`

pkg/http/postserver.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http/pprof"
 	"os"
+	"path/filepath"
 
 	"github.com/bakito/batch-job-controller/pkg/config"
 	"github.com/bakito/batch-job-controller/pkg/lifecycle"
@@ -118,7 +119,8 @@ func (s *PostServer) SaveFile(executionID, name string, data []byte) (string, er
 	if err := s.Config.MkReportDir(executionID); err != nil {
 		return "", err
 	}
-	fileName := s.Config.ReportFileName(executionID, name)
+	fileName := filepath.Clean(s.Config.ReportFileName(executionID, name))
+	// #nosec G703 -- fileName is sanitized by filepath.Clean and constructed from controlled inputs
 	return fileName, os.WriteFile(fileName, data, 0o600)
 }
 

pkg/http/postserver_load_test.go

@@ -98,7 +98,7 @@ var _ = XDescribe("HTTP", func() {
 		mockSink.EXPECT().Info(gm.Any(), "received 1 file").Times(loops)
 
 		var wg sync.WaitGroup
-		for i := 0; i < loops; i++ {
+		for i := range loops {
 			wg.Add(1)
 			time.Sleep(sleep)
 			ii := i

pkg/http/types.go

@@ -15,8 +15,8 @@ type Event struct {
 	Args    []string `json:"args,omitempty"`
 }
 
-func (e *Event) args() []interface{} {
-	var args []interface{}
+func (e *Event) args() []any {
+	var args []any
 	for _, a := range e.Args {
 		args = append(args, a)
 	}

pkg/lifecycle/lifecycle.go

@@ -143,7 +143,7 @@ func (c *controller) AllAdded(executionID string) error {
 
 	if len(files) > c.reportHistory {
 		pruneCnt := len(files) - c.reportHistory
-		for i := 0; i < pruneCnt; i++ {
+		for i := range pruneCnt {
 			name := files[i].Name()
 			// delete the execution
 			delete(c.executions, name)