chore: upgrade golangci-lint (#1146)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.golangci.yml

@@ -72,6 +72,7 @@ linters:
     - tagalign
     - nolintlint
     - wrapcheck # We might want to re-enable this if we manually wrap all the existing errors with fmt.Errorf
+    - protogetter
 
 linters-settings:
   exhaustive:
@@ -135,3 +136,6 @@ issues:
     - "^loopclosure:"
     - 'shadow: declaration of "ctx" shadows declaration at'
     - 'shadow: declaration of "ok" shadows declaration'
+    - "^dot-imports:"
+    - "fmt.Errorf can be replaced with errors.New"
+    - "fmt.Sprintf can be replaced with string concatenation"

backend/controller/dal/dal_test.go

@@ -361,7 +361,7 @@ func TestControllerStateFromProto(t *testing.T) {
 }
 
 func normaliseEvents(events []Event) []Event {
-	for i := 0; i < len(events); i++ {
+	for i := range len(events) {
 		event := events[i]
 		re := reflect.Indirect(reflect.ValueOf(event))
 		f := re.FieldByName("Time")

backend/controller/ingress/ingress.go

@@ -158,7 +158,7 @@ func validateValue(fieldType schema.Type, path path, value any, sch *schema.Sche
 			return fmt.Errorf("%s is not a slice", path)
 		}
 		elementType := fieldType.Element
-		for i := 0; i < rv.Len(); i++ {
+		for i := range rv.Len() {
 			elemPath := append(path, fmt.Sprintf("[%d]", i)) //nolint:gocritic
 			elem := rv.Index(i).Interface()
 			if err := validateValue(elementType, elemPath, elem, sch); err != nil {

backend/controller/scaling/localscaling/local_scaling.go

@@ -57,7 +57,7 @@ func (l *LocalScaling) SetReplicas(ctx context.Context, replicas int, idleRunner
 	if replicasToAdd <= 0 {
 		replicasToRemove := -replicasToAdd
 
-		for i := 0; i < replicasToRemove; i++ {
+		for range replicasToRemove {
 			if len(idleRunners) == 0 {
 				return nil
 			}
@@ -74,7 +74,7 @@ func (l *LocalScaling) SetReplicas(ctx context.Context, replicas int, idleRunner
 	}
 
 	logger.Debugf("Adding %d replicas", replicasToAdd)
-	for i := 0; i < replicasToAdd; i++ {
+	for range replicasToAdd {
 		controllerEndpoint := l.controllerAddresses[len(l.runners)%len(l.controllerAddresses)]
 
 		bind := l.portAllocator.Next()

backend/controller/scheduledtask/scheduledtask.go

@@ -137,7 +137,6 @@ func (s *Scheduler) run(ctx context.Context) {
 				if job.next.After(s.clock.Now()) {
 					continue
 				}
-				job := job
 				hashring := s.hashring.Load()
 
 				// If the job is singly homed, check that we are the active controller.

backend/controller/scheduledtask/scheduledtask_test.go

@@ -40,7 +40,6 @@ func TestCron(t *testing.T) {
 	clock := clock.NewMock()
 
 	for _, c := range controllers {
-		c := c
 		c.cron = NewForTesting(ctx, c.controller.Key, DALFunc(func(ctx context.Context, all bool) ([]dal.Controller, error) {
 			return slices.Map(controllers, func(c *controller) dal.Controller { return c.controller }), nil
 		}), clock)

backend/controller/sql/databasetesting/devel.go

@@ -25,7 +25,7 @@ func CreateForDevel(ctx context.Context, dsn string, recreate bool) (*pgxpool.Po
 	noDBDSN := config.Copy()
 	noDBDSN.Database = ""
 	var conn *pgx.Conn
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		conn, err = pgx.ConnectConfig(ctx, noDBDSN)
 		if err == nil {
 			defer conn.Close(ctx)

backend/schema/intvalue.go

@@ -1,7 +1,7 @@
 package schema
 
 import (
-	"fmt"
+	"strconv"
 
 	"google.golang.org/protobuf/proto"
 
@@ -28,7 +28,7 @@ func (i *IntValue) Position() Position { return i.Pos }
 func (i *IntValue) schemaChildren() []Node { return nil }
 
 func (i *IntValue) String() string {
-	return fmt.Sprintf("%d", i.Value)
+	return strconv.Itoa(i.Value)
 }
 
 func (i *IntValue) GetValue() any { return i.Value }

backend/schema/strcase/case.go

@@ -148,7 +148,7 @@ func split(src string) (entries []string) {
 	}
 	// handle upper case -> lower case sequences, e.g.
 	// "PDFL", "oader" -> "PDF", "Loader"
-	for i := 0; i < len(runes)-1; i++ {
+	for i := range len(runes) - 1 {
 		if unicode.IsUpper(runes[i][0]) && unicode.IsLower(runes[i+1][0]) {
 			runes[i+1] = append([]rune{runes[i][len(runes[i])-1]}, runes[i+1]...)
 			runes[i] = runes[i][:len(runes[i])-1]

bin/golangci-lint

@@ -1 +1 @@
-.golangci-lint-1.54.2.pkg
+.golangci-lint-1.57.1.pkg

buildengine/deploy.go

@@ -27,11 +27,11 @@ type deploymentArtefact struct {
 }
 
 type DeployClient interface {
-	GetArtefactDiffs(context.Context, *connect.Request[ftlv1.GetArtefactDiffsRequest]) (*connect.Response[ftlv1.GetArtefactDiffsResponse], error)
-	UploadArtefact(context.Context, *connect.Request[ftlv1.UploadArtefactRequest]) (*connect.Response[ftlv1.UploadArtefactResponse], error)
-	CreateDeployment(context.Context, *connect.Request[ftlv1.CreateDeploymentRequest]) (*connect.Response[ftlv1.CreateDeploymentResponse], error)
-	ReplaceDeploy(context.Context, *connect.Request[ftlv1.ReplaceDeployRequest]) (*connect.Response[ftlv1.ReplaceDeployResponse], error)
-	Status(context.Context, *connect.Request[ftlv1.StatusRequest]) (*connect.Response[ftlv1.StatusResponse], error)
+	GetArtefactDiffs(ctx context.Context, req *connect.Request[ftlv1.GetArtefactDiffsRequest]) (*connect.Response[ftlv1.GetArtefactDiffsResponse], error)
+	UploadArtefact(ctx context.Context, req *connect.Request[ftlv1.UploadArtefactRequest]) (*connect.Response[ftlv1.UploadArtefactResponse], error)
+	CreateDeployment(ctx context.Context, req *connect.Request[ftlv1.CreateDeploymentRequest]) (*connect.Response[ftlv1.CreateDeploymentResponse], error)
+	ReplaceDeploy(ctx context.Context, req *connect.Request[ftlv1.ReplaceDeployRequest]) (*connect.Response[ftlv1.ReplaceDeployResponse], error)
+	Status(ctx context.Context, req *connect.Request[ftlv1.StatusRequest]) (*connect.Response[ftlv1.StatusResponse], error)
 }
 
 // Deploy a module to the FTL controller with the given number of replicas. Optionally wait for the deployment to become ready.

buildengine/engine.go

@@ -347,7 +347,7 @@ func (e *Engine) buildAndDeploy(ctx context.Context, replicas int32, waitForDepl
 	})
 
 	// Process deployment queue.
-	for i := 0; i < len(projects); i++ {
+	for range len(projects) {
 		wg.Go(func() error {
 			for {
 				select {

buildengine/project.go

@@ -17,7 +17,7 @@ type Project interface {
 	sealed()
 
 	Config() ProjectConfig
-	CopyWithDependencies([]string) Project
+	CopyWithDependencies(deps []string) Project
 	TypeString() string
 }
 

cmd/ftl/cmd_schema_import.go

@@ -6,6 +6,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"strconv"
 
 	"github.com/tmc/langchaingo/llms"
 	"github.com/tmc/langchaingo/llms/ollama"
@@ -142,7 +143,7 @@ func (s *schemaImportCmd) setup(ctx context.Context) error {
 		return err
 	}
 
-	port := fmt.Sprintf("%d", s.OllamaPort)
+	port := strconv.Itoa(s.OllamaPort)
 
 	if len(output) == 0 {
 		logger.Debugf("Creating docker container '%s' for ollama", ollamaContainerName)
@@ -157,7 +158,7 @@ func (s *schemaImportCmd) setup(ctx context.Context) error {
 		err = exec.Command(ctx, log.Debug, "./", "docker", "run",
 			"-d", // run detached so we can follow with other commands
 			"-v", ollamaVolume,
-			"-p", fmt.Sprintf("%s:11434", port),
+			"-p", port+":11434",
 			"--name", ollamaContainerName,
 			"ollama/ollama").RunBuffered(ctx)
 		if err != nil {

cmd/ftl/cmd_serve.go

@@ -90,7 +90,7 @@ func (s *serveCmd) Run(ctx context.Context) error {
 	}
 
 	controllerAddresses := make([]*url.URL, 0, s.Controllers)
-	for i := 0; i < s.Controllers; i++ {
+	for range s.Controllers {
 		controllerAddresses = append(controllerAddresses, bindAllocator.Next())
 	}
 
@@ -99,8 +99,7 @@ func (s *serveCmd) Run(ctx context.Context) error {
 		return err
 	}
 
-	for i := 0; i < s.Controllers; i++ {
-		i := i
+	for i := range s.Controllers {
 		config := controller.Config{
 			Bind:         controllerAddresses[i],
 			Key:          model.NewLocalControllerKey(i),
@@ -159,7 +158,7 @@ func runInBackground(logger *log.Logger) {
 		return
 	}
 
-	if err := os.WriteFile(pidFilePath, []byte(fmt.Sprintf("%d", cmd.Process.Pid)), 0600); err != nil {
+	if err := os.WriteFile(pidFilePath, []byte(strconv.Itoa(cmd.Process.Pid)), 0600); err != nil {
 		logger.Errorf(err, "failed to write pid file")
 		return
 	}
@@ -269,7 +268,7 @@ func (s *serveCmd) setupDB(ctx context.Context) (string, error) {
 			"--user", "postgres",
 			"--restart", "always",
 			"-e", "POSTGRES_PASSWORD=secret",
-			"-p", fmt.Sprintf("%s:5432", port),
+			"-p", port+":5432",
 			"--health-cmd=pg_isready",
 			"--health-interval=1s",
 			"--health-timeout=60s",

go-runtime/compile/build.go

@@ -9,6 +9,7 @@ import (
 	"path"
 	"path/filepath"
 	stdreflect "reflect"
+	"strconv"
 	"strings"
 
 	"github.com/TBD54566975/scaffolder"
@@ -257,7 +258,7 @@ var scaffoldFuncs = scaffolder.FuncMap{
 		case *schema.StringValue:
 			return fmt.Sprintf("%q", t.Value)
 		case *schema.IntValue:
-			return fmt.Sprintf("%d", t.Value)
+			return strconv.Itoa(t.Value)
 		}
 		panic(fmt.Sprintf("unsupported value %T", v))
 	},

go-runtime/compile/schema.go

@@ -525,7 +525,7 @@ func visitStruct(pctx *parseContext, pos token.Pos, tnode types.Type) (*schema.R
 			Module: destModule,
 			Name:   named.Obj().Name(),
 		}
-		for i := 0; i < named.TypeArgs().Len(); i++ {
+		for i := range named.TypeArgs().Len() {
 			arg := named.TypeArgs().At(i)
 			typeArg, err := visitType(pctx, pos, arg)
 			if err != nil {
@@ -554,7 +554,7 @@ func visitStruct(pctx *parseContext, pos token.Pos, tnode types.Type) (*schema.R
 		Module: pctx.module.Name,
 		Name:   out.Name,
 	}
-	for i := 0; i < named.TypeParams().Len(); i++ {
+	for i := range named.TypeParams().Len() {
 		param := named.TypeParams().At(i)
 		out.TypeParameters = append(out.TypeParameters, &schema.TypeParameter{
 			Pos:  goPosToSchemaPos(pos),
@@ -598,7 +598,7 @@ func visitStruct(pctx *parseContext, pos token.Pos, tnode types.Type) (*schema.R
 	if !ok {
 		return nil, errorf(pos, "expected struct but got %s", named)
 	}
-	for i := 0; i < s.NumFields(); i++ {
+	for i := range s.NumFields() {
 		f := s.Field(i)
 		ft, err := visitType(pctx, f.Pos(), f.Type())
 		if err != nil {

go-runtime/compile/schema_test.go

@@ -152,9 +152,9 @@ func TestExtractModuleSchemaTwo(t *testing.T) {
 
 		verb callsTwo(two.Payload<String>) two.Payload<String>
 			+calls two.two
-	  
+
 		verb returnsUser(Unit) two.UserResponse
-	  
+
 		verb two(two.Payload<String>) two.Payload<String>
 	  }
 `
@@ -192,7 +192,6 @@ func TestParseDirectives(t *testing.T) {
 		}},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := directiveParser.ParseString("", tt.input)
 			assert.NoError(t, err)

go-runtime/encoding/encoding.go

@@ -111,7 +111,7 @@ func encodeValue(v reflect.Value, w *bytes.Buffer) error {
 func encodeStruct(v reflect.Value, w *bytes.Buffer) error {
 	w.WriteRune('{')
 	afterFirst := false
-	for i := 0; i < v.NumField(); i++ {
+	for i := range v.NumField() {
 		ft := v.Type().Field(i)
 		t := ft.Type
 		fv := v.Field(i)
@@ -146,7 +146,7 @@ func encodeBytes(v reflect.Value, w *bytes.Buffer) error {
 
 func encodeSlice(v reflect.Value, w *bytes.Buffer) error {
 	w.WriteRune('[')
-	for i := 0; i < v.Len(); i++ {
+	for i := range v.Len() {
 		if i > 0 {
 			w.WriteRune(',')
 		}

go-runtime/encoding/encoding_test.go

@@ -4,9 +4,10 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
+
 	. "github.com/TBD54566975/ftl/go-runtime/encoding"
 	"github.com/TBD54566975/ftl/go-runtime/ftl"
-	"github.com/alecthomas/assert/v2"
 )
 
 func TestMarshal(t *testing.T) {

go-runtime/ftl/config.go

@@ -56,7 +56,7 @@ func callerModule() string {
 		return "testing"
 	}
 	if !strings.HasPrefix(module, "ftl/") {
-		panic(fmt.Sprintf("must be called from an FTL module not %s", module))
+		panic("must be called from an FTL module not " + module)
 	}
 	return strings.Split(strings.Split(module, "/")[1], ".")[0]
 }

go-runtime/ftl/observability/traces.go

@@ -18,5 +18,5 @@ func TracerWithVerb(ctx context.Context) trace.Tracer {
 }
 
 func StartSpan(ctx context.Context, name string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
-	return TracerWithVerb(ctx).Start(ctx, name, opts...)
+	return TracerWithVerb(ctx).Start(ctx, name, opts...) //nolint:spancheck
 }

internal/exec/circularbuffer.go

@@ -54,7 +54,7 @@ func (cb *CircularBuffer) Bytes() []byte {
 	var buf bytes.Buffer
 	start := cb.r.Move(-cb.size) // Correctly calculate the starting position
 
-	for i := 0; i < cb.size; i++ {
+	for range cb.size {
 		if str, ok := start.Value.(string); ok {
 			buf.WriteString(str)
 		} else {