feat: Schedule error handler improvements (#2555)

* Fix schedule path for scheduled scripts * feat: Add possibility to mute workspace error handler on schedules and define an error/recovery handler as default * Permission error handlers to the error handler group for consistency, and small refactoring * Fix recovery handler * Add parent job to recovery handler for consistency * Fix tests * Locking feature to EE in FE
windmill-labs · Nov 3, 2023 · 668c9da · 668c9da
1 parent 6f47b96
commit 668c9da
Show file tree

Hide file tree

Showing 22 changed files with 341 additions and 82 deletions.
diff --git a/...0cceedd598a3221c522a1f9026d2d48a0ffb.json → ...3df2d2187d1d43b84f67d22c0a2365b42ada.json b/...0cceedd598a3221c522a1f9026d2d48a0ffb.json → ...3df2d2187d1d43b84f67d22c0a2365b42ada.json
diff --git a/...5547e579d978d899325d821a5aee1df1a9fc.json → ...a7eadf845e4156da8cf645582737e046589d.json b/...5547e579d978d899325d821a5aee1df1a9fc.json → ...a7eadf845e4156da8cf645582737e046589d.json
diff --git a/backend/.sqlx/query-7a00843921db4ac1eb20a1045e83363587c1a2cb62d2df25d5564ae78a03b097.json b/backend/.sqlx/query-7a00843921db4ac1eb20a1045e83363587c1a2cb62d2df25d5564ae78a03b097.json
diff --git a/backend/.sqlx/query-911b1e1f2a5ba6d5159916e5598020e680c45043b0736ad0153ee261a151dd90.json b/backend/.sqlx/query-911b1e1f2a5ba6d5159916e5598020e680c45043b0736ad0153ee261a151dd90.json
diff --git a/backend/.sqlx/query-96dc1cd308f3c21cfb50b88048054dc03f93e261d25969d66aa48e9d0502960f.json b/backend/.sqlx/query-96dc1cd308f3c21cfb50b88048054dc03f93e261d25969d66aa48e9d0502960f.json
diff --git a/backend/.sqlx/query-aa2800113a8a8805f47cdc1dd0f29d94c546fe531e7edd3e91da4978af5442fb.json b/backend/.sqlx/query-aa2800113a8a8805f47cdc1dd0f29d94c546fe531e7edd3e91da4978af5442fb.json
diff --git a/backend/.sqlx/query-c10348d26e3e3dc9e345d9044db35db9906617eb9c98aaf58a55d9681ffb85e3.json b/backend/.sqlx/query-c10348d26e3e3dc9e345d9044db35db9906617eb9c98aaf58a55d9681ffb85e3.json
diff --git a/backend/.sqlx/query-dd74fa9468b5fe8c8ad657ded06076c11a78d0206af2af20685c691d4d9520bb.json b/backend/.sqlx/query-dd74fa9468b5fe8c8ad657ded06076c11a78d0206af2af20685c691d4d9520bb.json
diff --git a/backend/.sqlx/query-eced0a09ba547ce1dccb54a5419b22373603c9d01f77047b3553bde125bf71e8.json b/backend/.sqlx/query-eced0a09ba547ce1dccb54a5419b22373603c9d01f77047b3553bde125bf71e8.json
diff --git a/backend/.sqlx/query-fdd3710a381dac33ef5ee5ec5564a4874e6d7807d43fa6ea7b8408cad9e97480.json b/backend/.sqlx/query-fdd3710a381dac33ef5ee5ec5564a4874e6d7807d43fa6ea7b8408cad9e97480.json
diff --git a/backend/migrations/20231103143535_schedule_default_error_handler.down.sql b/backend/migrations/20231103143535_schedule_default_error_handler.down.sql
@@ -0,0 +1,2 @@
+-- Add down migration script here
+ALTER TABLE schedule DROP COLUMN ws_error_handler_muted;
diff --git a/backend/migrations/20231103143535_schedule_default_error_handler.up.sql b/backend/migrations/20231103143535_schedule_default_error_handler.up.sql
@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE schedule ADD COLUMN ws_error_handler_muted BOOLEAN NOT NULL DEFAULT false;
diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs
@@ -2854,6 +2854,7 @@ async fn test_script_schedule_handlers(db: Pool<Postgres>) {
         script_path: "f/system/failing_script".to_string(),
         timezone: "UTC".to_string(),
         schedule: format!("{} {} * * * *", then.second(), then.minute()).to_string(),
+        ws_error_handler_muted: None,
     };
 
     let _ = client.create_schedule("test-workspace", &schedule).await;
@@ -2913,6 +2914,7 @@ async fn test_script_schedule_handlers(db: Pool<Postgres>) {
                 on_recovery_extra_args: None,
                 timezone: "UTC".to_string(),
                 schedule: format!("{} {} * * * *", then.second(), then.minute()).to_string(),
+                ws_error_handler_muted: None,
             },
         )
         .await
@@ -2988,6 +2990,7 @@ async fn test_flow_schedule_handlers(db: Pool<Postgres>) {
         script_path: "f/system/failing_flow".to_string(),
         timezone: "UTC".to_string(),
         schedule: format!("{} {} * * * *", then.second(), then.minute()).to_string(),
+        ws_error_handler_muted: None,
     };
 
     let _ = client.create_schedule("test-workspace", &schedule).await;
@@ -3048,6 +3051,7 @@ async fn test_flow_schedule_handlers(db: Pool<Postgres>) {
                 on_recovery_extra_args: None,
                 timezone: "UTC".to_string(),
                 schedule: format!("{} {} * * * *", then.second(), then.minute()).to_string(),
+                ws_error_handler_muted: None,
             },
         )
         .await

diff --git a/backend/windmill-api/openapi-deref.yaml b/backend/windmill-api/openapi-deref.yaml
@@ -1,6 +1,6 @@
 openapi: 3.0.3
 info:
-  version: 1.192.0
+  version: 1.197.1
   title: Windmill API
   contact:
     name: Windmill Team
@@ -3048,13 +3048,17 @@ paths:
                 type: array
                 items:
                   type: string
-  /embeddings/query_resource_types:
+  /w/{workspace}/embeddings/query_resource_types:
     get:
       summary: query resource types by similarity
       operationId: queryResourceTypes
       tags:
         - resource
       parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_0
         - name: text
           description: query text
           in: query
@@ -7818,6 +7822,8 @@ paths:
                 on_recovery_extra_args:
                   type: object
                   additionalProperties: *ref_14
+                ws_error_handler_muted:
+                  type: boolean
               required: &ref_133
                 - path
                 - schedule
@@ -7878,6 +7884,8 @@ paths:
                 on_recovery_extra_args:
                   type: object
                   additionalProperties: *ref_14
+                ws_error_handler_muted:
+                  type: boolean
               required: &ref_135
                 - schedule
                 - timezone
@@ -8014,6 +8022,8 @@ paths:
                   on_recovery_extra_args:
                     type: object
                     additionalProperties: *ref_14
+                  ws_error_handler_muted:
+                    type: boolean
                 required: &ref_74
                   - path
                   - edited_by

diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
@@ -7580,6 +7580,8 @@ components:
           type: number
         on_recovery_extra_args:
           $ref: "#/components/schemas/ScriptArgs"
+        ws_error_handler_muted:
+          type: boolean
       required:
         - path
         - edited_by
@@ -7645,6 +7647,8 @@ components:
           type: number
         on_recovery_extra_args:
           $ref: "#/components/schemas/ScriptArgs"
+        ws_error_handler_muted:
+          type: boolean
       required:
         - path
         - schedule
@@ -7677,6 +7681,8 @@ components:
           type: number
         on_recovery_extra_args:
           $ref: "#/components/schemas/ScriptArgs"
+        ws_error_handler_muted:
+          type: boolean
       required:
         - schedule
         - timezone