Upgraded Go version to 1.21

bundle/artifacts/all.go

@@ -4,9 +4,10 @@ import (
 	"context"
 	"fmt"
 
+	"slices"
+
 	"github.com/databricks/cli/bundle"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 )
 
 // all is an internal proxy for producing a list of mutators for all artifacts.

bundle/config/interpolation/interpolation.go

@@ -9,10 +9,11 @@ import (
 	"sort"
 	"strings"
 
+	"slices"
+
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/bundle/config/variable"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 )
 
 const Delimiter = "."

bundle/config/interpolation/lookup.go

@@ -3,9 +3,8 @@ package interpolation
 import (
 	"errors"
 	"fmt"
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 // LookupFunction returns the value to rewrite a path expression to.

bundle/config/mutator/process_root_includes.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/bundle/config"
-	"golang.org/x/exp/slices"
 )
 
 // Get extra include paths from environment variable

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

@@ -1,8 +1,9 @@
 package generator
 
 import (
+	"slices"
+
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 )
 
 // sortKeys returns a sorted copy of the keys in the specified map.

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

@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"strings"
 
+	"slices"
+
 	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/iancoleman/strcase"
 	"github.com/zclconf/go-cty/cty"
-	"golang.org/x/exp/slices"
 )
 
 type field struct {

cmd/root/logger.go

@@ -4,14 +4,14 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
 
 	"github.com/databricks/cli/libs/cmdio"
 	"github.com/databricks/cli/libs/flags"
 	"github.com/databricks/cli/libs/log"
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slog"
 )
 
 const (
@@ -52,11 +52,12 @@ func (l *friendlyHandler) coloredLevel(rec slog.Record) string {
 func (l *friendlyHandler) Handle(ctx context.Context, rec slog.Record) error {
 	t := fmt.Sprintf("%02d:%02d", rec.Time.Hour(), rec.Time.Minute())
 	attrs := ""
-	rec.Attrs(func(a slog.Attr) {
+	rec.Attrs(func(a slog.Attr) bool {
 		attrs += fmt.Sprintf(" %s%s%s",
 			color.CyanString(a.Key),
 			color.CyanString("="),
 			color.YellowString(a.Value.String()))
+		return true
 	})
 	msg := fmt.Sprintf("%s %s %s%s\n",
 		color.MagentaString(t),
@@ -76,16 +77,16 @@ type logFlags struct {
 func (f *logFlags) makeLogHandler(opts slog.HandlerOptions) (slog.Handler, error) {
 	switch f.output {
 	case flags.OutputJSON:
-		return opts.NewJSONHandler(f.file.Writer()), nil
+		return slog.NewJSONHandler(f.file.Writer(), &opts), nil
 	case flags.OutputText:
 		w := f.file.Writer()
 		if cmdio.IsTTY(w) {
 			return &friendlyHandler{
-				Handler: opts.NewTextHandler(w),
+				Handler: slog.NewTextHandler(w, &opts),
 				w:       w,
 			}, nil
 		}
-		return opts.NewTextHandler(w), nil
+		return slog.NewTextHandler(w, &opts), nil
 
 	default:
 		return nil, fmt.Errorf("invalid log output mode: %s", f.output)

cmd/root/root.go

@@ -6,11 +6,12 @@ import (
 	"os"
 	"strings"
 
+	"log/slog"
+
 	"github.com/databricks/cli/internal/build"
 	"github.com/databricks/cli/libs/cmdio"
 	"github.com/databricks/cli/libs/log"
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slog"
 )
 
 func New() *cobra.Command {

internal/helpers.go

@@ -37,7 +37,6 @@ func GetEnvOrSkipTest(t *testing.T, name string) string {
 
 // RandomName gives random name with optional prefix. e.g. qa.RandomName("tf-")
 func RandomName(prefix ...string) string {
-	rand.Seed(time.Now().UnixNano())
 	randLen := 12
 	b := make([]byte, randLen)
 	for i := range b {

libs/cmdio/io.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/briandowns/spinner"
 	"github.com/databricks/cli/libs/flags"
 	"github.com/manifoldco/promptui"
 	"github.com/mattn/go-isatty"
-	"golang.org/x/exp/slices"
 )
 
 // cmdIO is the private instance, that is not supposed to be accessed
@@ -140,8 +140,8 @@ func (c *cmdIO) Select(names map[string]string, label string) (id string, err er
 	for k, v := range names {
 		items = append(items, tuple{k, v})
 	}
-	slices.SortFunc(items, func(a, b tuple) bool {
-		return a.Name < b.Name
+	slices.SortFunc(items, func(a, b tuple) int {
+		return strings.Compare(a.Name, b.Name)
 	})
 	idx, _, err := (&promptui.Select{
 		Label:             label,

libs/filer/dbfs_client.go

@@ -7,14 +7,14 @@ import (
 	"io/fs"
 	"net/http"
 	"path"
+	"slices"
 	"sort"
 	"strings"
 	"time"
 
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/service/files"
-	"golang.org/x/exp/slices"
 )
 
 // Type that implements fs.DirEntry for DBFS.

libs/filer/files_client.go

@@ -10,13 +10,13 @@ import (
 	"net/http"
 	"net/url"
 	"path"
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/client"
-	"golang.org/x/exp/slices"
 )
 
 // Type that implements fs.FileInfo for the Files API.

libs/filer/local_client.go

@@ -6,8 +6,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
-
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // LocalClient implements the [Filer] interface for the local filesystem.

libs/filer/slice.go

@@ -1,6 +1,6 @@
 package filer
 
-import "golang.org/x/exp/slices"
+import "slices"
 
 // sliceWithout returns a copy of the specified slice without element e, if it is present.
 func sliceWithout[S []E, E comparable](s S, e E) S {

libs/filer/workspace_files_client.go

@@ -11,6 +11,7 @@ import (
 	"net/url"
 	"path"
 	"regexp"
+	"slices"
 	"sort"
 	"strings"
 	"time"
@@ -19,7 +20,6 @@ import (
 	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/client"
 	"github.com/databricks/databricks-sdk-go/service/workspace"
-	"golang.org/x/exp/slices"
 )
 
 // Type that implements fs.DirEntry for WSFS.

libs/flags/log_level_flag.go

@@ -2,12 +2,12 @@ package flags
 
 import (
 	"fmt"
+	"log/slog"
 	"strings"
 
 	"github.com/databricks/cli/libs/log"
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slog"
 )
 
 var levels = map[string]slog.Level{

libs/locker/locker.go

@@ -8,12 +8,12 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
+	"slices"
 	"time"
 
 	"github.com/databricks/cli/libs/filer"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/google/uuid"
-	"golang.org/x/exp/slices"
 )
 
 type UnlockOption int

libs/log/context.go

@@ -3,7 +3,7 @@ package log
 import (
 	"context"
 
-	"golang.org/x/exp/slog"
+	"log/slog"
 )
 
 type logger int

libs/log/levels.go

@@ -1,6 +1,6 @@
 package log
 
-import "golang.org/x/exp/slog"
+import "log/slog"
 
 const (
 	LevelTrace slog.Level = -8

libs/log/logger.go

@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"time"
 
-	"golang.org/x/exp/slog"
+	"log/slog"
 )
 
 // GetLogger returns either the logger configured on the context,

libs/log/replace_attr.go

@@ -1,6 +1,6 @@
 package log
 
-import "golang.org/x/exp/slog"
+import "log/slog"
 
 type ReplaceAttrFunction func(groups []string, a slog.Attr) slog.Attr
 

libs/log/replace_attr_test.go

@@ -1,10 +1,10 @@
 package log
 
 import (
+	"log/slog"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/exp/slog"
 )
 
 func testReplaceA(groups []string, a slog.Attr) slog.Attr {

libs/log/sdk.go

@@ -6,8 +6,9 @@ import (
 	"runtime"
 	"time"
 
+	"log/slog"
+
 	sdk "github.com/databricks/databricks-sdk-go/logger"
-	"golang.org/x/exp/slog"
 )
 
 // slogAdapter makes an slog.Logger usable with the Databricks SDK.

libs/log/source.go

@@ -1,9 +1,8 @@
 package log
 
 import (
+	"log/slog"
 	"path/filepath"
-
-	"golang.org/x/exp/slog"
 )
 
 // ReplaceSourceAttr rewrites the source attribute to include only the file's basename.

libs/log/source_test.go

@@ -1,10 +1,10 @@
 package log
 
 import (
+	"log/slog"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/exp/slog"
 )
 
 func TestReplaceSourceAttrSourceKey(t *testing.T) {

libs/template/renderer.go

@@ -8,13 +8,13 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"slices"
 	"strings"
 	"text/template"
 
 	"github.com/databricks/cli/libs/filer"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/databricks-sdk-go/logger"
-	"golang.org/x/exp/slices"
 )
 
 const templateExtension = ".tmpl"

libs/template/validators.go

@@ -3,9 +3,9 @@ package template
 import (
 	"fmt"
 	"reflect"
+	"slices"
 
 	"github.com/databricks/cli/libs/jsonschema"
-	"golang.org/x/exp/slices"
 )
 
 type validator func(v any) error