From 3ba8824bc74a857d80ec92dc9f4d41bef9c9b513 Mon Sep 17 00:00:00 2001 From: "denis.bilenko" Date: Wed, 11 Nov 2026 19:57:06 +0000 Subject: [PATCH] testserver: match cloud responses for trashed, purged and unknown alerts Co-authored-by: Isaac --- .../alerts-v2-not-found/out.test.toml | 1 + .../workspace/alerts-v2-not-found/output.txt | 53 +++++++++++++++++++ .../cmd/workspace/alerts-v2-not-found/script | 27 ++++++++++ libs/testserver/alerts.go | 52 ++++++++++++++++-- libs/testserver/fake_workspace.go | 2 + libs/testserver/handlers.go | 17 +----- 6 files changed, 133 insertions(+), 19 deletions(-) create mode 100644 acceptance/cmd/workspace/alerts-v2-not-found/out.test.toml create mode 100644 acceptance/cmd/workspace/alerts-v2-not-found/output.txt create mode 100644 acceptance/cmd/workspace/alerts-v2-not-found/script diff --git a/acceptance/cmd/workspace/alerts-v2-not-found/out.test.toml b/acceptance/cmd/workspace/alerts-v2-not-found/out.test.toml new file mode 100644 index 00000000000..18b1a88417e --- /dev/null +++ b/acceptance/cmd/workspace/alerts-v2-not-found/out.test.toml @@ -0,0 +1 @@ +Cloud = false diff --git a/acceptance/cmd/workspace/alerts-v2-not-found/output.txt b/acceptance/cmd/workspace/alerts-v2-not-found/output.txt new file mode 100644 index 00000000000..6b6109277a9 --- /dev/null +++ b/acceptance/cmd/workspace/alerts-v2-not-found/output.txt @@ -0,0 +1,53 @@ + +=== trashed alert is still readable + +>>> [CLI] alerts-v2 trash-alert [ALERT_ID] + +>>> [CLI] alerts-v2 get-alert [ALERT_ID] +DELETED + +>>> [CLI] alerts-v2 trash-alert [ALERT_ID] +Error: Alert [ALERT_ID] is already trashed + +Exit code: 1 + +>>> [CLI] alerts-v2 update-alert [ALERT_ID] display_name --json {"display_name": "x"} +Error: Cannot move node 'myalert.dbalert.json' (ID: [ALERT_ID]) because it is in trash folder + +Exit code: 1 + +=== purged alert is gone + +>>> [CLI] alerts-v2 trash-alert [ALERT_ID] --purge + +>>> [CLI] alerts-v2 get-alert [ALERT_ID] +Error: Tree node with id [ALERT_ID] does not exist + +Exit code: 1 + +>>> [CLI] alerts-v2 trash-alert [ALERT_ID] +Error: Tree node with id [ALERT_ID] does not exist + +Exit code: 1 + +>>> [CLI] alerts-v2 update-alert [ALERT_ID] display_name --json {"display_name": "x"} +Error: Tree node with id [ALERT_ID] does not exist + +Exit code: 1 + +=== unknown alert + +>>> [CLI] alerts-v2 get-alert [UUID] +Error: Alert with id [UUID] not found or has no folder node internal name + +Exit code: 1 + +>>> [CLI] alerts-v2 trash-alert [UUID] +Error: Alert with id [UUID] not found + +Exit code: 1 + +>>> [CLI] alerts-v2 update-alert [UUID] display_name --json {"display_name": "x"} +Error: Alert with id [UUID] not found or has no folder node internal name + +Exit code: 1 diff --git a/acceptance/cmd/workspace/alerts-v2-not-found/script b/acceptance/cmd/workspace/alerts-v2-not-found/script new file mode 100644 index 00000000000..ea778f0b349 --- /dev/null +++ b/acceptance/cmd/workspace/alerts-v2-not-found/script @@ -0,0 +1,27 @@ +# Alert get/update/trash responses for trashed, purged and unknown alerts. +# Expected output was recorded against AWS on 2026-11-11; the test is local-only +# because the messages are backend-owned and have changed before. +create_alert() { + $CLI alerts-v2 create-alert --json '{"display_name": "'$1'", "query_text": "select 1", "warehouse_id": "w1", "evaluation": {"comparison_operator": "EQUAL", "source": {"name": "1"}, "threshold": {"value": {"double_value": 1}}}, "schedule": {"quartz_cron_schedule": "0 0 * * * ?", "timezone_id": "UTC"}}' | jq -r .id +} + +alert_id=$(create_alert myalert) +add_repl "$alert_id" ALERT_ID + +title "trashed alert is still readable" +trace $CLI alerts-v2 trash-alert $alert_id +trace $CLI alerts-v2 get-alert $alert_id | jq -r .lifecycle_state +errcode trace $CLI alerts-v2 trash-alert $alert_id +errcode trace $CLI alerts-v2 update-alert $alert_id display_name --json '{"display_name": "x"}' + +title "purged alert is gone" +trace $CLI alerts-v2 trash-alert $alert_id --purge +errcode trace $CLI alerts-v2 get-alert $alert_id +errcode trace $CLI alerts-v2 trash-alert $alert_id +errcode trace $CLI alerts-v2 update-alert $alert_id display_name --json '{"display_name": "x"}' + +title "unknown alert" +unknown_id=00000000-0000-0000-0000-000000000000 +errcode trace $CLI alerts-v2 get-alert $unknown_id +errcode trace $CLI alerts-v2 trash-alert $unknown_id +errcode trace $CLI alerts-v2 update-alert $unknown_id display_name --json '{"display_name": "x"}' diff --git a/libs/testserver/alerts.go b/libs/testserver/alerts.go index 48612ad539d..264de443c92 100644 --- a/libs/testserver/alerts.go +++ b/libs/testserver/alerts.go @@ -150,6 +150,37 @@ func (s *FakeWorkspace) writeAlertFile(alert sql.AlertV2) error { return nil } +// alertNotFound mirrors the cloud's 404 for an alert that is not in the +// workspace: a purged alert is reported by its tree node, an id that never +// existed gets a per-method message. +func (s *FakeWorkspace) alertNotFound(alertId, unknownMessage string) Response { + message := unknownMessage + if s.PurgedAlertIDs[alertId] { + message = fmt.Sprintf("Tree node with id %s does not exist", alertId) + } + return Response{ + StatusCode: http.StatusNotFound, + Body: map[string]string{ + "error_code": "NOT_FOUND", + "message": message, + }, + } +} + +func (s *FakeWorkspace) AlertsGet(alertId string) Response { + defer s.LockUnlock()() + + // A trashed (not purged) alert is still readable, with lifecycle_state DELETED. + alert, ok := s.Alerts[alertId] + if !ok { + return s.alertNotFound(alertId, fmt.Sprintf("Alert with id %s not found or has no folder node internal name", alertId)) + } + + return Response{ + Body: alert, + } +} + func (s *FakeWorkspace) AlertsUpsert(req Request, alertId string) Response { var alert sql.AlertV2 @@ -163,10 +194,17 @@ func (s *FakeWorkspace) AlertsUpsert(req Request, alertId string) Response { defer s.LockUnlock()() if alertId != "" { - _, ok := s.Alerts[alertId] + existing, ok := s.Alerts[alertId] if !ok { + return s.alertNotFound(alertId, fmt.Sprintf("Alert with id %s not found or has no folder node internal name", alertId)) + } + if existing.LifecycleState == sql.AlertLifecycleStateDeleted { return Response{ - StatusCode: 404, + StatusCode: http.StatusBadRequest, + Body: map[string]string{ + "error_code": "INVALID_PARAMETER_VALUE", + "message": fmt.Sprintf("Cannot move node '%s' (ID: %s) because it is in trash folder", path.Base(alertFilePath(existing)), alertId), + }, } } } else { @@ -195,8 +233,15 @@ func (s *FakeWorkspace) AlertsDelete(alertId string, purge bool) Response { alert, ok := s.Alerts[alertId] if !ok { + return s.alertNotFound(alertId, fmt.Sprintf("Alert with id %s not found", alertId)) + } + if alert.LifecycleState == sql.AlertLifecycleStateDeleted && !purge { return Response{ - StatusCode: 404, + StatusCode: http.StatusBadRequest, + Body: map[string]string{ + "error_code": "BAD_REQUEST", + "message": fmt.Sprintf("Alert %s is already trashed", alertId), + }, } } @@ -204,6 +249,7 @@ func (s *FakeWorkspace) AlertsDelete(alertId string, purge bool) Response { if purge { delete(s.Alerts, alertId) + s.PurgedAlertIDs[alertId] = true } else { alert.LifecycleState = sql.AlertLifecycleStateDeleted s.Alerts[alertId] = alert diff --git a/libs/testserver/fake_workspace.go b/libs/testserver/fake_workspace.go index 98c52d1fc6c..cfeb6f8cd99 100644 --- a/libs/testserver/fake_workspace.go +++ b/libs/testserver/fake_workspace.go @@ -234,6 +234,7 @@ type FakeWorkspace struct { GenieSpaces map[string]dashboards.GenieSpace SqlWarehouses map[string]sql.GetWarehouseResponse Alerts map[string]sql.AlertV2 + PurgedAlertIDs map[string]bool Experiments map[string]ml.GetExperimentResponse ModelRegistryModels map[string]ml.Model ModelRegistryModelIDs map[string]string // model name -> numeric ID @@ -588,6 +589,7 @@ func NewFakeWorkspace(url, token string) *FakeWorkspace { DmsDeployments: map[string]*DmsDeployment{}, DmsDeploymentNodes: map[string]string{}, Alerts: map[string]sql.AlertV2{}, + PurgedAlertIDs: map[string]bool{}, Experiments: map[string]ml.GetExperimentResponse{}, ModelRegistryModels: map[string]ml.Model{}, ModelRegistryModelIDs: map[string]string{}, diff --git a/libs/testserver/handlers.go b/libs/testserver/handlers.go index 8d7708af5af..539a21fafa5 100644 --- a/libs/testserver/handlers.go +++ b/libs/testserver/handlers.go @@ -18,7 +18,6 @@ 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" ) @@ -1178,21 +1177,7 @@ func AddDefaultHandlers(server *Server) { // Alerts v2: server.Handle("GET", "/api/2.0/alerts/{id}", func(req Request) any { - defer req.Workspace.LockUnlock()() - - id := req.Vars["id"] - - value, ok := req.Workspace.Alerts[id] - if !ok || value.LifecycleState == sql.AlertLifecycleStateDeleted { - return Response{ - StatusCode: 404, - Body: map[string]string{"message": "Alert with ID '" + id + "' does not exist."}, - } - } - - return Response{ - Body: value, - } + return req.Workspace.AlertsGet(req.Vars["id"]) }) server.Handle("GET", "/api/2.0/alerts", func(req Request) any {