Use slices.Sorted(maps.Keys(...)) to replace collect-keys-then-sort pattern

acceptance/acceptance_test.go

@@ -10,6 +10,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"maps"
 	"net/http"
 	"os"
 	"os/exec"
@@ -31,7 +32,6 @@ import (
 	"github.com/databricks/cli/libs/auth"
 	"github.com/databricks/cli/libs/testdiff"
 	"github.com/databricks/cli/libs/testserver"
-	"github.com/databricks/cli/libs/utils"
 	"github.com/stretchr/testify/require"
 )
 
@@ -817,7 +817,7 @@ func buildTestEnv(configEnv map[string]string, customEnv []string) []string {
 	env := make([]string, 0, len(configEnv)+len(customEnv))
 
 	// Add config.Env first (but skip keys that exist in customEnv)
-	for _, key := range utils.SortedKeys(configEnv) {
+	for _, key := range slices.Sorted(maps.Keys(configEnv)) {
 		if hasKey(customEnv, key) {
 			continue
 		}

acceptance/internal/config.go

@@ -2,6 +2,7 @@ package internal
 
 import (
 	"hash/fnv"
+	"maps"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -345,11 +346,7 @@ func ExpandEnvMatrix(matrix, exclude map[string][]string, extraVars []string) []
 		return result
 	}
 
-	keys := make([]string, 0, len(filteredMatrix))
-	for key := range filteredMatrix {
-		keys = append(keys, key)
-	}
-	slices.Sort(keys)
+	keys := slices.Sorted(maps.Keys(filteredMatrix))
 
 	// Build an expansion of all combinations.
 	// At each step we look at a given key and append each possible value to each

bundle/artifacts/build.go

@@ -3,8 +3,10 @@ package artifacts
 import (
 	"context"
 	"fmt"
+	"maps"
 	"os"
 	"path/filepath"
+	"slices"
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/bundle/config"
@@ -15,7 +17,6 @@ import (
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/cli/libs/logdiag"
 	"github.com/databricks/cli/libs/patchwheel"
-	"github.com/databricks/cli/libs/utils"
 )
 
 func Build() bundle.Mutator {
@@ -37,7 +38,7 @@ func (m *build) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 		})
 	}
 
-	for _, artifactName := range utils.SortedKeys(b.Config.Artifacts) {
+	for _, artifactName := range slices.Sorted(maps.Keys(b.Config.Artifacts)) {
 		a := b.Config.Artifacts[artifactName]
 
 		if a.BuildCommand != "" {

bundle/artifacts/prepare.go

@@ -3,8 +3,10 @@ package artifacts
 import (
 	"context"
 	"errors"
+	"maps"
 	"os"
 	"path/filepath"
+	"slices"
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/bundle/config"
@@ -15,7 +17,6 @@ import (
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/cli/libs/logdiag"
 	"github.com/databricks/cli/libs/python"
-	"github.com/databricks/cli/libs/utils"
 )
 
 func Prepare() bundle.Mutator {
@@ -34,7 +35,7 @@ func (m *prepare) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics
 		return diag.FromErr(err)
 	}
 
-	for _, artifactName := range utils.SortedKeys(b.Config.Artifacts) {
+	for _, artifactName := range slices.Sorted(maps.Keys(b.Config.Artifacts)) {
 		artifact := b.Config.Artifacts[artifactName]
 		if artifact == nil {
 			l := b.Config.GetLocation("artifacts." + artifactName)

bundle/config/validate/scripts.go

@@ -3,12 +3,13 @@ package validate
 import (
 	"context"
 	"fmt"
+	"maps"
 	"regexp"
+	"slices"
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/cli/libs/dyn"
-	"github.com/databricks/cli/libs/utils"
 )
 
 type validateScripts struct{}
@@ -28,7 +29,7 @@ func (f *validateScripts) Apply(ctx context.Context, b *bundle.Bundle) diag.Diag
 
 	// Sort the scripts to have a deterministic order for the
 	// generated diagnostics.
-	scriptKeys := utils.SortedKeys(b.Config.Scripts)
+	scriptKeys := slices.Sorted(maps.Keys(b.Config.Scripts))
 
 	for _, k := range scriptKeys {
 		script := b.Config.Scripts[k]

bundle/configsync/format.go

@@ -2,6 +2,7 @@ package configsync
 
 import (
 	"fmt"
+	"maps"
 	"slices"
 	"strings"
 )
@@ -17,21 +18,13 @@ func FormatTextOutput(changes Changes) string {
 
 	output.WriteString(fmt.Sprintf("Detected changes in %d resource(s):\n\n", len(changes)))
 
-	resourceKeys := make([]string, 0, len(changes))
-	for key := range changes {
-		resourceKeys = append(resourceKeys, key)
-	}
-	slices.Sort(resourceKeys)
+	resourceKeys := slices.Sorted(maps.Keys(changes))
 
 	for _, resourceKey := range resourceKeys {
 		resourceChanges := changes[resourceKey]
 		output.WriteString(fmt.Sprintf("Resource: %s\n", resourceKey))
 
-		paths := make([]string, 0, len(resourceChanges))
-		for path := range resourceChanges {
-			paths = append(paths, path)
-		}
-		slices.Sort(paths)
+		paths := slices.Sorted(maps.Keys(resourceChanges))
 
 		for _, path := range paths {
 			configChange := resourceChanges[path]

bundle/configsync/resolve.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"io/fs"
+	"maps"
 	"path/filepath"
 	"slices"
 	"strings"
@@ -171,11 +172,7 @@ func ResolveChanges(ctx context.Context, b *bundle.Bundle, configChanges Changes
 	var result []FieldChange
 	targetName := b.Config.Bundle.Target
 
-	resourceKeys := make([]string, 0, len(configChanges))
-	for resourceKey := range configChanges {
-		resourceKeys = append(resourceKeys, resourceKey)
-	}
-	slices.Sort(resourceKeys)
+	resourceKeys := slices.Sorted(maps.Keys(configChanges))
 
 	for _, resourceKey := range resourceKeys {
 		resourceChanges := configChanges[resourceKey]

bundle/direct/bundle_plan.go

@@ -23,7 +23,6 @@ import (
 	"github.com/databricks/cli/libs/structs/structdiff"
 	"github.com/databricks/cli/libs/structs/structpath"
 	"github.com/databricks/cli/libs/structs/structvar"
-	"github.com/databricks/cli/libs/utils"
 	"github.com/databricks/databricks-sdk-go"
 )
 
@@ -968,7 +967,7 @@ func (b *DeploymentBundle) getAdapterForKey(resourceKey string) (*dresources.Ada
 
 	adapter, ok := b.Adapters[group]
 	if !ok {
-		return nil, fmt.Errorf("resource type %q not supported, available: %s", group, strings.Join(utils.SortedKeys(b.Adapters), ", "))
+		return nil, fmt.Errorf("resource type %q not supported, available: %s", group, strings.Join(slices.Sorted(maps.Keys(b.Adapters)), ", "))
 	}
 
 	return adapter, nil

bundle/direct/graph.go

@@ -2,17 +2,18 @@ package direct
 
 import (
 	"fmt"
+	"maps"
+	"slices"
 
 	"github.com/databricks/cli/bundle/deployplan"
 	"github.com/databricks/cli/libs/dagrun"
-	"github.com/databricks/cli/libs/utils"
 )
 
 func makeGraph(plan *deployplan.Plan) (*dagrun.Graph, error) {
 	g := dagrun.NewGraph()
 
 	// Add all nodes first
-	for _, resourceKey := range utils.SortedKeys(plan.Plan) {
+	for _, resourceKey := range slices.Sorted(maps.Keys(plan.Plan)) {
 		g.AddNode(resourceKey)
 	}
 

bundle/internal/schema/annotations.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"maps"
 	"os"
 	"reflect"
 	"regexp"
@@ -183,12 +184,7 @@ func saveYamlWithStyle(outputPath string, annotations annotation.File) error {
 }
 
 func getAlphabeticalOrder[T any](mapping map[string]T) *yamlsaver.Order {
-	var order []string
-	for k := range mapping {
-		order = append(order, k)
-	}
-	slices.Sort(order)
-	return yamlsaver.NewOrder(order)
+	return yamlsaver.NewOrder(slices.Sorted(maps.Keys(mapping)))
 }
 
 func convertLinksToAbsoluteUrl(s string) string {

bundle/internal/tf/codegen/generator/generator.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"maps"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"text/template"
 
@@ -56,7 +58,7 @@ func (r *root) Generate(path string) error {
 func Run(ctx context.Context, schema *tfjson.ProviderSchema, checksums *schemapkg.ProviderChecksums, path string) error {
 	// Generate types for resources
 	var resources []*namedBlock
-	for _, k := range sortKeys(schema.ResourceSchemas) {
+	for _, k := range slices.Sorted(maps.Keys(schema.ResourceSchemas)) {
 		// Skipping all plugin framework struct generation.
 		// TODO: This is a temporary fix, generation should be fixed in the future.
 		if strings.HasSuffix(k, "_pluginframework") {
@@ -87,7 +89,7 @@ func Run(ctx context.Context, schema *tfjson.ProviderSchema, checksums *schemapk
 
 	// Generate types for data sources.
 	var dataSources []*namedBlock
-	for _, k := range sortKeys(schema.DataSourceSchemas) {
+	for _, k := range slices.Sorted(maps.Keys(schema.DataSourceSchemas)) {
 		// Skipping all plugin framework struct generation.
 		// TODO: This is a temporary fix, generation should be fixed in the future.
 		if strings.HasSuffix(k, "_pluginframework") {

bundle/internal/tf/codegen/generator/walker.go

@@ -2,6 +2,7 @@ package generator
 
 import (
 	"fmt"
+	"maps"
 	"slices"
 	"strings"
 
@@ -117,7 +118,7 @@ func processAttributeType(typ cty.Type, resourceName, attributePath string) stri
 }
 
 func nestedBlockKeys(block *tfjson.SchemaBlock) []string {
-	keys := sortKeys(block.NestedBlocks)
+	keys := slices.Sorted(maps.Keys(block.NestedBlocks))
 
 	// Remove TF specific "timeouts" block.
 	if i := slices.Index(keys, "timeouts"); i != -1 {
@@ -163,7 +164,7 @@ func (w *walker) walk(block *tfjson.SchemaBlock, name []string) error {
 	}
 
 	// Declare attributes.
-	for _, k := range sortKeys(block.Attributes) {
+	for _, k := range slices.Sorted(maps.Keys(block.Attributes)) {
 		v := block.Attributes[k]
 
 		// Assert the attribute type is always set.

bundle/internal/validation/enum.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"go/format"
+	"maps"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -182,11 +183,7 @@ func filterTargetsAndEnvironmentsEnum(patterns map[string][]EnumPatternInfo) map
 // sortGroupedPatterns sorts patterns within each group and returns them as a sorted slice
 func sortGroupedPatternsEnum(groupedPatterns map[string][]EnumPatternInfo) [][]EnumPatternInfo {
 	// Get sorted group keys
-	groupKeys := make([]string, 0, len(groupedPatterns))
-	for key := range groupedPatterns {
-		groupKeys = append(groupKeys, key)
-	}
-	slices.Sort(groupKeys)
+	groupKeys := slices.Sorted(maps.Keys(groupedPatterns))
 
 	// Build sorted result
 	result := make([][]EnumPatternInfo, 0, len(groupKeys))

bundle/internal/validation/required.go

@@ -5,6 +5,7 @@ import (
 	"cmp"
 	"fmt"
 	"go/format"
+	"maps"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -138,11 +139,7 @@ func filterTargetsAndEnvironments(patterns map[string][]RequiredPatternInfo) map
 // sortGroupedPatterns sorts patterns within each group and returns them as a sorted slice
 func sortGroupedPatterns(groupedPatterns map[string][]RequiredPatternInfo) [][]RequiredPatternInfo {
 	// Get sorted group keys
-	groupKeys := make([]string, 0, len(groupedPatterns))
-	for key := range groupedPatterns {
-		groupKeys = append(groupKeys, key)
-	}
-	slices.Sort(groupKeys)
+	groupKeys := slices.Sorted(maps.Keys(groupedPatterns))
 
 	// Build sorted result
 	result := make([][]RequiredPatternInfo, 0, len(groupKeys))

bundle/libraries/remote_path.go

@@ -3,13 +3,14 @@ package libraries
 import (
 	"context"
 	"fmt"
+	"maps"
 	"path"
 	"path/filepath"
+	"slices"
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/cli/libs/dyn"
-	"github.com/databricks/cli/libs/utils"
 )
 
 // ReplaceWithRemotePath updates all the libraries paths to point to the remote location
@@ -25,7 +26,7 @@ func ReplaceWithRemotePath(ctx context.Context, b *bundle.Bundle) (map[string][]
 		return nil, diag.FromErr(err)
 	}
 
-	sources := utils.SortedKeys(libs)
+	sources := slices.Sorted(maps.Keys(libs))
 
 	// Update all the config paths to point to the uploaded location
 	err = b.Config.Mutate(func(v dyn.Value) (dyn.Value, error) {