cfgpickers

databricks · Nov 9, 2023 · 5819644 · 5819644
1 parent 321f908
commit 5819644
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 235 deletions.
diff --git a/cmd/labs/project/installer.go b/cmd/labs/project/installer.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/databricks/cli/cmd/labs/github"
 	"github.com/databricks/cli/cmd/labs/unpack"
-	"github.com/databricks/cli/cmd/workspace/clusters"
 	"github.com/databricks/cli/libs/cmdio"
 	"github.com/databricks/cli/libs/databrickscfg"
+	"github.com/databricks/cli/libs/databrickscfg/cfgpickers"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/cli/libs/process"
 	"github.com/databricks/cli/libs/python"
@@ -238,7 +238,7 @@ func (i *installer) setupPythonVirtualEnvironment(ctx context.Context, w *databr
 		if err != nil {
 			return fmt.Errorf("cluster: %w", err)
 		}
-		runtimeVersion, ok := clusters.GetRuntimeVersion(cluster)
+		runtimeVersion, ok := cfgpickers.GetRuntimeVersion(*cluster)
 		if !ok {
 			return fmt.Errorf("unsupported runtime: %s", cluster.SparkVersion)
 		}

diff --git a/cmd/labs/project/login.go b/cmd/labs/project/login.go
@@ -7,9 +7,8 @@ import (
 	"os"
 
 	"github.com/databricks/cli/cmd/root"
-	"github.com/databricks/cli/cmd/workspace/clusters"
-	"github.com/databricks/cli/cmd/workspace/warehouses"
 	"github.com/databricks/cli/libs/cmdio"
+	"github.com/databricks/cli/libs/databrickscfg/cfgpickers"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/config"
@@ -70,7 +69,8 @@ func (lc *loginConfig) askCluster(ctx context.Context, w *databricks.WorkspaceCl
 	if !cmdio.IsInteractive(ctx) {
 		return ErrNotInTTY
 	}
-	clusterID, err := clusters.AskForCompatibleCluster(ctx, w, lc.Installer.MinRuntimeVersion)
+	clusterID, err := cfgpickers.AskForCluster(ctx, w,
+		cfgpickers.WithDatabricksConnect(lc.Installer.MinRuntimeVersion))
 	if err != nil {
 		return fmt.Errorf("select: %w", err)
 	}
@@ -90,7 +90,8 @@ func (lc *loginConfig) askWarehouse(ctx context.Context, w *databricks.Workspace
 	if !cmdio.IsInteractive(ctx) {
 		return ErrNotInTTY
 	}
-	lc.WarehouseID, err = warehouses.AskForCompatibleWarehouses(ctx, w, lc.Installer.WarehouseTypes)
+	lc.WarehouseID, err = cfgpickers.AskForWarehouse(ctx, w,
+		cfgpickers.WithWarehouseTypes(lc.Installer.WarehouseTypes...))
 	return
 }
 

diff --git a/cmd/workspace/clusters/uc.go b/cmd/workspace/clusters/uc.go
diff --git a/cmd/workspace/clusters/uc_test.go b/cmd/workspace/clusters/uc_test.go
diff --git a/cmd/workspace/warehouses/ask.go b/cmd/workspace/warehouses/ask.go