chore(format): fix suggestions detected by gopls modernize (#3208)

peczenyj · web-flow · commit 42824ba0d121 · 2025-06-16T19:52:56.000+01:00
Apply gopls modernize tool with fix and format code.
diff --git a/container.go b/container.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"os"
 	"path/filepath"
 	"strings"
@@ -457,9 +458,7 @@ func (c *ContainerRequest) BuildOptions() (build.ImageBuildOptions, error) {
 		buildOptions.AuthConfigs = map[string]registry.AuthConfig{}
 	}
 
-	for registry, authConfig := range authsFromDockerfile {
-		buildOptions.AuthConfigs[registry] = authConfig
-	}
+	maps.Copy(buildOptions.AuthConfigs, authsFromDockerfile)
 
 	// make sure the first tag is the one defined in the ContainerRequest
 	tag := fmt.Sprintf("%s:%s", c.GetRepo(), c.GetTag())
diff --git a/container_test.go b/container_test.go
@@ -510,7 +510,7 @@ func TestShouldStartContainersInParallel(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
 	t.Cleanup(cancel)
 
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		i := i
 		t.Run(fmt.Sprintf("iteration_%d", i), func(t *testing.T) {
 			t.Parallel()
diff --git a/docker.go b/docker.go
@@ -1062,13 +1062,7 @@ func (p *DockerProvider) CreateContainer(ctx context.Context, req ContainerReque
 	// as container won't be attached to it automatically
 	// in case of Podman the bridge network is called 'podman' as 'bridge' would conflict
 	if defaultNetwork != p.defaultBridgeNetworkName {
-		isAttached := false
-		for _, net := range req.Networks {
-			if net == defaultNetwork {
-				isAttached = true
-				break
-			}
-		}
+		isAttached := slices.Contains(req.Networks, defaultNetwork)
 
 		if !isAttached {
 			req.Networks = append(req.Networks, defaultNetwork)
diff --git a/docker_client_test.go b/docker_client_test.go
@@ -28,7 +28,7 @@ func TestGetDockerInfo(t *testing.T) {
 		wg := sync.WaitGroup{}
 		wg.Add(count)
 
-		for i := 0; i < count; i++ {
+		for range count {
 			go func() {
 				defer wg.Done()
 				info, err := c.Info(ctx)
diff --git a/from_dockerfile_test.go b/from_dockerfile_test.go
@@ -136,7 +136,7 @@ func TestBuildImageFromDockerfile_NoTag(t *testing.T) {
 
 func TestBuildImageFromDockerfile_Target(t *testing.T) {
 	// there are three targets: target0, target1 and target2.
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		ctx := context.Background()
 		c, err := GenericContainer(ctx, GenericContainerRequest{
 			ContainerRequest: ContainerRequest{
diff --git a/generic.go b/generic.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
 	"strings"
 	"sync"
 
@@ -113,9 +114,7 @@ func GenericLabels() map[string]string {
 
 // AddGenericLabels adds the generic labels to target.
 func AddGenericLabels(target map[string]string) {
-	for k, v := range GenericLabels() {
-		target[k] = v
-	}
+	maps.Copy(target, GenericLabels())
 }
 
 // Run is a convenience function that creates a new container and starts it.
diff --git a/generic_test.go b/generic_test.go
@@ -128,7 +128,7 @@ func TestGenericContainerShouldReturnRefOnError(t *testing.T) {
 func TestGenericReusableContainerInSubprocess(t *testing.T) {
 	wg := sync.WaitGroup{}
 	wg.Add(10)
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		go func() {
 			defer wg.Done()
 
diff --git a/internal/core/labels.go b/internal/core/labels.go
@@ -3,6 +3,7 @@ package core
 import (
 	"errors"
 	"fmt"
+	"maps"
 	"strings"
 
 	"github.com/testcontainers/testcontainers-go/internal"
@@ -51,9 +52,7 @@ func DefaultLabels(sessionID string) map[string]string {
 
 // AddDefaultLabels adds the default labels for sessionID to target.
 func AddDefaultLabels(sessionID string, target map[string]string) {
-	for k, v := range DefaultLabels(sessionID) {
-		target[k] = v
-	}
+	maps.Copy(target, DefaultLabels(sessionID))
 }
 
 // MergeCustomLabels sets labels from src to dst.
diff --git a/lifecycle.go b/lifecycle.go
@@ -559,7 +559,7 @@ func combineContainerHooks(defaultHooks, userDefinedHooks []ContainerLifecycleHo
 	hooksType := reflect.TypeOf(hooks)
 	for _, defaultHook := range defaultHooks {
 		defaultVal := reflect.ValueOf(defaultHook)
-		for i := 0; i < hooksType.NumField(); i++ {
+		for i := range hooksType.NumField() {
 			if strings.HasPrefix(hooksType.Field(i).Name, "Pre") {
 				field := hooksVal.Field(i)
 				field.Set(reflect.AppendSlice(field, defaultVal.Field(i)))
@@ -572,7 +572,7 @@ func combineContainerHooks(defaultHooks, userDefinedHooks []ContainerLifecycleHo
 	// post-hooks will be the first ones to be executed.
 	for _, userDefinedHook := range userDefinedHooks {
 		userVal := reflect.ValueOf(userDefinedHook)
-		for i := 0; i < hooksType.NumField(); i++ {
+		for i := range hooksType.NumField() {
 			field := hooksVal.Field(i)
 			field.Set(reflect.AppendSlice(field, userVal.Field(i)))
 		}
@@ -581,7 +581,7 @@ func combineContainerHooks(defaultHooks, userDefinedHooks []ContainerLifecycleHo
 	// Finally, append the default post-hooks.
 	for _, defaultHook := range defaultHooks {
 		defaultVal := reflect.ValueOf(defaultHook)
-		for i := 0; i < hooksType.NumField(); i++ {
+		for i := range hooksType.NumField() {
 			if strings.HasPrefix(hooksType.Field(i).Name, "Post") {
 				field := hooksVal.Field(i)
 				field.Set(reflect.AppendSlice(field, defaultVal.Field(i)))
diff --git a/lifecycle_test.go b/lifecycle_test.go
@@ -749,7 +749,7 @@ func TestCombineLifecycleHooks(t *testing.T) {
 	// - pre-X hooks: first default (2*2), then user-defined (3*2)
 	// - post-X hooks: first user-defined (3*2), then default (2*2)
 
-	for i := 0; i < 5; i++ {
+	for i := range 5 {
 		var hookType string
 		// this is the particular order of execution for the hooks
 		switch i {
@@ -1010,13 +1010,13 @@ func Test_combineContainerHooks(t *testing.T) {
 	gotVal := reflect.ValueOf(got)
 	gotType := reflect.TypeOf(got)
 	expectedVal := reflect.ValueOf(expects)
-	for i := 0; i < gotVal.NumField(); i++ {
+	for i := range gotVal.NumField() {
 		fieldName := gotType.Field(i).Name
 		gotField := gotVal.Field(i)
 		expectedField := expectedVal.Field(i)
 		require.Equalf(t, expectedField.Len(), 2, "field %q not setup len expected %d got %d", fieldName, 2, expectedField.Len()) //nolint:testifylint // False positive.
 		require.Equalf(t, expectedField.Len(), gotField.Len(), "field %q len expected %d got %d", fieldName, gotField.Len(), expectedField.Len())
-		for j := 0; j < gotField.Len(); j++ {
+		for j := range gotField.Len() {
 			gotIndex := gotField.Index(j)
 			expectedIndex := expectedField.Index(j)
 			var gotID string
diff --git a/network/network.go b/network/network.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
 
 	"github.com/docker/docker/api/types/network"
 	"github.com/google/uuid"
@@ -118,9 +119,7 @@ func WithInternal() CustomizeNetworkOption {
 // to the default Testcontainers for Go labels.
 func WithLabels(labels map[string]string) CustomizeNetworkOption {
 	return func(original *network.CreateOptions) error {
-		for k, v := range labels {
-			original.Labels[k] = v
-		}
+		maps.Copy(original.Labels, labels)
 
 		return nil
 	}
diff --git a/network/network_test.go b/network/network_test.go
@@ -167,7 +167,7 @@ func TestContainerWithReaperNetwork(t *testing.T) {
 
 	maxNetworksCount := 2
 
-	for i := 0; i < maxNetworksCount; i++ {
+	for range maxNetworksCount {
 		n, err := network.New(ctx)
 		require.NoError(t, err)
 		testcontainers.CleanupNetwork(t, n)
@@ -306,7 +306,7 @@ func TestWithNetwork(t *testing.T) {
 	networkName := nw.Name
 
 	// check that the network is reused, multiple times
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		req := testcontainers.GenericContainerRequest{
 			ContainerRequest: testcontainers.ContainerRequest{},
 		}
diff --git a/options.go b/options.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
 	"net/url"
 	"time"
 
@@ -77,9 +78,7 @@ func WithEnv(envs map[string]string) CustomizeRequestOption {
 			req.Env = map[string]string{}
 		}
 
-		for key, val := range envs {
-			req.Env[key] = val
-		}
+		maps.Copy(req.Env, envs)
 
 		return nil
 	}
@@ -491,9 +490,7 @@ func WithLabels(labels map[string]string) CustomizeRequestOption {
 		if req.Labels == nil {
 			req.Labels = make(map[string]string)
 		}
-		for k, v := range labels {
-			req.Labels[k] = v
-		}
+		maps.Copy(req.Labels, labels)
 		return nil
 	}
 }
@@ -528,9 +525,7 @@ func WithTmpfs(tmpfs map[string]string) CustomizeRequestOption {
 		if req.Tmpfs == nil {
 			req.Tmpfs = make(map[string]string)
 		}
-		for k, v := range tmpfs {
-			req.Tmpfs[k] = v
-		}
+		maps.Copy(req.Tmpfs, tmpfs)
 		return nil
 	}
 }
diff --git a/parallel.go b/parallel.go
@@ -61,10 +61,7 @@ func ParallelContainers(ctx context.Context, reqs ParallelContainerRequest, opt
 		opt.WorkersCount = defaultWorkersCount
 	}
 
-	tasksChanSize := opt.WorkersCount
-	if tasksChanSize > len(reqs) {
-		tasksChanSize = len(reqs)
-	}
+	tasksChanSize := min(opt.WorkersCount, len(reqs))
 
 	tasksChan := make(chan GenericContainerRequest, tasksChanSize)
 	resultsChan := make(chan parallelContainersResult, tasksChanSize)
@@ -74,7 +71,7 @@ func ParallelContainers(ctx context.Context, reqs ParallelContainerRequest, opt
 	wg.Add(tasksChanSize)
 
 	// run workers
-	for i := 0; i < tasksChanSize; i++ {
+	for range tasksChanSize {
 		go parallelContainersRunner(ctx, tasksChan, resultsChan, &wg)
 	}
 
diff --git a/port_forwarding.go b/port_forwarding.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"slices"
 	"sync"
 	"time"
 
@@ -135,13 +136,7 @@ func exposeHostPorts(ctx context.Context, req *ContainerRequest, ports ...int) (
 
 		modes := []container.NetworkMode{container.NetworkMode(sshdFirstNetwork), "none", "host"}
 		// if the container is not in one of the modes, attach it to the first network of the SSHD container
-		found := false
-		for _, mode := range modes {
-			if hostConfig.NetworkMode == mode {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(modes, hostConfig.NetworkMode)
 		if !found {
 			req.Networks = append(req.Networks, sshdFirstNetwork)
 		}
diff --git a/reaper_test.go b/reaper_test.go
@@ -531,7 +531,7 @@ func TestReaper_ReuseRunning(t *testing.T) {
 
 	obtainedReaperContainerIDs := make([]string, concurrency)
 	var wg sync.WaitGroup
-	for i := 0; i < concurrency; i++ {
+	for i := range concurrency {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
@@ -554,7 +554,7 @@ func TestReaper_ReuseRunning(t *testing.T) {
 
 func TestSpawnerBackoff(t *testing.T) {
 	b := spawner.backoff()
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		require.LessOrEqual(t, b.NextBackOff(), time.Millisecond*250, "backoff should not exceed max interval")
 	}
 }
diff --git a/wait/walk.go b/wait/walk.go
@@ -2,6 +2,7 @@ package wait
 
 import (
 	"errors"
+	"slices"
 )
 
 var (
@@ -63,7 +64,7 @@ func walk(root *Strategy, visit VisitFunc) error {
 		for range s.Strategies {
 			if err := walk(&s.Strategies[i], visit); err != nil {
 				if errors.Is(err, ErrVisitRemove) {
-					s.Strategies = append(s.Strategies[:i], s.Strategies[i+1:]...)
+					s.Strategies = slices.Delete(s.Strategies, i, i+1)
 					if errors.Is(err, VisitStop) {
 						return VisitStop
 					}
