..

nfx · nfx · commit ec753640edd9 · 2023-11-09T13:14:39.000+01:00
diff --git a/cmd/auth/login.go b/cmd/auth/login.go
@@ -10,7 +10,6 @@ import (
 	"github.com/databricks/cli/libs/databrickscfg"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/config"
-	"github.com/databricks/databricks-sdk-go/service/compute"
 	"github.com/spf13/cobra"
 )
 
@@ -28,6 +27,8 @@ func configureHost(ctx context.Context, persistentAuth *auth.PersistentAuth, arg
 	return nil
 }
 
+const minimalDbConnectVersion = "13.1"
+
 func newLoginCommand(persistentAuth *auth.PersistentAuth) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "login [HOST]",
@@ -95,19 +96,11 @@ func newLoginCommand(persistentAuth *auth.PersistentAuth) *cobra.Command {
 				return err
 			}
 			ctx := cmd.Context()
-
-			promptSpinner := cmdio.Spinner(ctx)
-			promptSpinner <- "Loading list of clusters to select from"
-			names, err := w.Clusters.ClusterDetailsClusterNameToClusterIdMap(ctx, compute.ListClustersRequest{})
-			close(promptSpinner)
-			if err != nil {
-				return fmt.Errorf("failed to load clusters list. Original error: %w", err)
-			}
-			clusterId, err := cmdio.Select(ctx, names, "Choose cluster")
+			clusterID, err := databrickscfg.AskForClusterCompatibleWithUC(ctx, w, minimalDbConnectVersion)
 			if err != nil {
 				return err
 			}
-			cfg.ClusterID = clusterId
+			cfg.ClusterID = clusterID
 		}
 
 		if profileName != "" {
diff --git a/libs/databrickscfg/profiles.go b/libs/databrickscfg/profiles.go
@@ -14,9 +14,11 @@ import (
 // It should only be used for prompting and filtering.
 // Use its name to construct a config.Config.
 type Profile struct {
-	Name      string
-	Host      string
-	AccountID string
+	Name        string
+	Host        string
+	AccountID   string
+	ClusterID   string
+	WarehouseID string
 }
 
 func (p Profile) Cloud() string {
@@ -117,9 +119,11 @@ func LoadProfiles(fn ProfileMatchFunction) (file string, profiles Profiles, err
 			continue
 		}
 		profile := Profile{
-			Name:      v.Name(),
-			Host:      host,
-			AccountID: all["account_id"],
+			Name:        v.Name(),
+			Host:        host,
+			AccountID:   all["account_id"],
+			ClusterID:   all["cluster_id"],
+			WarehouseID: all["warehouse_id"],
 		}
 		if fn(profile) {
 			profiles = append(profiles, profile)
diff --git a/libs/databrickscfg/uc_clusters.go b/libs/databrickscfg/uc_clusters.go
@@ -111,6 +111,15 @@ func AskForClusterCompatibleWithUC(ctx context.Context, w *databricks.WorkspaceC
 		if !IsCompatibleWithUC(&v, minVersion) {
 			continue
 		}
+		switch v.ClusterSource {
+		case compute.ClusterSourceJob,
+			compute.ClusterSourceModels,
+			compute.ClusterSourcePipeline,
+			compute.ClusterSourcePipelineMaintenance,
+			compute.ClusterSourceSql:
+			// only UI and API clusters are usable for DBConnect
+			continue
+		}
 		if v.SingleUserName != "" && v.SingleUserName != me.UserName {
 			continue
 		}
