From 20ee3cf969fec2213b95f98ca2ea778069dbc6e9 Mon Sep 17 00:00:00 2001 From: Serge Smertin Date: Mon, 16 Jan 2023 12:15:06 +0100 Subject: [PATCH 1/2] Fixed diff for `num_clusters` for stopped `databricks_sql_endpoint` Correctly suppress diff for `num_clusters` on warehouses that are not running, in case `num_clusters` is not specified. Note for contributors: `tf:"suppress_diff"` and `tf:"default"` don't work well together. Fix #1204 --- sql/resource_sql_endpoint.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/resource_sql_endpoint.go b/sql/resource_sql_endpoint.go index 2887dfece2..f117811313 100644 --- a/sql/resource_sql_endpoint.go +++ b/sql/resource_sql_endpoint.go @@ -27,7 +27,7 @@ type SQLEndpoint struct { AutoStopMinutes int `json:"auto_stop_mins" tf:"optional,default:120"` MinNumClusters int `json:"min_num_clusters,omitempty" tf:"default:1,suppress_diff"` MaxNumClusters int `json:"max_num_clusters,omitempty" tf:"default:1"` - NumClusters int `json:"num_clusters,omitempty" tf:"default:1,suppress_diff"` + NumClusters int `json:"num_clusters,omitempty" tf:"suppress_diff"` EnablePhoton bool `json:"enable_photon" tf:"optional,default:true"` EnableServerlessCompute bool `json:"enable_serverless_compute,omitempty" tf:"suppress_diff"` InstanceProfileARN string `json:"instance_profile_arn,omitempty"` From 2197776fb63cd014bcc929779bb96f4e2a000064 Mon Sep 17 00:00:00 2001 From: Serge Smertin Date: Mon, 16 Jan 2023 12:32:29 +0100 Subject: [PATCH 2/2] fix tests --- sql/resource_sql_endpoint.go | 2 +- sql/resource_sql_endpoint_test.go | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sql/resource_sql_endpoint.go b/sql/resource_sql_endpoint.go index f117811313..ccb2716ed8 100644 --- a/sql/resource_sql_endpoint.go +++ b/sql/resource_sql_endpoint.go @@ -25,7 +25,7 @@ type SQLEndpoint struct { Name string `json:"name"` ClusterSize string `json:"cluster_size"` AutoStopMinutes int `json:"auto_stop_mins" tf:"optional,default:120"` - MinNumClusters int `json:"min_num_clusters,omitempty" tf:"default:1,suppress_diff"` + MinNumClusters int `json:"min_num_clusters,omitempty" tf:"suppress_diff"` MaxNumClusters int `json:"max_num_clusters,omitempty" tf:"default:1"` NumClusters int `json:"num_clusters,omitempty" tf:"suppress_diff"` EnablePhoton bool `json:"enable_photon" tf:"optional,default:true"` diff --git a/sql/resource_sql_endpoint_test.go b/sql/resource_sql_endpoint_test.go index d1a93f5108..e238977c49 100644 --- a/sql/resource_sql_endpoint_test.go +++ b/sql/resource_sql_endpoint_test.go @@ -77,8 +77,6 @@ func TestResourceSQLEndpointCreate(t *testing.T) { ClusterSize: "Small", MaxNumClusters: 1, AutoStopMinutes: 120, - MinNumClusters: 1, - NumClusters: 1, EnablePhoton: true, SpotInstancePolicy: "COST_OPTIMIZED", }, @@ -97,6 +95,7 @@ func TestResourceSQLEndpointCreate(t *testing.T) { State: "RUNNING", Tags: &Tags{}, MaxNumClusters: 1, + NumClusters: 1, }, }, dataSourceListHTTPFixture, @@ -124,8 +123,6 @@ func TestResourceSQLEndpointCreateNoAutoTermination(t *testing.T) { ClusterSize: "Small", MaxNumClusters: 1, AutoStopMinutes: 0, - MinNumClusters: 1, - NumClusters: 1, EnablePhoton: true, SpotInstancePolicy: "COST_OPTIMIZED", }, @@ -144,6 +141,7 @@ func TestResourceSQLEndpointCreateNoAutoTermination(t *testing.T) { State: "RUNNING", Tags: &Tags{}, MaxNumClusters: 1, + NumClusters: 1, }, }, dataSourceListHTTPFixture, @@ -224,8 +222,6 @@ func TestResourceSQLEndpointUpdate(t *testing.T) { ClusterSize: "Small", AutoStopMinutes: 120, MaxNumClusters: 1, - MinNumClusters: 1, - NumClusters: 1, EnablePhoton: true, SpotInstancePolicy: "COST_OPTIMIZED", }, @@ -239,6 +235,7 @@ func TestResourceSQLEndpointUpdate(t *testing.T) { ClusterSize: "Small", ID: "abc", State: "RUNNING", + NumClusters: 1, }, }, dataSourceListHTTPFixture,