Fixed incorrect diff for num_clusters and min_num_clusters for st…

…opped `databricks_sql_endpoint` (#1927) 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.
databricks · Jan 16, 2023 · eab72bb · eab72bb
1 parent ce7847a
commit eab72bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/sql/resource_sql_endpoint.go b/sql/resource_sql_endpoint.go
@@ -25,9 +25,9 @@ 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:"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"`

diff --git 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,