From 5e2c5888e0829537c7a9113abc2984446e759812 Mon Sep 17 00:00:00 2001 From: Shreyas Goenka Date: Thu, 1 Sep 2022 13:42:31 +0200 Subject: [PATCH] Revert "Replaced usage of Cluster struct from terraform provider to ClusterInfo from go-sdk in config.go" This reverts commit a9a76727259f4fb4e43c5b47613286fc175a982d. --- project/config.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/project/config.go b/project/config.go index db502b9a..ed1c5ef9 100644 --- a/project/config.go +++ b/project/config.go @@ -7,8 +7,7 @@ import ( "reflect" "github.com/databricks/bricks/folders" - "github.com/databricks/databricks-sdk-go/service/clusters" - + "github.com/databrickslabs/terraform-provider-databricks/clusters" "github.com/ghodss/yaml" ) @@ -34,7 +33,7 @@ type Project struct { Isolation Isolation `json:"isolation,omitempty"` // 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 // to the workspace by a higher-privileged user (or service principal) @@ -62,7 +61,7 @@ func (p *Project) IsDevClusterJustReference() bool { if p.DevCluster.ClusterName == "" { return false } - return reflect.DeepEqual(p.DevCluster, &clusters.ClusterInfo{ + return reflect.DeepEqual(p.DevCluster, &clusters.Cluster{ ClusterName: p.DevCluster.ClusterName, }) } @@ -95,7 +94,7 @@ func loadProjectConf() (prj Project, err error) { } func validateAndApplyProjectDefaults(prj Project) (Project, error) { - // defaultCluster := clusters.ClusterInfo{ + // defaultCluster := clusters.Cluster{ // NodeTypeID: "smallest", // SparkVersion: "latest", // AutoterminationMinutes: 30,