Merge pull request #46 from data-platform-hq/fix_sql_serverless_config

owlleg6 · web-flow · commit 41772d58f138 · 2024-03-14T14:25:20.000+02:00
fix: sql serverless config; clusters lifecycle rule removed
diff --git a/README.md b/README.md
@@ -201,7 +201,6 @@ No modules.
 | [databricks_secret_scope.this](https://registry.terraform.io/providers/databricks/databricks/latest/docs/resources/secret_scope) | resource |
 | [databricks_service_principal.this](https://registry.terraform.io/providers/databricks/databricks/latest/docs/resources/service_principal) | resource |
 | [databricks_sql_endpoint.this](https://registry.terraform.io/providers/databricks/databricks/latest/docs/resources/sql_endpoint) | resource |
-| [databricks_sql_global_config.this](https://registry.terraform.io/providers/databricks/databricks/latest/docs/resources/sql_global_config) | resource |
 | [databricks_system_schema.this](https://registry.terraform.io/providers/databricks/databricks/latest/docs/resources/system_schema) | resource |
 | [databricks_token.pat](https://registry.terraform.io/providers/databricks/databricks/latest/docs/resources/token) | resource |
 | [databricks_user.this](https://registry.terraform.io/providers/databricks/databricks/latest/docs/resources/user) | resource |
diff --git a/cluster.tf b/cluster.tf
@@ -104,12 +104,6 @@ resource "databricks_cluster" "cluster" {
       }
     }
   }
-
-  lifecycle {
-    ignore_changes = [
-      state
-    ]
-  }
 }
 
 resource "databricks_cluster_policy" "this" {
diff --git a/main.tf b/main.tf
@@ -27,12 +27,6 @@ resource "databricks_ip_access_list" "this" {
 }
 
 # SQL Endpoint
-resource "databricks_sql_global_config" "this" {
-  count = anytrue(var.sql_endpoint[*].enable_serverless_compute) ? 1 : 0
-
-  enable_serverless_compute = true
-}
-
 resource "databricks_sql_endpoint" "this" {
   for_each = { for endpoint in var.sql_endpoint : (endpoint.name) => endpoint }
 
@@ -49,7 +43,6 @@ resource "databricks_sql_endpoint" "this" {
   lifecycle {
     ignore_changes = [state, num_clusters]
   }
-  depends_on = [databricks_sql_global_config.this]
 }
 
 resource "databricks_system_schema" "this" {

Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,6 @@ resource "databricks_cluster" "cluster" {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`-`
`108`		`- lifecycle {`
`109`		`- ignore_changes = [`
`110`		`- state`
`111`		`- ]`
`112`		`- }`
`113`	`107`	`}`
`114`	`108`
`115`	`109`	`resource "databricks_cluster_policy" "this" {`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,6 @@ resource "databricks_ip_access_list" "this" {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`# SQL Endpoint`
`30`		`-resource "databricks_sql_global_config" "this" {`
`31`		`- count = anytrue(var.sql_endpoint[*].enable_serverless_compute) ? 1 : 0`
`32`		`-`
`33`		`- enable_serverless_compute = true`
`34`		`-}`
`35`		`-`
`36`	`30`	`resource "databricks_sql_endpoint" "this" {`
`37`	`31`	`for_each = { for endpoint in var.sql_endpoint : (endpoint.name) => endpoint }`
`38`	`32`
`@@ -49,7 +43,6 @@ resource "databricks_sql_endpoint" "this" {`
`49`	`43`	`lifecycle {`
`50`	`44`	`ignore_changes = [state, num_clusters]`
`51`	`45`	`}`
`52`		`- depends_on = [databricks_sql_global_config.this]`
`53`	`46`	`}`
`54`	`47`
`55`	`48`	`resource "databricks_system_schema" "this" {`