chore: apply fixes from Go modernize command (#1312)

blgm · web-flow · commit 20744856c7dc · 2025-09-09T14:13:10.000+01:00
The modernize command replaces old constructs with simpler, updated ones.

Command is:
go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...
diff --git a/cmd/purge_binding.go b/cmd/purge_binding.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"log"
+	"slices"
 
 	"github.com/spf13/cobra"
 
@@ -72,14 +73,12 @@ func purgeServiceBinding(serviceInstanceGUID, serviceBindingGUID string) {
 	if err != nil {
 		log.Fatalf("error listing bindings: %s", err)
 	}
-	for _, bindingGUID := range bindings {
-		if bindingGUID == serviceBindingGUID {
-			if err := deleteServiceBindingFromStore(store, serviceInstanceGUID, serviceBindingGUID); err != nil {
-				log.Fatalf("error deleting binding %q for service instance %q: %s", serviceBindingGUID, serviceInstanceGUID, err)
-			}
-			log.Printf("deleted binding %q for service instance %q from the Cloud Service Broker database", serviceBindingGUID, serviceInstanceGUID)
-			return
+	if slices.Contains(bindings, serviceBindingGUID) {
+		if err := deleteServiceBindingFromStore(store, serviceInstanceGUID, serviceBindingGUID); err != nil {
+			log.Fatalf("error deleting binding %q for service instance %q: %s", serviceBindingGUID, serviceInstanceGUID, err)
 		}
+		log.Printf("deleted binding %q for service instance %q from the Cloud Service Broker database", serviceBindingGUID, serviceInstanceGUID)
+		return
 	}
 
 	log.Fatalf("could not find service binding %q for service instance %q", serviceBindingGUID, serviceInstanceGUID)
diff --git a/internal/brokerpak/fetcher/fetch.go b/internal/brokerpak/fetcher/fetch.go
@@ -4,6 +4,7 @@ package fetcher
 
 import (
 	"fmt"
+	"maps"
 	"os"
 	"path/filepath"
 
@@ -40,9 +41,7 @@ func newFileGetterClient(src, dest string) *getter.Client {
 
 func defaultGetters() map[string]getter.Getter {
 	getters := map[string]getter.Getter{}
-	for k, g := range getter.Getters {
-		getters[k] = g
-	}
+	maps.Copy(getters, getter.Getters)
 
 	return getters
 }
diff --git a/internal/local/local.go b/internal/local/local.go
@@ -17,7 +17,7 @@ func nameToID(name string) string {
 		name = name + "."
 	}
 
-	h := []byte(fmt.Sprintf("%x", name))
+	h := fmt.Appendf(nil, "%x", name)
 	return fmt.Sprintf("%s-%s-%s-%s-%s", h[0:8], h[8:12], h[12:16], h[16:20], h[20:32])
 }
 
diff --git a/internal/storage/terraform_deployment_test.go b/internal/storage/terraform_deployment_test.go
@@ -280,11 +280,11 @@ func addFakeTerraformDeployments() {
 func fakeWorkspace(name, ver string) []byte {
 	state := "null"
 	if ver != "" {
-		state = fmt.Sprintf("%q", base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf(`{"terraform_version":"%s"}`, ver))))
+		state = fmt.Sprintf("%q", base64.StdEncoding.EncodeToString(fmt.Appendf(nil, `{"terraform_version":"%s"}`, ver)))
 	}
-	return []byte(fmt.Sprintf(`{"modules":[{"Name":"%s","Definition":"","Definitions":null}],"instances":null,"tfstate":%s,"transform":{"parameter_mappings":null,"parameters_to_remove":null,"parameters_to_add":null}}`, name, state))
+	return fmt.Appendf(nil, `{"modules":[{"Name":"%s","Definition":"","Definitions":null}],"instances":null,"tfstate":%s,"transform":{"parameter_mappings":null,"parameters_to_remove":null,"parameters_to_add":null}}`, name, state)
 }
 
 func fakeEncryptedWorkspace(name, ver string) []byte {
-	return []byte(fmt.Sprintf(`{"encrypted":{"decrypted":%s}}`, fakeWorkspace(name, ver)))
+	return fmt.Appendf(nil, `{"encrypted":{"decrypted":%s}}`, fakeWorkspace(name, ver))
 }
diff --git a/internal/zippy/extract.go b/internal/zippy/extract.go
@@ -4,6 +4,7 @@ import (
 	"archive/zip"
 	"fmt"
 	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/cloudfoundry/cloud-service-broker/v2/utils/stream"
@@ -82,12 +83,7 @@ func containsDotDot(v string) bool {
 	if !strings.Contains(v, "..") {
 		return false
 	}
-	for _, ent := range strings.FieldsFunc(v, isSlashRune) {
-		if ent == ".." {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(strings.FieldsFunc(v, isSlashRune), "..")
 }
 
 func isSlashRune(r rune) bool { return r == '/' || r == '\\' }
diff --git a/pkg/broker/service_definition.go b/pkg/broker/service_definition.go
@@ -17,6 +17,7 @@ package broker
 import (
 	"encoding/json"
 	"fmt"
+	"maps"
 	"os"
 	"strings"
 
@@ -196,7 +197,7 @@ func unmarshalViperMap(key string) (map[string]any, error) {
 			if err := json.Unmarshal([]byte(v), &vals); err != nil {
 				return nil, fmt.Errorf("failed unmarshaling config value %s", key)
 			}
-		case map[string]interface{}:
+		case map[string]any:
 			vals = v
 		}
 	}
@@ -530,15 +531,11 @@ func (svc *ServiceDefinition) BindVariables(instance storage.ServiceInstanceDeta
 func (svc *ServiceDefinition) combineLabels(defaultLabels map[string]string) map[string]string {
 	ll := map[string]string{}
 
-	for key, value := range svc.GlobalLabels {
-		ll[key] = value
-	}
+	maps.Copy(ll, svc.GlobalLabels)
 
 	// default labels override global labels
 	// in other words, "pcf-organization-guid", "pcf-space-guid", and "pcf-instance-id" have preference over global labels
-	for key, value := range defaultLabels {
-		ll[key] = value
-	}
+	maps.Copy(ll, defaultLabels)
 
 	return ll
 }
diff --git a/pkg/broker/service_definition_test.go b/pkg/broker/service_definition_test.go
@@ -414,7 +414,7 @@ var _ = Describe("ServiceDefinition", func() {
 			When("a plan is provided in configuration as an object", func() {
 				BeforeEach(func() {
 					// fakePlanName, fakePlanID, fakePlanDescription, fakePlanProperty
-					fakeServicePlanConfigObject := []map[string]interface{}{
+					fakeServicePlanConfigObject := []map[string]any{
 						{
 							"name":                fakePlanName,
 							"id":                  fakePlanID,
@@ -428,7 +428,7 @@ var _ = Describe("ServiceDefinition", func() {
 							"additional_property": fmt.Sprintf("second-%s", fakePlanProperty),
 						},
 					}
-					viper.Set("service.fake-service.provision.defaults", map[string]interface{}{
+					viper.Set("service.fake-service.provision.defaults", map[string]any{
 						"test": "value",
 					})
 					viper.Set("service.fake-service.plans", fakeServicePlanConfigObject)
@@ -439,13 +439,13 @@ var _ = Describe("ServiceDefinition", func() {
 					Expect(plan).To(Not(HaveLen(0)))
 					provisionOverrides, err := service.ProvisionDefaultOverrides()
 					Expect(err).To(Not(HaveOccurred()))
-					Expect(provisionOverrides).To(Equal(map[string]interface{}{"test": `value`}))
+					Expect(provisionOverrides).To(Equal(map[string]any{"test": `value`}))
 				})
 			})
 
 			When("a plan with provision defaults is provided in configuration as a string", func() {
 				BeforeEach(func() {
-					fakeServicePlanConfigObject := []map[string]interface{}{
+					fakeServicePlanConfigObject := []map[string]any{
 						{
 							"name":                fakePlanName,
 							"id":                  fakePlanID,
diff --git a/pkg/broker/variables.go b/pkg/broker/variables.go
@@ -16,6 +16,7 @@ package broker
 
 import (
 	"fmt"
+	"maps"
 	"sort"
 	"strings"
 	"unicode"
@@ -99,9 +100,7 @@ func (bv *BrokerVariable) ToSchema() map[string]any {
 		schema[validation.KeyTitle] = fieldNameToLabel(bv.FieldName)
 	}
 
-	for k, v := range bv.Constraints {
-		schema[k] = v
-	}
+	maps.Copy(schema, bv.Constraints)
 
 	if len(bv.Enum) > 0 {
 		enumeration := []any{}
diff --git a/pkg/client/example_runner.go b/pkg/client/example_runner.go
@@ -73,7 +73,7 @@ func runExamples(workers int, client *Client, examples []CompleteServiceExample)
 	queue := make(chan work)
 	var wg sync.WaitGroup
 	wg.Add(workers)
-	for i := 0; i < workers; i++ {
+	for range workers {
 		go func() {
 			for w := range queue {
 				start := time.Now()
diff --git a/pkg/providers/tf/executor/executor.go b/pkg/providers/tf/executor/executor.go
@@ -90,7 +90,7 @@ func (defaultExecutor) Execute(ctx context.Context, c *exec.Cmd) (ExecutionOutpu
 
 func flatten(input []byte) string {
 	var lines []string
-	for _, l := range strings.Split(string(input), "\n") {
+	for l := range strings.SplitSeq(string(input), "\n") {
 		if line := strings.TrimSpace(l); len(line) > 0 {
 			lines = append(lines, line)
 		}
diff --git a/pkg/providers/tf/terraform_upgrade_checker_test.go b/pkg/providers/tf/terraform_upgrade_checker_test.go
@@ -48,7 +48,7 @@ var _ = Describe("CheckUpgradeAvailable", func() {
 			deployment = storage.TerraformDeployment{
 				ID: deploymentID,
 				Workspace: &workspace.TerraformWorkspace{
-					State: []byte(fmt.Sprintf(`{"terraform_version": "%s" }`, oldTerraformVersion.String())),
+					State: fmt.Appendf(nil, `{"terraform_version": "%s" }`, oldTerraformVersion.String()),
 				},
 			}
 			fakeDeploymentManager.GetTerraformDeploymentReturns(deployment, nil)
@@ -67,7 +67,7 @@ var _ = Describe("CheckUpgradeAvailable", func() {
 			deployment = storage.TerraformDeployment{
 				ID: deploymentID,
 				Workspace: &workspace.TerraformWorkspace{
-					State: []byte(fmt.Sprintf(`{"terraform_version": "%s" }`, defaultTerraformVersion.String())),
+					State: fmt.Appendf(nil, `{"terraform_version": "%s" }`, defaultTerraformVersion.String()),
 				},
 			}
 			fakeDeploymentManager.GetTerraformDeploymentReturns(deployment, nil)
diff --git a/pkg/providers/tf/upgrade.go b/pkg/providers/tf/upgrade.go
@@ -38,9 +38,8 @@ func (provider *TerraformProvider) UpgradeInstance(ctx context.Context, instance
 	}
 
 	var finished sync.WaitGroup
-	finished.Add(1)
 
-	go func() {
+	finished.Go(func() {
 		err = provider.performTerraformUpgrade(ctx, instanceDeployment.Workspace)
 		if err != nil {
 			_ = provider.MarkOperationFinished(&instanceDeployment, err)
@@ -50,8 +49,7 @@ func (provider *TerraformProvider) UpgradeInstance(ctx context.Context, instance
 		if err := provider.MarkOperationStarted(&instanceDeployment, models.UpgradeOperationType); err != nil {
 			panic(err)
 		}
-		finished.Done()
-	}()
+	})
 
 	return &finished, nil
 }
diff --git a/pkg/providers/tf/workspace/instance.go b/pkg/providers/tf/workspace/instance.go
@@ -17,6 +17,7 @@ package workspace
 import (
 	"encoding/json"
 	"fmt"
+	"maps"
 )
 
 // ModuleInstance represents the configuration of a single instance of a module.
@@ -30,9 +31,7 @@ type ModuleInstance struct {
 // definition that can be fed to Terraform to be created/destroyed.
 func (instance *ModuleInstance) MarshalDefinition(outputs []string) (json.RawMessage, error) {
 	instanceConfig := make(map[string]any)
-	for k, v := range instance.Configuration {
-		instanceConfig[k] = v
-	}
+	maps.Copy(instanceConfig, instance.Configuration)
 
 	instanceConfig["source"] = fmt.Sprintf("./%s", instance.ModuleName)
 
diff --git a/pkg/providers/tf/workspace/module.go b/pkg/providers/tf/workspace/module.go
@@ -16,7 +16,7 @@ package workspace
 
 import (
 	"fmt"
-	"sort"
+	"slices"
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclparse"
@@ -107,6 +107,6 @@ func sortedKeys(m hcl.Blocks) []string {
 		keys = append(keys, block.Labels...)
 	}
 
-	sort.Slice(keys, func(i int, j int) bool { return keys[i] < keys[j] })
+	slices.Sort(keys)
 	return keys
 }
diff --git a/pkg/providers/tf/workspace/tfimporttransform.go b/pkg/providers/tf/workspace/tfimporttransform.go
@@ -19,6 +19,7 @@ import (
 	"bytes"
 	"fmt"
 	"regexp"
+	"slices"
 	"strings"
 )
 
@@ -62,20 +63,14 @@ func (ttf *TfTransformer) CleanTf(tf string) string {
 		if res := resource.FindStringSubmatch(line); res != nil {
 			blockStack[depth] = fmt.Sprintf("%s.%s", res[1], res[2])
 		} else if res = value.FindStringSubmatch(line); res != nil {
-			for _, removal := range ttf.ParametersToRemove {
-				if fmt.Sprintf("%s.%s", blockStack[depth], res[1]) == removal {
-					skipLine = true
-					break
-				}
+			if slices.Contains(ttf.ParametersToRemove, fmt.Sprintf("%s.%s", blockStack[depth], res[1])) {
+				skipLine = true
 			}
 		} else if res := block.FindStringSubmatch(line); res != nil {
 			blockStack[depth] = fmt.Sprintf("%s.%s", blockStack[depth-1], res[1])
-			for _, removal := range ttf.ParametersToRemove {
-				if blockStack[depth] == removal {
-					skipBlockDepth = depth
-					skipLine = true
-					break
-				}
+			if slices.Contains(ttf.ParametersToRemove, blockStack[depth]) {
+				skipBlockDepth = depth
+				skipLine = true
 			}
 		}
 		if !skipLine {
@@ -95,10 +90,10 @@ func (ttf *TfTransformer) captureParameterValues(tf string) (map[string]string,
 		if res := reBlock.FindAllStringSubmatch(tf, -1); len(res) > 0 {
 			//parameterValues[mapping.ParameterName] = res[0][1]
 		} else if res := reSimple.FindAllStringSubmatch(tf, -1); len(res) > 0 {
-			if strings.HasPrefix(mapping.ParameterName, "var.") {
-				parameterValues[strings.TrimPrefix(mapping.ParameterName, "var.")] = res[0][1]
-			} else if strings.HasPrefix(mapping.ParameterName, "local.") {
-				parameterValues[strings.TrimPrefix(mapping.ParameterName, "local.")] = res[0][1]
+			if after, ok := strings.CutPrefix(mapping.ParameterName, "var."); ok {
+				parameterValues[after] = res[0][1]
+			} else if after, ok := strings.CutPrefix(mapping.ParameterName, "local."); ok {
+				parameterValues[after] = res[0][1]
 			}
 		}
 	}
diff --git a/pkg/validation/field_error.go b/pkg/validation/field_error.go
@@ -19,6 +19,7 @@ package validation
 
 import (
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 )
@@ -201,7 +202,7 @@ func asKey(key string) string {
 func flatten(path []string) string {
 	var newPath []string
 	for _, part := range path {
-		for _, p := range strings.Split(part, ".") {
+		for p := range strings.SplitSeq(part, ".") {
 			if p == CurrentField {
 				continue
 			} else if len(newPath) > 0 && isIndex(p) {
@@ -230,12 +231,7 @@ func mergePaths(a, b []string) []string {
 // containsString takes in a string slice and looks for the provided string
 // within the slice.
 func containsString(slice []string, s string) bool {
-	for _, item := range slice {
-		if item == s {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(slice, s)
 }
 
 // merge takes in a flat list of FieldErrors and returns a merged list of
@@ -264,7 +260,7 @@ func merge(errs []*FieldError) []*FieldError {
 	newErrs := make([]*FieldError, 0, len(m))
 	for _, v := range m {
 		// While we have access to the merged paths, sort them too.
-		sort.Slice(v.Paths, func(i, j int) bool { return v.Paths[i] < v.Paths[j] })
+		slices.Sort(v.Paths)
 		newErrs = append(newErrs, v)
 	}
 
diff --git a/pkg/validation/field_error_test.go b/pkg/validation/field_error_test.go
@@ -175,7 +175,7 @@ Second: X, Y, Z`,
 			}
 
 			for _, p := range []string{"3", "2", "1"} {
-				for i := 0; i < 3; i++ {
+				for range 3 {
 					fe = fe.Also(fe)
 				}
 				fe = fe.ViaField(p)
@@ -195,7 +195,7 @@ Second: X, Y, Z`,
 			for _, p := range []string{"3", "2", "1"} {
 				e := fe.ViaField(p)
 				e.Details = fmt.Sprintf("here at %s", p)
-				for i := 0; i < 3; i++ {
+				for range 3 {
 					fe = fe.Also(e)
 				}
 			}
diff --git a/pkg/varcontext/builder.go b/pkg/varcontext/builder.go
diff --git a/pkg/varcontext/interpolation/funcs.go b/pkg/varcontext/interpolation/funcs.go
diff --git a/pkg/varcontext/varcontext.go b/pkg/varcontext/varcontext.go
diff --git a/utils/utils.go b/utils/utils.go

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func nameToID(name string) string {`
`17`	`17`	`name = name + "."`
`18`	`18`	`}`
`19`	`19`
`20`		`- h := []byte(fmt.Sprintf("%x", name))`
	`20`	`+ h := fmt.Appendf(nil, "%x", name)`
`21`	`21`	`return fmt.Sprintf("%s-%s-%s-%s-%s", h[0:8], h[8:12], h[12:16], h[16:20], h[20:32])`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -280,11 +280,11 @@ func addFakeTerraformDeployments() {`
`280`	`280`	`func fakeWorkspace(name, ver string) []byte {`
`281`	`281`	`state := "null"`
`282`	`282`	`if ver != "" {`
`283`		- state = fmt.Sprintf("%q", base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf(`{"terraform_version":"%s"}`, ver))))
	`283`	+ state = fmt.Sprintf("%q", base64.StdEncoding.EncodeToString(fmt.Appendf(nil, `{"terraform_version":"%s"}`, ver)))
`284`	`284`	`}`
`285`		- return []byte(fmt.Sprintf(`{"modules":[{"Name":"%s","Definition":"","Definitions":null}],"instances":null,"tfstate":%s,"transform":{"parameter_mappings":null,"parameters_to_remove":null,"parameters_to_add":null}}`, name, state))
	`285`	+ return fmt.Appendf(nil, `{"modules":[{"Name":"%s","Definition":"","Definitions":null}],"instances":null,"tfstate":%s,"transform":{"parameter_mappings":null,"parameters_to_remove":null,"parameters_to_add":null}}`, name, state)
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`func fakeEncryptedWorkspace(name, ver string) []byte {`
`289`		- return []byte(fmt.Sprintf(`{"encrypted":{"decrypted":%s}}`, fakeWorkspace(name, ver)))
	`289`	+ return fmt.Appendf(nil, `{"encrypted":{"decrypted":%s}}`, fakeWorkspace(name, ver))
`290`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func (defaultExecutor) Execute(ctx context.Context, c *exec.Cmd) (ExecutionOutpu`
`90`	`90`
`91`	`91`	`func flatten(input []byte) string {`
`92`	`92`	`var lines []string`
`93`		`- for _, l := range strings.Split(string(input), "\n") {`
	`93`	`+ for l := range strings.SplitSeq(string(input), "\n") {`
`94`	`94`	`if line := strings.TrimSpace(l); len(line) > 0 {`
`95`	`95`	`lines = append(lines, line)`
`96`	`96`	`}`