Fix: Use purge option when deleting alerts (#4505)

shreyas-goenka · web-flow · commit dccd96bc9119 · 2026-02-16T11:45:18.000+01:00
## Changes
Alerts are soft deleted by default and have a limit of 1000 per
workspace. This PR perma-deletes them instead when they are managed by
DABs.
 
## Why
Fixes our test envs where we run into the limit. Perma-delete is also
the right thing to do for DABs.

## Tests
Enabled earlier disabled tests. `bundle/resources/alerts/basic` confirms
that the fix works.
diff --git a/acceptance/bundle/deployment/bind/alert/out.test.toml b/acceptance/bundle/deployment/bind/alert/out.test.toml
diff --git a/acceptance/bundle/deployment/bind/alert/test.toml b/acceptance/bundle/deployment/bind/alert/test.toml
@@ -1,4 +1,4 @@
-Cloud = false
+Cloud = true
 Local = false
 
 # Alert tests timeout during bundle deploy (hang at file upload for 50+ minutes).
diff --git a/acceptance/bundle/generate/alert/out.test.toml b/acceptance/bundle/generate/alert/out.test.toml
diff --git a/acceptance/bundle/generate/alert/test.toml b/acceptance/bundle/generate/alert/test.toml
@@ -1,4 +1,4 @@
-Cloud = false
+Cloud = true
 Local = false
 
 # Alert tests timeout during bundle deploy (hang at file upload for 50+ minutes).
diff --git a/acceptance/bundle/resources/alerts/basic/out.test.toml b/acceptance/bundle/resources/alerts/basic/out.test.toml
diff --git a/acceptance/bundle/resources/alerts/basic/output.txt b/acceptance/bundle/resources/alerts/basic/output.txt
@@ -62,10 +62,9 @@ Deleting files...
 Destroy complete!
 
 >>> [CLI] alerts-v2 get-alert [ALERT_ID]
-{
-  "display_name": "My alert",
-  "lifecycle_state": "DELETED"
-}
+Error: Node with resource name None does not exist.
+
+Exit code: 1
 
 >>> [CLI] bundle summary
 Name: alerts-basic-[UNIQUE_NAME]
diff --git a/acceptance/bundle/resources/alerts/basic/script b/acceptance/bundle/resources/alerts/basic/script
@@ -16,6 +16,6 @@ trace $CLI bundle plan
 
 trace $CLI bundle destroy --auto-approve
 
-trace $CLI alerts-v2 get-alert $alert_id | jq '{display_name, lifecycle_state}'
+errcode trace $CLI alerts-v2 get-alert $alert_id
 
 trace $CLI bundle summary
diff --git a/acceptance/bundle/resources/alerts/basic/test.toml b/acceptance/bundle/resources/alerts/basic/test.toml
@@ -1,5 +1,5 @@
 Local = true
-Cloud = false
+Cloud = true
 RecordRequests = false
 Ignore = [".databricks"]
 
diff --git a/acceptance/bundle/resources/alerts/with_file/out.test.toml b/acceptance/bundle/resources/alerts/with_file/out.test.toml
diff --git a/acceptance/bundle/resources/alerts/with_file/test.toml b/acceptance/bundle/resources/alerts/with_file/test.toml
@@ -1,5 +1,5 @@
 Local = false
-Cloud = false
+Cloud = true
 RecordRequests = false
 Ignore = [".databricks"]
 
diff --git a/bundle/deploy/terraform/tfdyn/convert_alert.go b/bundle/deploy/terraform/tfdyn/convert_alert.go
@@ -17,6 +17,12 @@ func convertAlertResource(ctx context.Context, vin dyn.Value) (dyn.Value, error)
 		log.Debugf(ctx, "alert normalization diagnostic: %s", diag.Summary)
 	}
 
+	// Always set purge_on_delete to true. PR with context: https://github.com/databricks/cli/pull/4505
+	vout, err := dyn.Set(vout, "purge_on_delete", dyn.V(true))
+	if err != nil {
+		return dyn.InvalidValue, err
+	}
+
 	return vout, nil
 }
 
diff --git a/bundle/deploy/terraform/tfdyn/convert_alert_test.go b/bundle/deploy/terraform/tfdyn/convert_alert_test.go
@@ -50,6 +50,7 @@ func TestConvertAlert(t *testing.T) {
 		"warehouse_id":       "test_warehouse_id",
 		"custom_summary":     "Test alert summary",
 		"custom_description": "Test alert description",
+		"purge_on_delete":    true,
 	}, alert)
 
 	// Assert equality on the permissions
diff --git a/bundle/direct/dresources/alert.go b/bundle/direct/dresources/alert.go
@@ -60,5 +60,9 @@ func (r *ResourceAlert) DoUpdate(ctx context.Context, id string, config *sql.Ale
 
 // DoDelete deletes the alert by id.
 func (r *ResourceAlert) DoDelete(ctx context.Context, id string) error {
-	return r.client.AlertsV2.TrashAlertById(ctx, id)
+	return r.client.AlertsV2.TrashAlert(ctx, sql.TrashAlertV2Request{
+		Id:              id,
+		Purge:           true,
+		ForceSendFields: []string{"Purge"},
+	})
 }
diff --git a/libs/testserver/alerts.go b/libs/testserver/alerts.go
@@ -41,7 +41,7 @@ func (s *FakeWorkspace) AlertsUpsert(req Request, alertId string) Response {
 	}
 }
 
-func (s *FakeWorkspace) AlertsDelete(alertId string) Response {
+func (s *FakeWorkspace) AlertsDelete(alertId string, purge bool) Response {
 	defer s.LockUnlock()()
 
 	alert, ok := s.Alerts[alertId]
@@ -51,8 +51,12 @@ func (s *FakeWorkspace) AlertsDelete(alertId string) Response {
 		}
 	}
 
-	alert.LifecycleState = sql.AlertLifecycleStateDeleted
-	s.Alerts[alertId] = alert
+	if purge {
+		delete(s.Alerts, alertId)
+	} else {
+		alert.LifecycleState = sql.AlertLifecycleStateDeleted
+		s.Alerts[alertId] = alert
+	}
 
 	return Response{
 		StatusCode: 200,
diff --git a/libs/testserver/handlers.go b/libs/testserver/handlers.go
@@ -11,7 +11,7 @@ import (
 	"github.com/databricks/databricks-sdk-go/service/catalog"
 	"github.com/databricks/databricks-sdk-go/service/compute"
 	"github.com/databricks/databricks-sdk-go/service/jobs"
-
+	"github.com/databricks/databricks-sdk-go/service/sql"
 	"github.com/databricks/databricks-sdk-go/service/workspace"
 )
 
@@ -515,7 +515,20 @@ func AddDefaultHandlers(server *Server) {
 
 	// Alerts v2:
 	server.Handle("GET", "/api/2.0/alerts/{id}", func(req Request) any {
-		return MapGet(req.Workspace, req.Workspace.Alerts, req.Vars["id"])
+		defer req.Workspace.LockUnlock()()
+
+		value, ok := req.Workspace.Alerts[req.Vars["id"]]
+		if !ok || value.LifecycleState == sql.AlertLifecycleStateDeleted {
+			return Response{
+				StatusCode: 404,
+				// Backend returns a terrible error message today.
+				Body: map[string]string{"message": "Node with resource name None does not exist."},
+			}
+		}
+
+		return Response{
+			Body: value,
+		}
 	})
 
 	server.Handle("GET", "/api/2.0/alerts", func(req Request) any {
@@ -531,7 +544,8 @@ func AddDefaultHandlers(server *Server) {
 	})
 
 	server.Handle("DELETE", "/api/2.0/alerts/{id}", func(req Request) any {
-		return req.Workspace.AlertsDelete(req.Vars["id"])
+		purge := req.URL.Query().Get("purge") == "true"
+		return req.Workspace.AlertsDelete(req.Vars["id"], purge)
 	})
 
 	// Secret Scopes:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Cloud = false`
	`1`	`+Cloud = true`
`2`	`2`	`Local = false`
`3`	`3`
`4`	`4`	`# Alert tests timeout during bundle deploy (hang at file upload for 50+ minutes).`