steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Replaced usage of Cluster struct from terraform provider to ClusterInfo from go-sdk in config.go" 

This reverts commit a9a7672725.
This commit is contained in:
Shreyas Goenka 2022-09-01 13:38:42 +02:00
parent a9a7672725
commit 8e1fb7f824
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
project/config.go
View File

@ -7,8 +7,7 @@ import (
"reflect" "reflect"
"github.com/databricks/bricks/folders" "github.com/databricks/bricks/folders"
"github.com/databricks/databricks-sdk-go/service/clusters" "github.com/databrickslabs/terraform-provider-databricks/clusters"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
) )
@ -34,7 +33,7 @@ type Project struct {
Isolation Isolation `json:"isolation,omitempty"` Isolation Isolation `json:"isolation,omitempty"`
// development-time vs deployment-time resources // development-time vs deployment-time resources
DevCluster *clusters.ClusterInfo `json:"dev_cluster,omitempty"` DevCluster *clusters.Cluster `json:"dev_cluster,omitempty"`
// Assertions defines a list of configurations expected to be applied // Assertions defines a list of configurations expected to be applied
// to the workspace by a higher-privileged user (or service principal) // to the workspace by a higher-privileged user (or service principal)
@ -62,7 +61,7 @@ func (p *Project) IsDevClusterJustReference() bool {
if p.DevCluster.ClusterName == "" { if p.DevCluster.ClusterName == "" {
return false return false
} }
return reflect.DeepEqual(p.DevCluster, &clusters.ClusterInfo{ return reflect.DeepEqual(p.DevCluster, &clusters.Cluster{
ClusterName: p.DevCluster.ClusterName, ClusterName: p.DevCluster.ClusterName,
}) })
} }
@ -95,7 +94,7 @@ func loadProjectConf() (prj Project, err error) {
} }
func validateAndApplyProjectDefaults(prj Project) (Project, error) { func validateAndApplyProjectDefaults(prj Project) (Project, error) {
// defaultCluster := clusters.ClusterInfo{ // defaultCluster := clusters.Cluster{
// NodeTypeID: "smallest", // NodeTypeID: "smallest",
// SparkVersion: "latest", // SparkVersion: "latest",
// AutoterminationMinutes: 30, // AutoterminationMinutes: 30,