all

.github/workflows/pr-ready-review.yml

@@ -38,6 +38,4 @@ jobs:
 
             Provide constructive feedback with specific suggestions for improvement.
             Use inline comments to highlight specific areas of concern.
-
-            At the end of your review, add complete instructions to reproduce the added changes through the app interface. These instructions will be given to a tester so he can verify the changes. It should be a short descriptive text (not a step by step or a list) on how to navigate the app (what page, what action, what input, etc) to see the changes.
           allowed_tools: "mcp__github__create_pending_pull_request_review,mcp__github__add_pull_request_review_comment_to_pending_review,mcp__github__submit_pending_pull_request_review,mcp__github__get_pull_request_diff"

CHANGELOG.md

@@ -1,98 +1,5 @@
 # Changelog
 
-## [1.505.3](https://github.com/windmill-labs/windmill/compare/v1.505.2...v1.505.3) (2025-07-14)
-
-
-### Bug Fixes
-
-* add grants to asset table ([#6176](https://github.com/windmill-labs/windmill/issues/6176)) ([03a024d](https://github.com/windmill-labs/windmill/commit/03a024d42ef5f11aed9c08926d2757160e20bb26))
-
-## [1.505.2](https://github.com/windmill-labs/windmill/compare/v1.505.1...v1.505.2) (2025-07-13)
-
-
-### Bug Fixes
-
-* make usage stats on jobs on last 48h to reduce db load ([9d9cdc7](https://github.com/windmill-labs/windmill/commit/9d9cdc75a99b2590df9541476e7e7002b4317962))
-* throttle job pull when bg processor takes too long ([daeab70](https://github.com/windmill-labs/windmill/commit/daeab7077a2dfa0c753474b58496b82428988979))
-
-## [1.505.1](https://github.com/windmill-labs/windmill/compare/v1.505.0...v1.505.1) (2025-07-13)
-
-
-### Bug Fixes
-
-* prevent workers from being stuck on kill signal ([e630170](https://github.com/windmill-labs/windmill/commit/e6301702f5b48d642ff0ce087242d1e6b184d03c))
-* set urllib user-agent header in loader.py (cloudflare block) ([#6169](https://github.com/windmill-labs/windmill/issues/6169)) ([d93ef6a](https://github.com/windmill-labs/windmill/commit/d93ef6acfaf39138e023f77b9fd5d744382f48e0))
-* worker symlink dir + path fixes + npm postinstall on windows ([#6167](https://github.com/windmill-labs/windmill/issues/6167)) ([9a8bed1](https://github.com/windmill-labs/windmill/commit/9a8bed128f21c31648cbb48a74892c2de59e4b24))
-
-## [1.505.0](https://github.com/windmill-labs/windmill/compare/v1.504.0...v1.505.0) (2025-07-11)
-
-
-### Features
-
-* assets as a primary concept ([#6125](https://github.com/windmill-labs/windmill/issues/6125)) ([433341b](https://github.com/windmill-labs/windmill/commit/433341b2958e86fe8c202d6651cd28a93ce4d9ba))
-* triggers error handler and retry ([#6138](https://github.com/windmill-labs/windmill/issues/6138)) ([328ef60](https://github.com/windmill-labs/windmill/commit/328ef605adf9ba2687989b74cdd9beb94448d327))
-
-
-### Bug Fixes
-
-* audit log truncation fix ([bfb2277](https://github.com/windmill-labs/windmill/commit/bfb2277ff140705e9358a487b4416e25aa46e20b))
-
-## [1.504.0](https://github.com/windmill-labs/windmill/compare/v1.503.3...v1.504.0) (2025-07-10)
-
-
-### Features
-
-* **frontend:** run test flow from graph ([#6122](https://github.com/windmill-labs/windmill/issues/6122)) ([6c17a69](https://github.com/windmill-labs/windmill/commit/6c17a6963e100492bb03eb5494d2375f27dbbb9f))
-* storage selector in S3 File Picker ([#6154](https://github.com/windmill-labs/windmill/issues/6154)) ([f924a73](https://github.com/windmill-labs/windmill/commit/f924a73c32887a5d67aa4d31b5b25f6046a57134))
-* use process groups to improve zombie job handling ([#6157](https://github.com/windmill-labs/windmill/issues/6157)) ([b83aca3](https://github.com/windmill-labs/windmill/commit/b83aca30d23473228e19b10dc8fbecaf1fecc12f))
-
-
-### Bug Fixes
-
-* improve index migration failure handling ([c7fb066](https://github.com/windmill-labs/windmill/commit/c7fb06630181c9cdd8547139739ef408b4cc4235))
-
-## [1.503.3](https://github.com/windmill-labs/windmill/compare/v1.503.2...v1.503.3) (2025-07-09)
-
-
-### Bug Fixes
-
-* prevent kafka metadata fetching from blocking windmill ([#6151](https://github.com/windmill-labs/windmill/issues/6151)) ([e5f9e39](https://github.com/windmill-labs/windmill/commit/e5f9e395d312d2dee098c23d3af9cdbf6d452f5c))
-
-## [1.503.2](https://github.com/windmill-labs/windmill/compare/v1.503.1...v1.503.2) (2025-07-09)
-
-
-### Bug Fixes
-
-* fix resource select loop ([ebb1b32](https://github.com/windmill-labs/windmill/commit/ebb1b329841c135eb97dc47d3d962a970838143a))
-
-## [1.503.1](https://github.com/windmill-labs/windmill/compare/v1.503.0...v1.503.1) (2025-07-08)
-
-
-### Bug Fixes
-
-* correct paths and no symlink for windows (go) ([#6139](https://github.com/windmill-labs/windmill/issues/6139)) ([4482e9d](https://github.com/windmill-labs/windmill/commit/4482e9d86aeeacfe929eb19f0bb96a6339dabd62))
-* fix isValid state when schema is empty ([227c1f1](https://github.com/windmill-labs/windmill/commit/227c1f114120812fb6b8a9609d4d27375fa18be8))
-
-## [1.503.0](https://github.com/windmill-labs/windmill/compare/v1.502.2...v1.503.0) (2025-07-07)
-
-
-### Features
-
-* allow editing messages in AI chat ([#6117](https://github.com/windmill-labs/windmill/issues/6117)) ([c498c48](https://github.com/windmill-labs/windmill/commit/c498c48ced893181034a2fdf936a1f4fbd41b21c))
-* Better tracing for audit logs, including a graph to visualize them ([#6078](https://github.com/windmill-labs/windmill/issues/6078)) ([8356456](https://github.com/windmill-labs/windmill/commit/835645643e5b3b1312af5b349547b6fbd06bdaae))
-* inline ai chat with cmd+k ([#6133](https://github.com/windmill-labs/windmill/issues/6133)) ([60a47e8](https://github.com/windmill-labs/windmill/commit/60a47e8b781903e2144455bab96c4ee43c7d4372))
-
-
-### Bug Fixes
-
-* carousel app component, expose current index ([#6120](https://github.com/windmill-labs/windmill/issues/6120)) ([7284c51](https://github.com/windmill-labs/windmill/commit/7284c51762ff03537fb1869a0d1a18fc2b9b24ef))
-* correctly set selected step editor code when reverting to snapshot ([#6131](https://github.com/windmill-labs/windmill/issues/6131)) ([d69d277](https://github.com/windmill-labs/windmill/commit/d69d277ff9409b624df0537b507c76ec13909814))
-* ctrl k not showing navigation items + improve ai button by making it an item in the menu ([#6132](https://github.com/windmill-labs/windmill/issues/6132)) ([e3aee0c](https://github.com/windmill-labs/windmill/commit/e3aee0c587371b57d89c99603ade0fc0a4a1a939))
-* error handling for S3 file loading in py and ts clients ([#6124](https://github.com/windmill-labs/windmill/issues/6124)) ([23d624a](https://github.com/windmill-labs/windmill/commit/23d624aa23e96ab3c25564b4c148e4186892de59))
-* fix frontend scripts in app editor copying their content ([566a9c4](https://github.com/windmill-labs/windmill/commit/566a9c45d0e1950996df3d82f0ea5143c4ebae8f))
-* **frontend:** make sure to set workspaceStore and token before mount in extension ([#6129](https://github.com/windmill-labs/windmill/issues/6129)) ([be62977](https://github.com/windmill-labs/windmill/commit/be62977047cf2cac60b6754d0e8af3c8cca0cbd0))
-* tag select in script builder top bar ([#6136](https://github.com/windmill-labs/windmill/issues/6136)) ([3fbd3ec](https://github.com/windmill-labs/windmill/commit/3fbd3ec4f914349767a20111157c96b62c9f43ce))
-
 ## [1.502.2](https://github.com/windmill-labs/windmill/compare/v1.502.1...v1.502.2) (2025-07-01)
 
 

backend/.sqlx/query-029b81eb00250eacded407b12bcfbab2b3f35354bdb9ef6e30281a4ff6235060.json

@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE asset SET workspace_id = $1 WHERE workspace_id = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "029b81eb00250eacded407b12bcfbab2b3f35354bdb9ef6e30281a4ff6235060"
-}

backend/.sqlx/query-124b27de35b49fbdb13a1f772044665a84325e34ae04bf2795fafb7bb6f2f0c6.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO postgres_trigger (\n            publication_name,\n            replication_slot_name,\n            workspace_id, \n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            postgres_resource_path, \n            edited_by,\n            error_handler_path,\n            error_handler_args,\n            retry\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4, \n            $5, \n            $6, \n            $7, \n            $8, \n            $9, \n            $10,\n            $11,\n            $12,\n            $13\n        )",
+  "query": "\n        INSERT INTO postgres_trigger (\n            publication_name,\n            replication_slot_name,\n            workspace_id, \n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            postgres_resource_path, \n            edited_by\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4, \n            $5, \n            $6, \n            $7, \n            $8, \n            $9, \n            $10\n        )",
   "describe": {
     "columns": [],
     "parameters": {
@@ -14,13 +14,10 @@
         "Varchar",
         "Bool",
         "Varchar",
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Varchar"
       ]
     },
     "nullable": []
   },
-  "hash": "7f039cc86874128ee8c9f577897340a155562fd6cde328298a66496c90d8cd59"
+  "hash": "124b27de35b49fbdb13a1f772044665a84325e34ae04bf2795fafb7bb6f2f0c6"
 }

backend/.sqlx/query-1312b7fd622cc814a406c85dbbff61f003c29185c267642cfd898075ebda855d.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            gcp_resource_path,\n            subscription_id,\n            topic_id,\n            workspace_id,\n            delivery_type AS \"delivery_type: _\",\n            delivery_config AS \"delivery_config: _\",\n            subscription_mode AS \"subscription_mode: _\",\n            path,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled,\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\",\n            retry as \"retry: _\"\n        FROM \n            gcp_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
+  "query": "\n        SELECT\n            gcp_resource_path,\n            subscription_id,\n            topic_id,\n            workspace_id,\n            delivery_type AS \"delivery_type: _\",\n            delivery_config AS \"delivery_config: _\",\n            subscription_mode AS \"subscription_mode: _\",\n            path,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled\n        FROM \n            gcp_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
   "describe": {
     "columns": [
       {
@@ -112,21 +112,6 @@
         "ordinal": 17,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 19,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 20,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -153,11 +138,8 @@
       true,
       false,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "b13d1dec373e70ffd58001cd17e9853e76ee8527e46afbfbc303528e512ebed9"
+  "hash": "1312b7fd622cc814a406c85dbbff61f003c29185c267642cfd898075ebda855d"
 }

backend/.sqlx/query-1c0f95a069891f7214505aaa9428e11e25c1d3a30294cbe78f01ed75edf68da4.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE kafka_trigger SET kafka_resource_path = $1, group_id = $2, topics = $3, script_path = $4, path = $5, is_flow = $6, edited_by = $7, email = $8, edited_at = now(), server_id = NULL, error = NULL, error_handler_path = $11, error_handler_args = $12, retry = $13\n            WHERE workspace_id = $9 AND path = $10",
+  "query": "UPDATE kafka_trigger SET kafka_resource_path = $1, group_id = $2, topics = $3, script_path = $4, path = $5, is_flow = $6, edited_by = $7, email = $8, edited_at = now(), server_id = NULL, error = NULL\n            WHERE workspace_id = $9 AND path = $10",
   "describe": {
     "columns": [],
     "parameters": {
@@ -14,13 +14,10 @@
         "Varchar",
         "Varchar",
         "Text",
-        "Text",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "3f91433fc076f47dd3516b40c9337981c329ddc31132882f037eaf2709aa8805"
+  "hash": "1c0f95a069891f7214505aaa9428e11e25c1d3a30294cbe78f01ed75edf68da4"
 }

backend/.sqlx/query-1c5caaaa86e3488549cad179e992172315be5d53dcc266d713da01fd27f310b6.json

@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM asset WHERE workspace_id = $1 AND usage_path = $2 AND usage_kind = $3",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        {
-          "Custom": {
-            "name": "asset_usage_kind",
-            "kind": {
-              "Enum": [
-                "script",
-                "flow"
-              ]
-            }
-          }
-        }
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "1c5caaaa86e3488549cad179e992172315be5d53dcc266d713da01fd27f310b6"
-}

backend/.sqlx/query-1e333ccb7657bc721d18ea2230cb20f15e4a7839c87c853f280623bafb30b80c.json

@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO nats_trigger (\n            workspace_id,\n            path,\n            nats_resource_path,\n            subjects,\n            stream_name,\n            consumer_name,\n            use_jetstream,\n            script_path,\n            is_flow,\n            enabled,\n            edited_by,\n            email,\n            edited_at,\n            error_handler_path,\n            error_handler_args,\n            retry\n        ) VALUES (\n            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now(), $13, $14, $15\n        )\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "VarcharArray",
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Varchar",
-        "Bool",
-        "Bool",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "1e333ccb7657bc721d18ea2230cb20f15e4a7839c87c853f280623bafb30b80c"
-}

backend/.sqlx/query-1eeb218c30c0a6b0f7633813c764f57f8968894b4786b94109a057796ff500e4.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    SELECT \n                        path, \n                        script_path, \n                        is_flow, \n                        route_path, \n                        authentication_resource_path,\n                        workspace_id, \n                        is_async, \n                        authentication_method  AS \"authentication_method: _\", \n                        edited_by, \n                        email, \n                        static_asset_config AS \"static_asset_config: _\",\n                        wrap_body,\n                        raw_string,\n                        workspaced_route,\n                        is_static_website,\n                        error_handler_path,\n                        error_handler_args as \"error_handler_args: _\",\n                        retry as \"retry: _\"\n                    FROM \n                        http_trigger \n                    WHERE \n                        http_method = $1\n                    ",
+  "query": "\n                    SELECT \n                        path, \n                        script_path, \n                        is_flow, \n                        route_path, \n                        authentication_resource_path,\n                        workspace_id, \n                        is_async, \n                        authentication_method  AS \"authentication_method: _\", \n                        edited_by, \n                        email, \n                        static_asset_config AS \"static_asset_config: _\",\n                        wrap_body,\n                        raw_string,\n                        workspaced_route,\n                        is_static_website\n                    FROM \n                        http_trigger \n                    WHERE \n                        http_method = $1\n                    ",
   "describe": {
     "columns": [
       {
@@ -91,21 +91,6 @@
         "ordinal": 14,
         "name": "is_static_website",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 15,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 17,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -141,11 +126,8 @@
       false,
       false,
       false,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "4410b2d6e52556569cda9d945f791756a80ff2835d74bfab85f53141b6e32351"
+  "hash": "1eeb218c30c0a6b0f7633813c764f57f8968894b4786b94109a057796ff500e4"
 }

backend/.sqlx/query-222e29b89d10f3840d4e9b9ab63207df3cbab63c83d4a6374e72a11893841653.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "CREATE INDEX CONCURRENTLY idx_audit_recent_login_activities \nON audit (timestamp, username) \nWHERE operation IN ('users.login', 'oauth.login', 'users.token.refresh');",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "222e29b89d10f3840d4e9b9ab63207df3cbab63c83d4a6374e72a11893841653"
+}

backend/.sqlx/query-2dcff8b16da75740c362015b2293f578a21813f038d75184a5034c37d4daf36e.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                gcp_resource_path,\n                subscription_id,\n                topic_id,\n                workspace_id,\n                delivery_type AS \"delivery_type: _\",\n                delivery_config AS \"delivery_config: _\",\n                subscription_mode AS \"subscription_mode: _\",\n                path,\n                script_path,\n                is_flow,\n                edited_by,\n                email,\n                edited_at,\n                server_id,\n                last_server_ping,\n                extra_perms,\n                error,\n                enabled,\n                error_handler_path,\n                error_handler_args as \"error_handler_args: _\",\n                retry as \"retry: _\"\n            FROM\n                gcp_trigger\n            WHERE\n                delivery_type != 'push'::DELIVERY_MODE AND\n                enabled IS TRUE\n                AND (last_server_ping IS NULL OR\n                    last_server_ping < now() - interval '15 seconds'\n                )\n            ",
+  "query": "\n            SELECT\n                gcp_resource_path,\n                subscription_id,\n                topic_id,\n                workspace_id,\n                delivery_type AS \"delivery_type: _\",\n                delivery_config AS \"delivery_config: _\",\n                subscription_mode AS \"subscription_mode: _\",\n                path,\n                script_path,\n                is_flow,\n                edited_by,\n                email,\n                edited_at,\n                server_id,\n                last_server_ping,\n                extra_perms,\n                error,\n                enabled\n            FROM\n                gcp_trigger\n            WHERE\n                delivery_type != 'push'::DELIVERY_MODE AND\n                enabled IS TRUE\n                AND (last_server_ping IS NULL OR\n                    last_server_ping < now() - interval '15 seconds'\n                )\n            ",
   "describe": {
     "columns": [
       {
@@ -112,21 +112,6 @@
         "ordinal": 17,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 19,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 20,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -150,11 +135,8 @@
       true,
       false,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "9aa094ef0652f36d473866469e71cc41c7b1cf848d0b4beffa7eefc0fbf9d64f"
+  "hash": "2dcff8b16da75740c362015b2293f578a21813f038d75184a5034c37d4daf36e"
 }

backend/.sqlx/query-39401cb0db8d367b5beb2be0c13aa7595adae0eac4e4e3a888cb12b972d1a7ce.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT \n            workspace_id, \n            path, \n            route_path, \n            route_path_key,\n            workspaced_route,\n            script_path, \n            summary,\n            description,\n            is_flow, \n            http_method as \"http_method: _\", \n            edited_by, \n            email, \n            edited_at, \n            extra_perms, \n            is_async, \n            authentication_method as \"authentication_method: _\", \n            static_asset_config as \"static_asset_config: _\", \n            is_static_website,\n            authentication_resource_path,\n            wrap_body,\n            raw_string,\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\",\n            retry as \"retry: _\"\n        FROM \n            http_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
+  "query": "\n        SELECT \n            workspace_id, \n            path, \n            route_path, \n            route_path_key,\n            workspaced_route,\n            script_path, \n            summary,\n            description,\n            is_flow, \n            http_method as \"http_method: _\", \n            edited_by, \n            email, \n            edited_at, \n            extra_perms, \n            is_async, \n            authentication_method as \"authentication_method: _\", \n            static_asset_config as \"static_asset_config: _\", \n            is_static_website,\n            authentication_resource_path,\n            wrap_body,\n            raw_string\n        FROM \n            http_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
   "describe": {
     "columns": [
       {
@@ -134,21 +134,6 @@
         "ordinal": 20,
         "name": "raw_string",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 21,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 22,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 23,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -178,11 +163,8 @@
       false,
       true,
       false,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "ea59131c1fba8fb14a95b4a486db29ba44c4ff4d2c5b38369f0ede61d4708a21"
+  "hash": "39401cb0db8d367b5beb2be0c13aa7595adae0eac4e4e3a888cb12b972d1a7ce"
 }

backend/.sqlx/query-3f05e6186050a7ce6d8efb41067d3c5282319fe7e041f114e02fb22b91716637.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE \n                http_trigger \n            SET \n                route_path = $1, \n                route_path_key = $2, \n                workspaced_route = $3,\n                wrap_body = $4,\n                raw_string = $5,\n                authentication_resource_path = $6,\n                script_path = $7, \n                path = $8, \n                is_flow = $9, \n                http_method = $10, \n                static_asset_config = $11, \n                edited_by = $12, \n                email = $13, \n                is_async = $14, \n                authentication_method = $15, \n                summary = $16,\n                description = $17,\n                edited_at = now(), \n                is_static_website = $18,\n                error_handler_path = $19,\n                error_handler_args = $20,\n                retry = $21\n            WHERE \n                workspace_id = $22 AND \n                path = $23\n            ",
+  "query": "\n            UPDATE \n                http_trigger \n            SET \n                route_path = $1, \n                route_path_key = $2, \n                workspaced_route = $3,\n                wrap_body = $4,\n                raw_string = $5,\n                authentication_resource_path = $6,\n                script_path = $7, \n                path = $8, \n                is_flow = $9, \n                http_method = $10, \n                static_asset_config = $11, \n                edited_by = $12, \n                email = $13, \n                is_async = $14, \n                authentication_method = $15, \n                summary = $16,\n                description = $17,\n                edited_at = now(), \n                is_static_website = $18\n            WHERE \n                workspace_id = $19 AND \n                path = $20\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -50,14 +50,11 @@
         "Varchar",
         "Text",
         "Bool",
-        "Varchar",
-        "Jsonb",
-        "Jsonb",
         "Text",
         "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "f2a78401a363442f165d018d61a294b4575e2cdc31e8da3d453addd0edc3edf6"
+  "hash": "3f05e6186050a7ce6d8efb41067d3c5282319fe7e041f114e02fb22b91716637"
 }

backend/.sqlx/query-3f5520e0ea00569bf169da9abde31617043fcc0bea3ef62c50fcd881f3d48605.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO gcp_trigger (\n            gcp_resource_path,\n            subscription_id,\n            topic_id,\n            delivery_type,\n            delivery_config,\n            workspace_id, \n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            edited_by,\n            error_handler_path,\n            error_handler_args,\n            retry\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4,\n            $5,\n            $6, \n            $7, \n            $8, \n            $9,\n            $10,\n            $11,\n            $12,\n            $13,\n            $14,\n            $15\n        )",
+  "query": "\n        INSERT INTO gcp_trigger (\n            gcp_resource_path,\n            subscription_id,\n            topic_id,\n            delivery_type,\n            delivery_config,\n            workspace_id, \n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            edited_by\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4,\n            $5,\n            $6, \n            $7, \n            $8, \n            $9,\n            $10,\n            $11,\n            $12\n        )",
   "describe": {
     "columns": [],
     "parameters": {
@@ -26,13 +26,10 @@
         "Bool",
         "Varchar",
         "Bool",
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Varchar"
       ]
     },
     "nullable": []
   },
-  "hash": "7399ff3f22cbf2a522b6123e8ebf101ec9d41b7c8465cc501e61a1f6117981a2"
+  "hash": "3f5520e0ea00569bf169da9abde31617043fcc0bea3ef62c50fcd881f3d48605"
 }

backend/.sqlx/query-4228b098883408323bd8413ee094454b95962047458a6927d19ac0d3e7b3f0fa.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT \n                    workspace_id, \n                    workspaced_route,\n                    path, \n                    route_path, \n                    route_path_key, \n                    authentication_resource_path,\n                    script_path, \n                    is_flow, \n                    summary,\n                    description,\n                    edited_by, \n                    edited_at, \n                    email, \n                    extra_perms, \n                    is_async, \n                    authentication_method  AS \"authentication_method: _\", \n                    http_method AS \"http_method: _\", \n                    static_asset_config AS \"static_asset_config: _\", \n                    is_static_website,\n                    wrap_body,\n                    raw_string,\n                    error_handler_path,\n                    error_handler_args as \"error_handler_args: _\",\n                    retry as \"retry: _\"\n                FROM http_trigger\n                WHERE workspace_id = $1\n                ",
+  "query": "\n                SELECT \n                    workspace_id, \n                    workspaced_route,\n                    path, \n                    route_path, \n                    route_path_key, \n                    authentication_resource_path,\n                    script_path, \n                    is_flow, \n                    summary,\n                    description,\n                    edited_by, \n                    edited_at, \n                    email, \n                    extra_perms, \n                    is_async, \n                    authentication_method  AS \"authentication_method: _\", \n                    http_method AS \"http_method: _\", \n                    static_asset_config AS \"static_asset_config: _\", \n                    is_static_website,\n                    wrap_body,\n                    raw_string\n                FROM http_trigger\n                WHERE workspace_id = $1\n                ",
   "describe": {
     "columns": [
       {
@@ -134,21 +134,6 @@
         "ordinal": 20,
         "name": "raw_string",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 21,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 22,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 23,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -177,11 +162,8 @@
       true,
       false,
       false,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "09f43081a8b253d059d9d4302daa139cee6f055cdbafc213b2f992667f8ed578"
+  "hash": "4228b098883408323bd8413ee094454b95962047458a6927d19ac0d3e7b3f0fa"
 }

backend/.sqlx/query-44b9bea3651edc8ee732def1241b3d956c004376102ccc1707fc016801599dbd.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE \n                gcp_trigger \n            SET \n                gcp_resource_path = $1,\n                subscription_id = $2,\n                topic_id = $3,\n                delivery_type = $4,\n                delivery_config = $5,\n                is_flow = $6, \n                edited_by = $7, \n                email = $8,\n                script_path = $9,\n                path = $10,\n                enabled = $11,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL,\n                error_handler_path = $14,\n                error_handler_args = $15,\n                retry = $16\n            WHERE \n                workspace_id = $12 AND \n                path = $13\n            ",
+  "query": "\n            UPDATE \n                gcp_trigger \n            SET \n                gcp_resource_path = $1,\n                subscription_id = $2,\n                topic_id = $3,\n                delivery_type = $4,\n                delivery_config = $5,\n                is_flow = $6, \n                edited_by = $7, \n                email = $8,\n                script_path = $9,\n                path = $10,\n                enabled = $11,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL\n            WHERE \n                workspace_id = $12 AND \n                path = $13\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -27,13 +27,10 @@
         "Varchar",
         "Bool",
         "Text",
-        "Text",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "566823041170df3a6379ce58d321895746b0cd8a6891b05d51abeb7079ded5d7"
+  "hash": "44b9bea3651edc8ee732def1241b3d956c004376102ccc1707fc016801599dbd"
 }

backend/.sqlx/query-4931d4752357078ae3ae01f37742639dba0dde680ab934ba78abcb5fdda8117a.json

@@ -1,28 +1,28 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT \n                    workspace_id,\n                    path,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled,\n                    replication_slot_name,\n                    publication_name,\n                    postgres_resource_path,\n                    error_handler_path,\n                    error_handler_args as \"error_handler_args: _\",\n                    retry as \"retry: _\" \n                FROM postgres_trigger\n                WHERE workspace_id = $1",
+  "query": "SELECT * FROM postgres_trigger\n                 WHERE workspace_id = $1",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
         "name": "path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 2,
+        "ordinal": 1,
         "name": "script_path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 3,
+        "ordinal": 2,
         "name": "is_flow",
         "type_info": "Bool"
       },
+      {
+        "ordinal": 3,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
       {
         "ordinal": 4,
         "name": "edited_by",
@@ -40,28 +40,28 @@
       },
       {
         "ordinal": 7,
-        "name": "server_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
-        "name": "last_server_ping",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 9,
         "name": "extra_perms",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 10,
+        "ordinal": 8,
+        "name": "postgres_resource_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 9,
         "name": "error",
         "type_info": "Text"
       },
+      {
+        "ordinal": 10,
+        "name": "server_id",
+        "type_info": "Varchar"
+      },
       {
         "ordinal": 11,
-        "name": "enabled",
-        "type_info": "Bool"
+        "name": "last_server_ping",
+        "type_info": "Timestamptz"
       },
       {
         "ordinal": 12,
@@ -75,23 +75,8 @@
       },
       {
         "ordinal": 14,
-        "name": "postgres_resource_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 15,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 17,
-        "name": "retry: _",
-        "type_info": "Jsonb"
+        "name": "enabled",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -108,17 +93,14 @@
       false,
       false,
       true,
+      false,
       true,
       true,
       true,
       false,
       false,
-      false,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "bf1fba73d3109aae48bda524cfafdf7f5b9b0e56396aed1b83a2c235222e8983"
+  "hash": "4931d4752357078ae3ae01f37742639dba0dde680ab934ba78abcb5fdda8117a"
 }

backend/.sqlx/query-5140cfccd4a8fb7d64087de34bc2fbe1f9e0172b38492a99be19147d04a961fe.json

@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO kafka_trigger (\n            workspace_id,\n            path,\n            kafka_resource_path,\n            group_id,\n            topics,\n            script_path,\n            is_flow,\n            enabled,\n            edited_by,\n            email,\n            edited_at,\n            error_handler_path,\n            error_handler_args,\n            retry\n        ) VALUES (\n            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, now(), $11, $12, $13\n        )\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "VarcharArray",
-        "Varchar",
-        "Bool",
-        "Bool",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "5140cfccd4a8fb7d64087de34bc2fbe1f9e0172b38492a99be19147d04a961fe"
-}

backend/.sqlx/query-5237f9d3f57f4e799968a4a9630c984775d23c7a4dc1a7ad37528a46ab89d6bd.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            aws_auth_resource_type AS \"aws_auth_resource_type: _\",\n            aws_resource_path,\n            message_attributes,\n            queue_url,\n            workspace_id,\n            path,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled,\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\",\n            retry as \"retry: _\"\n        FROM \n            sqs_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
+  "query": "\n        SELECT\n            aws_auth_resource_type AS \"aws_auth_resource_type: _\",\n            aws_resource_path,\n            message_attributes,\n            queue_url,\n            workspace_id,\n            path,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled\n        FROM \n            sqs_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
   "describe": {
     "columns": [
       {
@@ -92,21 +92,6 @@
         "ordinal": 15,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 17,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 18,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -131,11 +116,8 @@
       true,
       true,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "d3bc837633eb92cd9a8d37ad09a72e8da54885cdd135e0877dec9cf407064158"
+  "hash": "5237f9d3f57f4e799968a4a9630c984775d23c7a4dc1a7ad37528a46ab89d6bd"
 }

backend/.sqlx/query-5303206bbed76ee3ddc56d8057d8b82359c182ee2a5da6df35a4375d5d2d1ef7.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT \n            gcp_resource_path, \n            script_path,\n            is_flow, \n            workspace_id,\n            path,\n            edited_by,\n            email,\n            delivery_config AS \"delivery_config: _\",\n            retry as \"retry: _\",\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\"\n        FROM\n            gcp_trigger\n        WHERE\n            workspace_id = $1 AND\n            path = $2 AND\n            delivery_type = 'push'::DELIVERY_MODE \n        ",
+  "query": "\n        SELECT \n            gcp_resource_path, \n            script_path,\n            is_flow, \n            workspace_id,\n            path,\n            edited_by,\n            email,\n            delivery_config AS \"delivery_config: _\"\n        FROM\n            gcp_trigger\n        WHERE\n            workspace_id = $1 AND\n            path = $2 AND\n            delivery_type = 'push'::DELIVERY_MODE \n        ",
   "describe": {
     "columns": [
       {
@@ -42,21 +42,6 @@
         "ordinal": 7,
         "name": "delivery_config: _",
         "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 8,
-        "name": "retry: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 9,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 10,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -73,11 +58,8 @@
       false,
       false,
       false,
-      true,
-      true,
-      true,
       true
     ]
   },
-  "hash": "39cd46049a6e7d21d310a4973b3b40604cbb8c5ea1d28e4f74651505c317b440"
+  "hash": "5303206bbed76ee3ddc56d8057d8b82359c182ee2a5da6df35a4375d5d2d1ef7"
 }

backend/.sqlx/query-534c7337ed8f1bc0e17843d6caeaf7e36c72efaeb90f94fe3b2e53b953ba2f24.json

@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE asset SET usage_path = REGEXP_REPLACE(usage_path,'u/' || $2 || '/(.*)','u/' || $1 || '/\\1') WHERE usage_path LIKE ('u/' || $2 || '/%') AND workspace_id = $3",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "534c7337ed8f1bc0e17843d6caeaf7e36c72efaeb90f94fe3b2e53b953ba2f24"
-}

backend/.sqlx/query-5af0299841a0313d0cc270e98b04b5b5968184ae53dc076b1a9bc76af35923da.json

@@ -1,136 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT \n                    workspace_id,\n                    path,\n                    nats_resource_path,\n                    subjects,\n                    stream_name,\n                    consumer_name,\n                    use_jetstream,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled,\n                    error_handler_path,\n                    error_handler_args as \"error_handler_args: _\",\n                    retry as \"retry: _\"\n                 FROM nats_trigger\n                 WHERE workspace_id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "nats_resource_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "subjects",
-        "type_info": "VarcharArray"
-      },
-      {
-        "ordinal": 4,
-        "name": "stream_name",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "consumer_name",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "use_jetstream",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 7,
-        "name": "script_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
-        "name": "is_flow",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 9,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 10,
-        "name": "email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 11,
-        "name": "edited_at",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 12,
-        "name": "server_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 13,
-        "name": "last_server_ping",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 14,
-        "name": "extra_perms",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 15,
-        "name": "error",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 16,
-        "name": "enabled",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 17,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 19,
-        "name": "retry: _",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      true,
-      false,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "5af0299841a0313d0cc270e98b04b5b5968184ae53dc076b1a9bc76af35923da"
-}

backend/.sqlx/query-5d773db0a69c73e86ccd5fd978932e7ac64eb41a56d8ca9ff0a89c594432b531.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE \n                mqtt_trigger \n            SET\n                mqtt_resource_path =  $1,\n                subscribe_topics = $2,\n                client_version = $3,\n                client_id = $4,\n                v3_config = $5,\n                v5_config = $6,\n                is_flow = $7, \n                edited_by = $8, \n                email = $9,\n                script_path = $10,\n                path = $11,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL,\n                error_handler_path = $14,\n                error_handler_args = $15,\n                retry = $16\n            WHERE \n                workspace_id = $12 AND \n                path = $13\n            ",
+  "query": "\n            UPDATE \n                mqtt_trigger \n            SET\n                mqtt_resource_path =  $1,\n                subscribe_topics = $2,\n                client_version = $3,\n                client_id = $4,\n                v3_config = $5,\n                v5_config = $6,\n                is_flow = $7, \n                edited_by = $8, \n                email = $9,\n                script_path = $10,\n                path = $11,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL\n            WHERE \n                workspace_id = $12 AND \n                path = $13\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -27,13 +27,10 @@
         "Varchar",
         "Varchar",
         "Text",
-        "Text",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "04a8482180a3f8e07761742f13ac30afc081eeed1151a0b5e043d785baebfc9d"
+  "hash": "5d773db0a69c73e86ccd5fd978932e7ac64eb41a56d8ca9ff0a89c594432b531"
 }

backend/.sqlx/query-61e6070b8a1e3a138818c327d6dbe7efbe27f9e2c8e02258cf7aa06e1779fddb.json

@@ -1,66 +1,66 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT \n            workspace_id,\n            path,\n            kafka_resource_path,\n            group_id,\n            topics,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled,\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\",\n            retry as \"retry: _\"\n            FROM kafka_trigger WHERE workspace_id = $1 AND path = $2",
+  "query": "SELECT * FROM nats_trigger\n                 WHERE workspace_id = $1",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
         "name": "path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 2,
-        "name": "kafka_resource_path",
+        "ordinal": 1,
+        "name": "nats_resource_path",
         "type_info": "Varchar"
       },
+      {
+        "ordinal": 2,
+        "name": "subjects",
+        "type_info": "VarcharArray"
+      },
       {
         "ordinal": 3,
-        "name": "group_id",
+        "name": "stream_name",
         "type_info": "Varchar"
       },
       {
         "ordinal": 4,
-        "name": "topics",
-        "type_info": "VarcharArray"
+        "name": "consumer_name",
+        "type_info": "Varchar"
       },
       {
         "ordinal": 5,
+        "name": "use_jetstream",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 6,
         "name": "script_path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 6,
+        "ordinal": 7,
         "name": "is_flow",
         "type_info": "Bool"
       },
-      {
-        "ordinal": 7,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
       {
         "ordinal": 8,
-        "name": "email",
+        "name": "workspace_id",
         "type_info": "Varchar"
       },
       {
         "ordinal": 9,
-        "name": "edited_at",
-        "type_info": "Timestamptz"
+        "name": "edited_by",
+        "type_info": "Varchar"
       },
       {
         "ordinal": 10,
-        "name": "server_id",
+        "name": "email",
         "type_info": "Varchar"
       },
       {
         "ordinal": 11,
-        "name": "last_server_ping",
+        "name": "edited_at",
         "type_info": "Timestamptz"
       },
       {
@@ -70,33 +70,27 @@
       },
       {
         "ordinal": 13,
+        "name": "server_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 14,
+        "name": "last_server_ping",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 15,
         "name": "error",
         "type_info": "Text"
       },
       {
-        "ordinal": 14,
+        "ordinal": 16,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 15,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 17,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
       "Left": [
-        "Text",
         "Text"
       ]
     },
@@ -104,6 +98,9 @@
       false,
       false,
       false,
+      true,
+      true,
+      false,
       false,
       false,
       false,
@@ -113,13 +110,9 @@
       false,
       true,
       true,
-      false,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "6489342f52a9e1e90466bad48e0a6079fcabd696b02d57e3dbe652d28b84f008"
+  "hash": "61e6070b8a1e3a138818c327d6dbe7efbe27f9e2c8e02258cf7aa06e1779fddb"
 }

backend/.sqlx/query-63b42286804a3f3977235935d7ac200a07c5a4ad3a50051b73f382385b89466e.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, initial_messages = $6, url_runnable_args = $7, edited_by = $8, email = $9, can_return_message = $10, edited_at = now(), server_id = NULL, error = NULL, error_handler_path = $13, error_handler_args = $14, retry = $15\n            WHERE workspace_id = $11 AND path = $12",
+  "query": "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, initial_messages = $6, url_runnable_args = $7, edited_by = $8, email = $9, can_return_message = $10, edited_at = now(), server_id = NULL, error = NULL\n            WHERE workspace_id = $11 AND path = $12",
   "describe": {
     "columns": [],
     "parameters": {
@@ -16,13 +16,10 @@
         "Varchar",
         "Bool",
         "Text",
-        "Text",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "4479beaefc36afba093e5113bb330a87979623d69b94f274863318ed351a1dac"
+  "hash": "63b42286804a3f3977235935d7ac200a07c5a4ad3a50051b73f382385b89466e"
 }

backend/.sqlx/query-65cd5a5a12eb79a2f21ed898616c5cd5c5e671ce1ed3d89639cd306c76a1d9db.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            mqtt_resource_path,\n            subscribe_topics as \"subscribe_topics!: Vec<SqlxJson<SubscribeTopic>>\",\n            v3_config as \"v3_config!: Option<SqlxJson<MqttV3Config>>\",\n            v5_config as \"v5_config!: Option<SqlxJson<MqttV5Config>>\",\n            client_version AS \"client_version: _\",\n            client_id,\n            workspace_id,\n            path,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled,\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\",\n            retry as \"retry: _\"\n        FROM \n            mqtt_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
+  "query": "\n        SELECT\n            mqtt_resource_path,\n            subscribe_topics as \"subscribe_topics!: Vec<SqlxJson<SubscribeTopic>>\",\n            v3_config as \"v3_config!: Option<SqlxJson<MqttV3Config>>\",\n            v5_config as \"v5_config!: Option<SqlxJson<MqttV5Config>>\",\n            client_version AS \"client_version: _\",\n            client_id,\n            workspace_id,\n            path,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled\n        FROM \n            mqtt_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
   "describe": {
     "columns": [
       {
@@ -102,21 +102,6 @@
         "ordinal": 17,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 19,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 20,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -143,11 +128,8 @@
       true,
       false,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "208f30f8a570db41ee52f01a4402d76f7e174e39c45ede29dcd6aa9c65850fef"
+  "hash": "65cd5a5a12eb79a2f21ed898616c5cd5c5e671ce1ed3d89639cd306c76a1d9db"
 }

backend/.sqlx/query-6fdab4c131f3126d5020b780ba45927dc778ac6fefdc2f91982f600b7cb9954f.json

@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM asset WHERE workspace_id = $1 AND usage_kind = 'script' AND usage_path = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "6fdab4c131f3126d5020b780ba45927dc778ac6fefdc2f91982f600b7cb9954f"
-}

backend/.sqlx/query-74a2871aba7e35527dcefb2538b8cf41c35618f7c15ea047c5082f8feb7a8464.json

@@ -1,51 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO asset (workspace_id, path, kind, usage_access_type, usage_path, usage_kind)\n                VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT DO NOTHING",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        {
-          "Custom": {
-            "name": "asset_kind",
-            "kind": {
-              "Enum": [
-                "s3object",
-                "resource",
-                "variable"
-              ]
-            }
-          }
-        },
-        {
-          "Custom": {
-            "name": "asset_access_type",
-            "kind": {
-              "Enum": [
-                "r",
-                "w",
-                "rw"
-              ]
-            }
-          }
-        },
-        "Varchar",
-        {
-          "Custom": {
-            "name": "asset_usage_kind",
-            "kind": {
-              "Enum": [
-                "script",
-                "flow"
-              ]
-            }
-          }
-        }
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "74a2871aba7e35527dcefb2538b8cf41c35618f7c15ea047c5082f8feb7a8464"
-}

backend/.sqlx/query-76033e76f15cee2aa0394d4ec2ff62130e7e48cb40d3b1534b0d791760b33ec7.json

@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT\n                jsonb_build_object(\n                    'path', path,\n                    'kind', kind,\n                    'access_type', usage_access_type\n                ) as \"list!: _\"\n            FROM asset\n            WHERE workspace_id = $1 AND usage_path = $2 AND usage_kind = $3\n            ORDER BY path, kind",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "list!: _",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        {
-          "Custom": {
-            "name": "asset_usage_kind",
-            "kind": {
-              "Enum": [
-                "script",
-                "flow"
-              ]
-            }
-          }
-        }
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "76033e76f15cee2aa0394d4ec2ff62130e7e48cb40d3b1534b0d791760b33ec7"
-}

backend/.sqlx/query-776909d3452aaf9e0ed41a5ec314b7bfc5bc8b6a76c98bf4daf7d715d18c52e6.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO sqs_trigger (\n            aws_auth_resource_type,\n            aws_resource_path,\n            queue_url,\n            message_attributes,\n            workspace_id, \n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            edited_by,\n            error_handler_path,\n            error_handler_args,\n            retry\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4, \n            $5, \n            $6, \n            $7,\n            $8,\n            $9,\n            $10,\n            $11,\n            $12,\n            $13,\n            $14\n        )",
+  "query": "\n        INSERT INTO sqs_trigger (\n            aws_auth_resource_type,\n            aws_resource_path,\n            queue_url,\n            message_attributes,\n            workspace_id, \n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            edited_by\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4, \n            $5, \n            $6, \n            $7,\n            $8,\n            $9,\n            $10,\n            $11\n        )",
   "describe": {
     "columns": [],
     "parameters": {
@@ -25,13 +25,10 @@
         "Bool",
         "Varchar",
         "Bool",
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Varchar"
       ]
     },
     "nullable": []
   },
-  "hash": "c22438f9bff27ccd3228a186a8093c551c30ed85eabe8ec11cafa6358f354c8b"
+  "hash": "776909d3452aaf9e0ed41a5ec314b7bfc5bc8b6a76c98bf4daf7d715d18c52e6"
 }

backend/.sqlx/query-78bb75578a880715fb482445883e0e762f289b7695f29bfd44fa23323c7e8523.json

@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM asset WHERE workspace_id = $1 AND usage_kind = 'script' AND usage_path = (SELECT path FROM script WHERE hash = $2 AND workspace_id = $1)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "78bb75578a880715fb482445883e0e762f289b7695f29bfd44fa23323c7e8523"
-}

backend/.sqlx/query-7b36b58761cd459b808cc4f463dfc93f01fdbc19c66d7404f95e1f8444235a8e.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE nats_trigger SET nats_resource_path = $1, subjects = $2, stream_name = $3, consumer_name = $4, use_jetstream = $5, script_path = $6, path = $7, is_flow = $8, edited_by = $9, email = $10, edited_at = now(), server_id = NULL, error = NULL, error_handler_path = $13, error_handler_args = $14, retry = $15\n            WHERE workspace_id = $11 AND path = $12",
+  "query": "UPDATE nats_trigger SET nats_resource_path = $1, subjects = $2, stream_name = $3, consumer_name = $4, use_jetstream = $5, script_path = $6, path = $7, is_flow = $8, edited_by = $9, email = $10, edited_at = now(), server_id = NULL, error = NULL\n            WHERE workspace_id = $11 AND path = $12",
   "describe": {
     "columns": [],
     "parameters": {
@@ -16,13 +16,10 @@
         "Varchar",
         "Varchar",
         "Text",
-        "Text",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "570a4684bbdb390e4652301aa8d2d09b6e09b258f748d48cf2d188465621ee04"
+  "hash": "7b36b58761cd459b808cc4f463dfc93f01fdbc19c66d7404f95e1f8444235a8e"
 }

backend/.sqlx/query-7b6e8dac5f83fcbae95056c4206bf4de1b12d6c8aab32f1f55d7f2c230c5c08e.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                mqtt_resource_path,\n                subscribe_topics as \"subscribe_topics!: Vec<SqlxJson<SubscribeTopic>>\",\n                v3_config as \"v3_config!: Option<SqlxJson<MqttV3Config>>\",\n                v5_config as \"v5_config!: Option<SqlxJson<MqttV5Config>>\",\n                client_version as \"client_version: _\",\n                client_id,\n                workspace_id,\n                path,\n                script_path,\n                is_flow,\n                edited_by,\n                email,\n                edited_at,\n                server_id,\n                last_server_ping,\n                extra_perms,\n                error,\n                enabled,\n                error_handler_path,\n                error_handler_args as \"error_handler_args: _\",\n                retry as \"retry: _\"\n            FROM\n                mqtt_trigger\n            WHERE\n                enabled IS TRUE\n                AND (last_server_ping IS NULL OR\n                    last_server_ping < now() - interval '15 seconds'\n                )\n            ",
+  "query": "\n            SELECT\n                mqtt_resource_path,\n                subscribe_topics as \"subscribe_topics!: Vec<SqlxJson<SubscribeTopic>>\",\n                v3_config as \"v3_config!: Option<SqlxJson<MqttV3Config>>\",\n                v5_config as \"v5_config!: Option<SqlxJson<MqttV5Config>>\",\n                client_version as \"client_version: _\",\n                client_id,\n                workspace_id,\n                path,\n                script_path,\n                is_flow,\n                edited_by,\n                email,\n                edited_at,\n                server_id,\n                last_server_ping,\n                extra_perms,\n                error,\n                enabled\n            FROM\n                mqtt_trigger\n            WHERE\n                enabled IS TRUE\n                AND (last_server_ping IS NULL OR\n                    last_server_ping < now() - interval '15 seconds'\n                )\n            ",
   "describe": {
     "columns": [
       {
@@ -102,21 +102,6 @@
         "ordinal": 17,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 19,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 20,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -140,11 +125,8 @@
       true,
       false,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "2659fe2e121ac15da08030c9e72bdb79a580711cba2139f0cf901b30bb491fd5"
+  "hash": "7b6e8dac5f83fcbae95056c4206bf4de1b12d6c8aab32f1f55d7f2c230c5c08e"
 }

backend/.sqlx/query-8490024b96aa689d3c1bc5cbf94fcd8c5491732818404fee2397f00cccee0ad3.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE \n                sqs_trigger \n            SET \n                aws_auth_resource_type = $1,\n                aws_resource_path = $2,\n                queue_url = $3,\n                message_attributes = $4, \n                is_flow = $5, \n                edited_by = $6, \n                email = $7,\n                script_path = $8,\n                path = $9,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL,\n                error_handler_path = $12,\n                error_handler_args = $13,\n                retry = $14\n            WHERE \n                workspace_id = $10 AND \n                path = $11\n            ",
+  "query": "\n            UPDATE \n                sqs_trigger \n            SET \n                aws_auth_resource_type = $1,\n                aws_resource_path = $2,\n                queue_url = $3,\n                message_attributes = $4, \n                is_flow = $5, \n                edited_by = $6, \n                email = $7,\n                script_path = $8,\n                path = $9,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL\n            WHERE \n                workspace_id = $10 AND \n                path = $11\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -25,13 +25,10 @@
         "Varchar",
         "Varchar",
         "Text",
-        "Text",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "c3730ae025a4dcc25b2713e3e670ce006b1ceed26e29d812d524c711d178167e"
+  "hash": "8490024b96aa689d3c1bc5cbf94fcd8c5491732818404fee2397f00cccee0ad3"
 }

backend/.sqlx/query-8b784784fe63d91cc5ebe27022f803caf85d5916960308cff512047d4f0dcba4.json

@@ -1,23 +1,23 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT \n                    workspace_id,\n                    path,\n                    kafka_resource_path,\n                    group_id,\n                    topics,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled,\n                    error_handler_path,\n                    error_handler_args as \"error_handler_args: _\",\n                    retry as \"retry: _\" \n                 FROM kafka_trigger\n                 WHERE workspace_id = $1",
+  "query": "SELECT * FROM kafka_trigger\n                 WHERE workspace_id = $1",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
         "name": "path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 2,
+        "ordinal": 1,
         "name": "kafka_resource_path",
         "type_info": "Varchar"
       },
+      {
+        "ordinal": 2,
+        "name": "topics",
+        "type_info": "VarcharArray"
+      },
       {
         "ordinal": 3,
         "name": "group_id",
@@ -25,19 +25,19 @@
       },
       {
         "ordinal": 4,
-        "name": "topics",
-        "type_info": "VarcharArray"
-      },
-      {
-        "ordinal": 5,
         "name": "script_path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 6,
+        "ordinal": 5,
         "name": "is_flow",
         "type_info": "Bool"
       },
+      {
+        "ordinal": 6,
+        "name": "workspace_id",
+        "type_info": "Varchar"
+      },
       {
         "ordinal": 7,
         "name": "edited_by",
@@ -55,19 +55,19 @@
       },
       {
         "ordinal": 10,
+        "name": "extra_perms",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 11,
         "name": "server_id",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 11,
+        "ordinal": 12,
         "name": "last_server_ping",
         "type_info": "Timestamptz"
       },
-      {
-        "ordinal": 12,
-        "name": "extra_perms",
-        "type_info": "Jsonb"
-      },
       {
         "ordinal": 13,
         "name": "error",
@@ -77,21 +77,6 @@
         "ordinal": 14,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 15,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 17,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -110,15 +95,12 @@
       false,
       false,
       false,
-      true,
-      true,
-      false,
-      true,
       false,
       true,
       true,
-      true
+      true,
+      false
     ]
   },
-  "hash": "8f511fd837a99fa37a95781e50f8a83eaf93651f82c36c9795637d3ad761d003"
+  "hash": "8b784784fe63d91cc5ebe27022f803caf85d5916960308cff512047d4f0dcba4"
 }

backend/.sqlx/query-8eabeee5527da4aad3f46ad185015262b4304667449f3e1a71efd7477a39f7fc.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT \n                    workspace_id,\n                    path,\n                    url,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled,\n                    filters AS \"filters: _\",\n                    initial_messages AS \"initial_messages: _\",\n                    url_runnable_args AS \"url_runnable_args: _\",\n                    can_return_message,\n                    error_handler_path,\n                    error_handler_args as \"error_handler_args: _\",\n                    retry as \"retry: _\"\n                FROM \n                    websocket_trigger\n                WHERE \n                    workspace_id = $1\n                ",
+  "query": "\n                SELECT \n                    workspace_id,\n                    path,\n                    url,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled,\n                    filters AS \"filters: _\",\n                    initial_messages AS \"initial_messages: _\",\n                    url_runnable_args AS \"url_runnable_args: _\",\n                    can_return_message\n                FROM \n                    websocket_trigger\n                WHERE \n                    workspace_id = $1\n                ",
   "describe": {
     "columns": [
       {
@@ -87,21 +87,6 @@
         "ordinal": 16,
         "name": "can_return_message",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 17,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 19,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -126,11 +111,8 @@
       false,
       true,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "c287f025c77c34e4d521204e7a787e794b461a7a965912bcb598619451eced31"
+  "hash": "8eabeee5527da4aad3f46ad185015262b4304667449f3e1a71efd7477a39f7fc"
 }

backend/.sqlx/query-8ffd68b82cfce337fc32a6e80c8d56c53acd02eb350b46f6b815a5ddbb69d163.json

@@ -1,137 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT\n            workspace_id,\n            path,\n            nats_resource_path,\n            subjects,\n            stream_name,\n            consumer_name,\n            use_jetstream,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled,\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\",\n            retry as \"retry: _\"\n          FROM nats_trigger\n          WHERE workspace_id = $1 AND path = $2",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "nats_resource_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "subjects",
-        "type_info": "VarcharArray"
-      },
-      {
-        "ordinal": 4,
-        "name": "stream_name",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "consumer_name",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "use_jetstream",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 7,
-        "name": "script_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
-        "name": "is_flow",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 9,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 10,
-        "name": "email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 11,
-        "name": "edited_at",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 12,
-        "name": "server_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 13,
-        "name": "last_server_ping",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 14,
-        "name": "extra_perms",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 15,
-        "name": "error",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 16,
-        "name": "enabled",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 17,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 19,
-        "name": "retry: _",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      true,
-      false,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "8ffd68b82cfce337fc32a6e80c8d56c53acd02eb350b46f6b815a5ddbb69d163"
-}

backend/.sqlx/query-92f03f4df5e86eb40b255ad0f2cc85e0302c37b0f312366098104cd280a91ef6.json

@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT\n            jsonb_strip_nulls(jsonb_build_object(\n                'path', asset.path,\n                'kind', asset.kind,\n                'usages', ARRAY_AGG(jsonb_build_object(\n                    'path', asset.usage_path,\n                    'kind', asset.usage_kind,\n                    'access_type', asset.usage_access_type\n                )),\n                'metadata', (CASE\n                  WHEN asset.kind = 'resource' THEN\n                    jsonb_build_object('resource_type', resource.resource_type)\n                  ELSE\n                    NULL\n                  END\n                )\n            )) as \"list!: _\"\n        FROM asset\n        LEFT JOIN resource ON asset.kind = 'resource' AND asset.path = resource.path AND resource.workspace_id = $1\n        WHERE asset.workspace_id = $1\n          AND (asset.kind <> 'resource' OR resource.path IS NOT NULL)\n          AND (asset.usage_kind <> 'flow' OR asset.usage_path = ANY(SELECT path FROM flow WHERE workspace_id = $1))\n          AND (asset.usage_kind <> 'script' OR asset.usage_path = ANY(SELECT path FROM script WHERE workspace_id = $1))\n          GROUP BY asset.path, asset.kind, resource.resource_type\n        ORDER BY asset.path, asset.kind",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "list!: _",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "92f03f4df5e86eb40b255ad0f2cc85e0302c37b0f312366098104cd280a91ef6"
-}

backend/.sqlx/query-946977f0d525abf6267bf02e7a887434abd3e213b8c3c488166ca58fe3321147.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE postgres_trigger \n            SET \n                script_path = $1, \n                path = $2, \n                is_flow = $3, \n                edited_by = $4, \n                email = $5, \n                postgres_resource_path = $6, \n                replication_slot_name = $7,\n                publication_name = $8,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL,\n                error_handler_path = $11,\n                error_handler_args = $12,\n                retry = $13\n            WHERE \n                workspace_id = $9 AND \n                path = $10\n            ",
+  "query": "\n            UPDATE postgres_trigger \n            SET \n                script_path = $1, \n                path = $2, \n                is_flow = $3, \n                edited_by = $4, \n                email = $5, \n                postgres_resource_path = $6, \n                replication_slot_name = $7,\n                publication_name = $8,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL\n            WHERE \n                workspace_id = $9 AND \n                path = $10\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -14,13 +14,10 @@
         "Varchar",
         "Varchar",
         "Text",
-        "Text",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "4eab48b7e86788835c3ba739cca764231013b32e7dc26fb3b775e872d2222005"
+  "hash": "946977f0d525abf6267bf02e7a887434abd3e213b8c3c488166ca58fe3321147"
 }

backend/.sqlx/query-9cb31818d4db8a0e294884ab3dec08bfc262f99c875bf16c25bfb5e987efe978.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                workspace_id,\n                path,\n                script_path,\n                replication_slot_name,\n                publication_name,\n                is_flow,\n                edited_by,\n                email,\n                edited_at,\n                server_id,\n                last_server_ping,\n                extra_perms,\n                error,\n                enabled,\n                postgres_resource_path,\n                error_handler_path,\n                error_handler_args as \"error_handler_args: _\",\n                retry as \"retry: _\"\n            FROM\n                postgres_trigger\n            WHERE\n                enabled IS TRUE\n                AND (last_server_ping IS NULL OR\n                    last_server_ping < now() - interval '15 seconds'\n                )\n            ",
+  "query": "\n            SELECT\n                workspace_id,\n                path,\n                script_path,\n                replication_slot_name,\n                publication_name,\n                is_flow,\n                edited_by,\n                email,\n                edited_at,\n                server_id,\n                last_server_ping,\n                extra_perms,\n                error,\n                enabled,\n                postgres_resource_path\n            FROM\n                postgres_trigger\n            WHERE\n                enabled IS TRUE\n                AND (last_server_ping IS NULL OR\n                    last_server_ping < now() - interval '15 seconds'\n                )\n            ",
   "describe": {
     "columns": [
       {
@@ -77,21 +77,6 @@
         "ordinal": 14,
         "name": "postgres_resource_path",
         "type_info": "Varchar"
-      },
-      {
-        "ordinal": 15,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 17,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -112,11 +97,8 @@
       true,
       true,
       false,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "cf76aedfdffc25057a64fc94fd6be0791d5970458810a2b465c27f02ad1d4b2f"
+  "hash": "9cb31818d4db8a0e294884ab3dec08bfc262f99c875bf16c25bfb5e987efe978"
 }

backend/.sqlx/query-a7df493316f632fc636e4c3c90bef4c98035b5dc808bb8379251c0b35d945ba0.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    aws_auth_resource_type AS \"aws_auth_resource_type: _\",\n                    aws_resource_path,\n                    message_attributes,\n                    queue_url,\n                    workspace_id,\n                    path,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled,\n                    error_handler_path,\n                    error_handler_args as \"error_handler_args: _\",\n                    retry as \"retry: _\"\n                FROM \n                    sqs_trigger\n                WHERE \n                    workspace_id = $1\n                ",
+  "query": "\n                SELECT\n                    aws_auth_resource_type AS \"aws_auth_resource_type: _\",\n                    aws_resource_path,\n                    message_attributes,\n                    queue_url,\n                    workspace_id,\n                    path,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled\n                FROM \n                    sqs_trigger\n                WHERE \n                    workspace_id = $1\n                ",
   "describe": {
     "columns": [
       {
@@ -92,21 +92,6 @@
         "ordinal": 15,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 17,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 18,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -130,11 +115,8 @@
       true,
       true,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "264bc51ec372dfc6c1c4eb3608b32d8a250bd0d65ce33d7eb19eaea62466a803"
+  "hash": "a7df493316f632fc636e4c3c90bef4c98035b5dc808bb8379251c0b35d945ba0"
 }

backend/.sqlx/query-ad8487a797713b3a6c10fb399c9fb8dcd940bb92e998145e250f28ccfe1c7033.json

@@ -1,33 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO audit\n        (workspace_id, username, operation, action_kind, resource, parameters, email, span)\n        VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        {
-          "Custom": {
-            "name": "action_kind",
-            "kind": {
-              "Enum": [
-                "create",
-                "update",
-                "delete",
-                "execute"
-              ]
-            }
-          }
-        },
-        "Varchar",
-        "Jsonb",
-        "Varchar",
-        "Varchar"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "ad8487a797713b3a6c10fb399c9fb8dcd940bb92e998145e250f28ccfe1c7033"
-}

backend/.sqlx/query-bc0bedddcafad216c30c5061eef3f4ed8573cda89f655d6490d22f182e3f2f36.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                aws_auth_resource_type AS \"aws_auth_resource_type: _\",\n                queue_url,\n                aws_resource_path,\n                message_attributes,\n                workspace_id,\n                path,\n                script_path,\n                is_flow,\n                edited_by,\n                email,\n                edited_at,\n                server_id,\n                last_server_ping,\n                extra_perms,\n                error,\n                enabled,\n                error_handler_path,\n                error_handler_args as \"error_handler_args: _\",\n                retry as \"retry: _\"\n            FROM\n                sqs_trigger\n            WHERE\n                enabled IS TRUE\n                AND (last_server_ping IS NULL OR\n                    last_server_ping < now() - interval '15 seconds'\n                )\n            ",
+  "query": "\n            SELECT\n                aws_auth_resource_type AS \"aws_auth_resource_type: _\",\n                queue_url,\n                aws_resource_path,\n                message_attributes,\n                workspace_id,\n                path,\n                script_path,\n                is_flow,\n                edited_by,\n                email,\n                edited_at,\n                server_id,\n                last_server_ping,\n                extra_perms,\n                error,\n                enabled\n            FROM\n                sqs_trigger\n            WHERE\n                enabled IS TRUE\n                AND (last_server_ping IS NULL OR\n                    last_server_ping < now() - interval '15 seconds'\n                )\n            ",
   "describe": {
     "columns": [
       {
@@ -92,21 +92,6 @@
         "ordinal": 15,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 17,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 18,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -128,11 +113,8 @@
       true,
       true,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "58ddf5c76455d30dc42f46a0553e761461c327e7502b707c2d2742946d7d1f4c"
+  "hash": "bc0bedddcafad216c30c5061eef3f4ed8573cda89f655d6490d22f182e3f2f36"
 }

backend/.sqlx/query-bcc4f786fa2771a4a265aec8d1c403e660002503aad860caa12ebee2dbab3f0f.json

@@ -1,134 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT\n                workspace_id,\n                path,\n                nats_resource_path,\n                subjects,\n                stream_name,\n                consumer_name,\n                use_jetstream,\n                script_path,\n                is_flow,\n                edited_by,\n                email,\n                edited_at,\n                server_id,\n                last_server_ping,\n                extra_perms,\n                error,\n                enabled,\n                error_handler_path,\n                error_handler_args as \"error_handler_args: _\",\n                retry as \"retry: _\"\n            FROM nats_trigger\n            WHERE enabled IS TRUE AND (last_server_ping IS NULL OR last_server_ping < now() - interval '15 seconds')",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "nats_resource_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "subjects",
-        "type_info": "VarcharArray"
-      },
-      {
-        "ordinal": 4,
-        "name": "stream_name",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "consumer_name",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "use_jetstream",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 7,
-        "name": "script_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
-        "name": "is_flow",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 9,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 10,
-        "name": "email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 11,
-        "name": "edited_at",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 12,
-        "name": "server_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 13,
-        "name": "last_server_ping",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 14,
-        "name": "extra_perms",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 15,
-        "name": "error",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 16,
-        "name": "enabled",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 17,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 19,
-        "name": "retry: _",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      true,
-      false,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "bcc4f786fa2771a4a265aec8d1c403e660002503aad860caa12ebee2dbab3f0f"
-}

backend/.sqlx/query-c2925a28212265bd9ac8e2d498b3588fc040c7a29ae6d9bab1f05af0b535e2ac.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    gcp_resource_path,\n                    subscription_id,\n                    topic_id,\n                    workspace_id,\n                    delivery_type AS \"delivery_type: _\",\n                    delivery_config AS \"delivery_config: _\",\n                    subscription_mode AS \"subscription_mode: _\",\n                    path,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled,\n                    error_handler_path,\n                    error_handler_args as \"error_handler_args: _\",\n                    retry as \"retry: _\"\n                FROM \n                    gcp_trigger\n                WHERE \n                    workspace_id = $1\n                ",
+  "query": "\n                SELECT\n                    gcp_resource_path,\n                    subscription_id,\n                    topic_id,\n                    workspace_id,\n                    delivery_type AS \"delivery_type: _\",\n                    delivery_config AS \"delivery_config: _\",\n                    subscription_mode AS \"subscription_mode: _\",\n                    path,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled\n                FROM \n                    gcp_trigger\n                WHERE \n                    workspace_id = $1\n                ",
   "describe": {
     "columns": [
       {
@@ -112,21 +112,6 @@
         "ordinal": 17,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 19,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 20,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -152,11 +137,8 @@
       true,
       false,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "e82b99583d5d3004b4ad6606e7906b8f95b33c6137f136edabb0255bfa6a98f7"
+  "hash": "c2925a28212265bd9ac8e2d498b3588fc040c7a29ae6d9bab1f05af0b535e2ac"
 }

backend/.sqlx/query-c4cd9668733b2b439ac7a911d15041ac728553e20adf722eb795d01d6650ff0f.json

@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO websocket_trigger (\n            workspace_id,\n            path,\n            url,\n            script_path,\n            is_flow,\n            enabled,\n            filters,\n            initial_messages,\n            url_runnable_args,\n            edited_by,\n            can_return_message,\n            email,\n            edited_at,\n            error_handler_path,\n            error_handler_args,\n            retry\n        ) VALUES (\n            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now(), $13, $14, $15\n        )\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Bool",
-        "JsonbArray",
-        "JsonbArray",
-        "Jsonb",
-        "Varchar",
-        "Bool",
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "c4cd9668733b2b439ac7a911d15041ac728553e20adf722eb795d01d6650ff0f"
-}

backend/.sqlx/query-c51f9ad5133c46fd7c499b8339dbbf3f3059bbb85de07ee3b4b4cea971984a52.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    mqtt_resource_path,\n                    subscribe_topics as \"subscribe_topics: _\",\n                    v3_config as \"v3_config: _\",\n                    v5_config as \"v5_config: _\",\n                    client_version AS \"client_version: _\",\n                    client_id,\n                    workspace_id,\n                    path,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled,\n                    error_handler_path,\n                    error_handler_args as \"error_handler_args: _\",\n                    retry as \"retry: _\"\n                FROM \n                    mqtt_trigger\n                ",
+  "query": "\n                SELECT\n                    mqtt_resource_path,\n                    subscribe_topics as \"subscribe_topics: _\",\n                    v3_config as \"v3_config: _\",\n                    v5_config as \"v5_config: _\",\n                    client_version AS \"client_version: _\",\n                    client_id,\n                    workspace_id,\n                    path,\n                    script_path,\n                    is_flow,\n                    edited_by,\n                    email,\n                    edited_at,\n                    server_id,\n                    last_server_ping,\n                    extra_perms,\n                    error,\n                    enabled\n                FROM \n                    mqtt_trigger\n                ",
   "describe": {
     "columns": [
       {
@@ -102,21 +102,6 @@
         "ordinal": 17,
         "name": "enabled",
         "type_info": "Bool"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 19,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 20,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -140,11 +125,8 @@
       true,
       false,
       true,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "eebc9b609d9b595524223ada91e0f7fa1ca50b45cc82e2fd9d4e61768b258735"
+  "hash": "c51f9ad5133c46fd7c499b8339dbbf3f3059bbb85de07ee3b4b4cea971984a52"
 }

backend/.sqlx/query-ce6ebdcaed35f77b1f0f7fe6601d9f4d5eb4b159051c2b7d5ff10d7e13dcac0e.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_audit_recent_login_activities \nON audit (timestamp, username) \nWHERE operation IN ('users.login', 'oauth.login', 'users.token.refresh');",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": []
-  },
-  "hash": "ce6ebdcaed35f77b1f0f7fe6601d9f4d5eb4b159051c2b7d5ff10d7e13dcac0e"
-}

backend/.sqlx/query-d5aa879b05fc92ecbf39e8ce005461ea015361ca880f970a039b82d7476bbf4d.json

@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT jsonb_object_keys(large_file_storage->'secondary_storage') AS \"secondary_storage_name!: _\"\n        FROM workspace_settings WHERE workspace_id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "secondary_storage_name!: _",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "d5aa879b05fc92ecbf39e8ce005461ea015361ca880f970a039b82d7476bbf4d"
-}

backend/.sqlx/query-dd06bdc09968add6a7c09f124f1f9b717990371d98e0784e96eb31cfdd17885a.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE \n                http_trigger \n            SET \n                workspaced_route = $1,\n                wrap_body = $2,\n                raw_string = $3,\n                authentication_resource_path = $4,\n                script_path = $5, \n                path = $6, \n                is_flow = $7, \n                http_method = $8, \n                static_asset_config = $9, \n                edited_by = $10, \n                email = $11, \n                is_async = $12, \n                authentication_method = $13, \n                edited_at = now(), \n                is_static_website = $14,\n                error_handler_path = $15,\n                error_handler_args = $16,\n                retry = $17\n            WHERE \n                workspace_id = $18 AND \n                path = $19\n            ",
+  "query": "\n            UPDATE \n                http_trigger \n            SET \n                workspaced_route = $1,\n                wrap_body = $2,\n                raw_string = $3,\n                authentication_resource_path = $4,\n                script_path = $5, \n                path = $6, \n                is_flow = $7, \n                http_method = $8, \n                static_asset_config = $9, \n                edited_by = $10, \n                email = $11, \n                is_async = $12, \n                authentication_method = $13, \n                edited_at = now(), \n                is_static_website = $14\n            WHERE \n                workspace_id = $15 AND \n                path = $16\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -46,14 +46,11 @@
           }
         },
         "Bool",
-        "Varchar",
-        "Jsonb",
-        "Jsonb",
         "Text",
         "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "d580bac9f4be4329da29781efa00cd0b5379955a42b7e070c7e11f8479441482"
+  "hash": "dd06bdc09968add6a7c09f124f1f9b717990371d98e0784e96eb31cfdd17885a"
 }

backend/.sqlx/query-ed99d4d088d0fd0c01f29803b12e99ae0a53d0b1feaa67737da409c51c1b6751.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO http_trigger (\n            workspace_id, \n            path, \n            route_path, \n            route_path_key,\n            workspaced_route,\n            authentication_resource_path,\n            wrap_body,\n            raw_string,\n            script_path, \n            summary,\n            description,\n            is_flow, \n            is_async, \n            authentication_method, \n            http_method, \n            static_asset_config, \n            edited_by, \n            email, \n            edited_at, \n            is_static_website,\n            error_handler_path,\n            error_handler_args,\n            retry\n        ) \n        VALUES (\n            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, now(), $19, $20, $21, $22\n        )\n        ",
+  "query": "\n        INSERT INTO http_trigger (\n            workspace_id, \n            path, \n            route_path, \n            route_path_key,\n            workspaced_route,\n            authentication_resource_path,\n            wrap_body,\n            raw_string,\n            script_path, \n            summary,\n            description,\n            is_flow, \n            is_async, \n            authentication_method, \n            http_method, \n            static_asset_config, \n            edited_by, \n            email, \n            edited_at, \n            is_static_website\n        ) \n        VALUES (\n            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, now(), $19\n        )\n        ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -50,13 +50,10 @@
         "Jsonb",
         "Varchar",
         "Varchar",
-        "Bool",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Bool"
       ]
     },
     "nullable": []
   },
-  "hash": "aaa8dde748e5bcd462122d3235e54c784399b2cac7b27f0de33e78bd77661565"
+  "hash": "ed99d4d088d0fd0c01f29803b12e99ae0a53d0b1feaa67737da409c51c1b6751"
 }

backend/.sqlx/query-f82974abc7da71fac397f754fe3b3c9c84b6b438b2d9f8cbba61192e999971f4.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO mqtt_trigger (\n            mqtt_resource_path,\n            subscribe_topics,\n            client_version,\n            client_id,\n            v3_config,\n            v5_config,\n            workspace_id,\n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            edited_by,\n            error_handler_path,\n            error_handler_args,\n            retry\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4, \n            $5, \n            $6, \n            $7,\n            $8,\n            $9,\n            $10,\n            $11,\n            $12,\n            $13,\n            $14,\n            $15,\n            $16\n        )",
+  "query": "\n        INSERT INTO mqtt_trigger (\n            mqtt_resource_path,\n            subscribe_topics,\n            client_version,\n            client_id,\n            v3_config,\n            v5_config,\n            workspace_id,\n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            edited_by\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4, \n            $5, \n            $6, \n            $7,\n            $8,\n            $9,\n            $10,\n            $11,\n            $12,\n            $13\n        )",
   "describe": {
     "columns": [],
     "parameters": {
@@ -27,13 +27,10 @@
         "Bool",
         "Varchar",
         "Bool",
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Jsonb"
+        "Varchar"
       ]
     },
     "nullable": []
   },
-  "hash": "e9b4938b8c5fbd57845cf560fc2fd2d5749015c66d7de277081598ba3bb6dd8f"
+  "hash": "f82974abc7da71fac397f754fe3b3c9c84b6b438b2d9f8cbba61192e999971f4"
 }

backend/.sqlx/query-fcc11a9353ea101109aec30f8bdd4b2ce906fffc3c51e77d083121dbd68dadd4.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            workspace_id,\n            path,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled,\n            replication_slot_name,\n            publication_name,\n            postgres_resource_path,\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\",\n            retry as \"retry: _\"\n        FROM \n            postgres_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
+  "query": "\n        SELECT\n            workspace_id,\n            path,\n            script_path,\n            is_flow,\n            edited_by,\n            email,\n            edited_at,\n            server_id,\n            last_server_ping,\n            extra_perms,\n            error,\n            enabled,\n            replication_slot_name,\n            publication_name,\n            postgres_resource_path\n        FROM \n            postgres_trigger\n        WHERE \n            workspace_id = $1 AND \n            path = $2\n        ",
   "describe": {
     "columns": [
       {
@@ -77,21 +77,6 @@
         "ordinal": 14,
         "name": "postgres_resource_path",
         "type_info": "Varchar"
-      },
-      {
-        "ordinal": 15,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 17,
-        "name": "retry: _",
-        "type_info": "Jsonb"
       }
     ],
     "parameters": {
@@ -115,11 +100,8 @@
       false,
       false,
       false,
-      false,
-      true,
-      true,
-      true
+      false
     ]
   },
-  "hash": "3a6c93a91d9a21aaf9e9709932ac810221c5fc8fc29ca4f1984c819e64e29437"
+  "hash": "fcc11a9353ea101109aec30f8bdd4b2ce906fffc3c51e77d083121dbd68dadd4"
 }

backend/.sqlx/query-ff64f77d46fe8e1a07f26634df040ec5ced23cbb4390cd851c3bd7013dfd5758.json

@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM asset WHERE workspace_id = $1 AND usage_kind = 'flow' AND usage_path = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "ff64f77d46fe8e1a07f26634df040ec5ced23cbb4390cd851c3bd7013dfd5758"
-}

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.505.3"
+version = "1.502.2"
 authors.workspace = true
 edition.workspace = true
 
@@ -32,7 +32,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.505.3"
+version = "1.502.2"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
@@ -347,8 +347,6 @@ async-nats = "0.38.0"
 nkeys = "0.4.4"
 nu-parser = { version = "0.101.0", default-features = false }
 
-process-wrap = { version = "8.2.1", features = ["tokio1"] }
-
 datafusion = "47.0.0"
 object_store = { git = "https://github.com/apache/arrow-rs-object-store", rev = "36752c975d4f29e20b57c91f81a10872dcd48ae7", features = ["aws", "azure", "gcp"] } 
 openidconnect = { version = "4.0.0-rc.1" }
@@ -404,4 +402,3 @@ oracle = { version = "0.6.3", features = ["chrono"] }
 rumqttc = { version = "0.24.0", features = ["use-native-tls"]}
 strum = { version = "0.27", features = ["derive"] }
 strum_macros = "^0"
-

backend/ee-repo-ref.txt

@@ -1 +1 @@
-17b17f57e4c777e7e2ffc0e5def317f017a1683d
+21aabec96e91c8075dd637d1e32af90e495082fc

backend/migrations/20250625100238_assets.down.sql

@@ -1,4 +0,0 @@
-DROP TABLE asset;
-DROP TYPE ASSET_USAGE_KIND;
-DROP TYPE ASSET_ACCESS_TYPE;
-DROP TYPE ASSET_KIND;

backend/migrations/20250625100238_assets.up.sql

@@ -1,16 +0,0 @@
-CREATE TYPE ASSET_USAGE_KIND AS ENUM ('script', 'flow');
-CREATE TYPE ASSET_ACCESS_TYPE AS ENUM ('r', 'w', 'rw');
-CREATE TYPE ASSET_KIND AS ENUM ('s3object', 'resource', 'variable');
-
-CREATE TABLE asset (
-  workspace_id VARCHAR(50) NOT NULL REFERENCES workspace(id) ON DELETE CASCADE ON UPDATE CASCADE,
-  path VARCHAR(255) NOT NULL,
-  kind ASSET_KIND NOT NULL,
-  usage_access_type ASSET_ACCESS_TYPE,
-  usage_path VARCHAR(255) NOT NULL,
-  usage_kind ASSET_USAGE_KIND NOT NULL,
-  PRIMARY KEY (workspace_id, path, kind, usage_path, usage_kind)
-);
-
-CREATE INDEX idx_asset_usage ON asset (workspace_id, usage_path, usage_kind);
-CREATE INDEX idx_asset_kind_path ON asset (workspace_id, kind, path);

backend/migrations/20250707120256_trigger_retries_and_error_handling.down.sql

@@ -1,47 +0,0 @@
--- Remove error handler and retry fields from http_trigger
-ALTER TABLE http_trigger 
-    DROP COLUMN error_handler_path,
-    DROP COLUMN error_handler_args,
-    DROP COLUMN retry;
-
--- Remove error handler and retry fields from nats_trigger
-ALTER TABLE nats_trigger 
-    DROP COLUMN error_handler_path,
-    DROP COLUMN error_handler_args,
-    DROP COLUMN retry;
-
--- Remove error handler and retry fields from postgres_trigger
-ALTER TABLE postgres_trigger 
-    DROP COLUMN error_handler_path,
-    DROP COLUMN error_handler_args,
-    DROP COLUMN retry;
-
--- Remove error handler and retry fields from mqtt_trigger
-ALTER TABLE mqtt_trigger 
-    DROP COLUMN error_handler_path,
-    DROP COLUMN error_handler_args,
-    DROP COLUMN retry;
-
--- Remove error handler and retry fields from kafka_trigger
-ALTER TABLE kafka_trigger 
-    DROP COLUMN error_handler_path,
-    DROP COLUMN error_handler_args,
-    DROP COLUMN retry;
-
--- Remove error handler and retry fields from websocket_trigger
-ALTER TABLE websocket_trigger 
-    DROP COLUMN error_handler_path,
-    DROP COLUMN error_handler_args,
-    DROP COLUMN retry;
-
--- Remove error handler and retry fields from gcp_trigger
-ALTER TABLE gcp_trigger 
-    DROP COLUMN error_handler_path,
-    DROP COLUMN error_handler_args,
-    DROP COLUMN retry;
-
--- Remove error handler and retry fields from sqs_trigger
-ALTER TABLE sqs_trigger 
-    DROP COLUMN error_handler_path,
-    DROP COLUMN error_handler_args,
-    DROP COLUMN retry;

backend/migrations/20250707120256_trigger_retries_and_error_handling.up.sql

@@ -1,47 +0,0 @@
--- Add error handler and retry fields to http_trigger
-ALTER TABLE http_trigger 
-    ADD COLUMN error_handler_path VARCHAR(255) NULL,
-    ADD COLUMN error_handler_args JSONB NULL,
-    ADD COLUMN retry JSONB NULL;
-
--- Add error handler and retry fields to nats_trigger
-ALTER TABLE nats_trigger 
-    ADD COLUMN error_handler_path VARCHAR(255) NULL,
-    ADD COLUMN error_handler_args JSONB NULL,
-    ADD COLUMN retry JSONB NULL;
-
--- Add error handler and retry fields to postgres_trigger
-ALTER TABLE postgres_trigger 
-    ADD COLUMN error_handler_path VARCHAR(255) NULL,
-    ADD COLUMN error_handler_args JSONB NULL,
-    ADD COLUMN retry JSONB NULL;
-
--- Add error handler and retry fields to mqtt_trigger
-ALTER TABLE mqtt_trigger 
-    ADD COLUMN error_handler_path VARCHAR(255) NULL,
-    ADD COLUMN error_handler_args JSONB NULL,
-    ADD COLUMN retry JSONB NULL;
-
--- Add error handler and retry fields to kafka_trigger
-ALTER TABLE kafka_trigger 
-    ADD COLUMN error_handler_path VARCHAR(255) NULL,
-    ADD COLUMN error_handler_args JSONB NULL,
-    ADD COLUMN retry JSONB NULL;
-
--- Add error handler and retry fields to websocket_trigger
-ALTER TABLE websocket_trigger 
-    ADD COLUMN error_handler_path VARCHAR(255) NULL,
-    ADD COLUMN error_handler_args JSONB NULL,
-    ADD COLUMN retry JSONB NULL;
-
--- Add error handler and retry fields to gcp_trigger
-ALTER TABLE gcp_trigger 
-    ADD COLUMN error_handler_path VARCHAR(255) NULL,
-    ADD COLUMN error_handler_args JSONB NULL,
-    ADD COLUMN retry JSONB NULL;
-
--- Add error handler and retry fields to sqs_trigger
-ALTER TABLE sqs_trigger 
-    ADD COLUMN error_handler_path VARCHAR(255) NULL,
-    ADD COLUMN error_handler_args JSONB NULL,
-    ADD COLUMN retry JSONB NULL;

backend/migrations/20250714110352_add_grant_to_asset_table.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20250714110352_add_grant_to_asset_table.up.sql

@@ -1,3 +0,0 @@
--- Add up migration script here
-GRANT ALL ON asset TO windmill_admin;
-GRANT ALL ON asset TO windmill_user;

backend/parsers/windmill-parser-py/Cargo.toml

@@ -13,5 +13,4 @@ windmill-parser.workspace = true
 rustpython-parser.workspace = true
 itertools.workspace = true
 serde_json.workspace = true
-anyhow.workspace = true
-rustpython-ast = { version = "0.4.0", features = ["visitor"] }
+anyhow.workspace = true

backend/parsers/windmill-parser-py/src/asset_parser.rs

@@ -1,98 +0,0 @@
-use rustpython_ast::{Constant, Expr, ExprConstant, Visitor};
-use rustpython_parser::{ast::Suite, Parse};
-use windmill_parser::asset_parser::{
-    merge_assets, parse_asset_syntax, AssetKind, AssetUsageAccessType, ParseAssetsResult,
-};
-use AssetUsageAccessType::*;
-
-pub fn parse_assets(input: &str) -> anyhow::Result<Vec<ParseAssetsResult<String>>> {
-    let ast = Suite::parse(input, "main.py")
-        .map_err(|e| anyhow::anyhow!("Error parsing code: {}", e.to_string()))?;
-
-    let mut assets_finder = AssetsFinder { assets: vec![] };
-    ast.into_iter()
-        .for_each(|stmt| assets_finder.visit_stmt(stmt));
-    Ok(merge_assets(assets_finder.assets))
-}
-
-struct AssetsFinder {
-    assets: Vec<ParseAssetsResult<String>>,
-}
-impl Visitor for AssetsFinder {
-    // visit_call_expr will not recurse if it detects an asset,
-    // so this will only be called when no further context was found
-    fn visit_expr_constant(&mut self, node: ExprConstant) {
-        match node.value {
-            Constant::Str(s) => {
-                if let Some((kind, path)) = parse_asset_syntax(&s) {
-                    self.assets.push(ParseAssetsResult {
-                        kind,
-                        path: path.to_string(),
-                        access_type: None,
-                    });
-                }
-            }
-            _ => self.generic_visit_expr_constant(node),
-        }
-    }
-
-    fn visit_expr_call(&mut self, node: rustpython_ast::ExprCall) {
-        match self.visit_expr_call_inner(&node) {
-            Ok(_) => {}
-            Err(_) => self.generic_visit_expr_call(node),
-        }
-    }
-}
-
-impl AssetsFinder {
-    fn visit_expr_call_inner(&mut self, node: &rustpython_ast::ExprCall) -> Result<(), ()> {
-        let ident: String = node
-            .func
-            .as_name_expr()
-            .and_then(|o| o.id.parse().ok())
-            .or_else(|| {
-                node.func
-                    .as_attribute_expr()
-                    .and_then(|attr| attr.attr.parse().ok())
-            })
-            .ok_or(())?;
-
-        let (kind, access_type, arg) = match ident.as_str() {
-            "load_s3_file" => (AssetKind::S3Object, Some(R), Arg::Pos(0)),
-            "load_s3_file_reader" => (AssetKind::S3Object, Some(R), Arg::Pos(0)),
-            "write_s3_file" => (AssetKind::S3Object, Some(W), Arg::Pos(0)),
-            "get_resource" => (AssetKind::Resource, None, Arg::Pos(0)),
-            "set_resource" => (AssetKind::Resource, Some(W), Arg::Named("path")),
-            "get_boto3_connection_settings" => (AssetKind::Resource, None, Arg::Pos(0)),
-            "get_polars_connection_settings" => (AssetKind::Resource, None, Arg::Pos(0)),
-            "get_duckdb_connection_settings" => (AssetKind::Resource, None, Arg::Pos(0)),
-            "get_variable" => (AssetKind::Variable, Some(R), Arg::Pos(0)),
-            "set_variable" => (AssetKind::Variable, Some(W), Arg::Pos(0)),
-            _ => return Err(()),
-        };
-
-        let arg_val = match arg {
-            Arg::Pos(i) => node.args.get(i),
-            Arg::Named(name) => node
-                .keywords
-                .iter()
-                .find(|kw| kw.arg.as_deref() == Some(name))
-                .map(|kw| &kw.value),
-        };
-
-        match arg_val {
-            Some(Expr::Constant(ExprConstant { value: Constant::Str(value), .. })) => {
-                let path = parse_asset_syntax(&value).map(|(_, p)| p).unwrap_or(&value);
-                self.assets
-                    .push(ParseAssetsResult { kind, path: path.to_string(), access_type });
-            }
-            _ => return Err(()),
-        };
-        Ok(())
-    }
-}
-
-enum Arg {
-    Pos(usize),
-    Named(&'static str),
-}

backend/parsers/windmill-parser-py/src/lib.rs

@@ -20,9 +20,6 @@ use rustpython_parser::{
     Parse,
 };
 
-pub mod asset_parser;
-pub use asset_parser::parse_assets;
-
 const FUNCTION_CALL: &str = "<function call>";
 
 fn filter_non_main(code: &str, main_name: &str) -> String {

backend/parsers/windmill-parser-sql/Cargo.toml

@@ -19,5 +19,3 @@ windmill-parser.workspace = true
 anyhow.workspace = true
 lazy_static.workspace = true
 serde_json.workspace = true
-serde.workspace = true
-nom = "8.0.0"

backend/parsers/windmill-parser-sql/src/asset_parser.rs

@@ -1,121 +0,0 @@
-use windmill_parser::asset_parser::{
-    merge_assets, AssetKind, AssetUsageAccessType, ParseAssetsResult,
-};
-use AssetUsageAccessType::*;
-
-use nom::{
-    branch::alt,
-    bytes::complete::{tag, tag_no_case, take_while},
-    character::complete::{char, multispace0},
-    IResult, Parser,
-};
-
-pub fn parse_assets<'a>(input: &str) -> anyhow::Result<Vec<ParseAssetsResult<&str>>> {
-    let mut assets = Vec::new();
-    let mut remaining = input;
-
-    while !remaining.trim().is_empty() {
-        if let Ok((rest, _)) = parse_comment(remaining) {
-            remaining = rest; // skip comment
-        }
-        if let Ok((rest, res)) = parse_asset(remaining) {
-            assets.push(res);
-            remaining = rest;
-        } else {
-            remaining = &remaining[1..]; // skip 1 char and continue
-        }
-    }
-
-    Ok(merge_assets(assets))
-}
-
-fn parse_asset(input: &str) -> IResult<&str, ParseAssetsResult<&str>> {
-    alt((
-        parse_s3_object_read.map(|path| ParseAssetsResult {
-            path,
-            kind: AssetKind::S3Object,
-            access_type: Some(R),
-        }),
-        parse_s3_object_write.map(|path| ParseAssetsResult {
-            path,
-            kind: AssetKind::S3Object,
-            access_type: Some(W),
-        }),
-        // Parse ambiguous access_types at the end if we could not find precisely read or copy
-        parse_s3_object_lit.map(|path| ParseAssetsResult {
-            path,
-            kind: AssetKind::S3Object,
-            access_type: None,
-        }),
-        parse_resource_lit.map(|path| ParseAssetsResult {
-            path,
-            kind: AssetKind::Resource,
-            access_type: None,
-        }),
-    ))
-    .parse(input)
-}
-
-/// Any expression that reads an s3 asset
-fn parse_s3_object_read(input: &str) -> IResult<&str, &str> {
-    alt((parse_s3_object_read_fn, parse_s3_object_select_from)).parse(input)
-}
-
-/// Any expression that writes to an s3 asset
-fn parse_s3_object_write(input: &str) -> IResult<&str, &str> {
-    // COPY (...) TO 's3://...'
-    let (input, _) = (tag_no_case("TO"), multispace0).parse(input)?;
-    let (input, path) = parse_s3_object_lit(input)?;
-    Ok((input, path))
-}
-
-/// read_parquet('s3://...')
-fn parse_s3_object_read_fn(input: &str) -> IResult<&str, &str> {
-    let (input, _) = alt((
-        tag_no_case("read_parquet"),
-        tag_no_case("read_csv"),
-        tag_no_case("read_json"),
-    ))
-    .parse(input)?;
-    let (input, _) = multispace0(input)?;
-    let (input, _) = char('(')(input)?;
-    let (input, _) = multispace0(input)?;
-    let (input, path) = parse_s3_object_lit(input)?;
-    let (input, _) = multispace0(input)?;
-    let (input, _) = char(')')(input)?;
-    Ok((input, path))
-}
-
-/// SELECT ... FROM 's3://...'
-fn parse_s3_object_select_from(input: &str) -> IResult<&str, &str> {
-    let (input, _) = tag_no_case("FROM").parse(input)?;
-    let (input, _) = multispace0(input)?;
-    let (input, path) = parse_s3_object_lit(input)?;
-    Ok((input, path))
-}
-/// 's3://...'
-fn parse_s3_object_lit(input: &str) -> IResult<&str, &str> {
-    let (input, _) = quote(input)?;
-    let (input, _) = tag("s3://").parse(input)?;
-    let (input, path) = take_while(|c| c != '\'' && c != '"')(input)?;
-    let (input, _) = quote(input)?;
-    Ok((input, path))
-}
-
-fn quote(input: &str) -> IResult<&str, char> {
-    alt((char('\''), char('\"'))).parse(input)
-}
-
-fn parse_resource_lit(input: &str) -> IResult<&str, &str> {
-    let (input, _) = quote(input)?;
-    let (input, _) = alt((tag("$res:"), tag("res://"))).parse(input)?;
-    let (input, path) = take_while(|c| c != '\'' && c != '"')(input)?;
-    let (input, _) = quote(input)?;
-    Ok((input, path))
-}
-
-fn parse_comment(input: &str) -> IResult<&str, &str> {
-    let (input, _) = tag("--").parse(input)?;
-    let (input, comment) = take_while(|c| c != '\n')(input)?;
-    Ok((input, comment))
-}

backend/parsers/windmill-parser-sql/src/lib.rs

@@ -19,9 +19,6 @@ pub use windmill_parser::{Arg, MainArgSignature, Typ};
 pub const SANITIZED_ENUM_STR: &str = "__sanitized_enum__";
 pub const SANITIZED_RAW_STRING_STR: &str = "__sanitized_raw_string__";
 
-mod asset_parser;
-pub use asset_parser::parse_assets;
-
 pub fn parse_mysql_sig(code: &str) -> anyhow::Result<MainArgSignature> {
     let parsed = parse_mysql_file(&code)?;
     if let Some(x) = parsed {

backend/parsers/windmill-parser-ts/src/asset_parser.rs

@@ -1,104 +0,0 @@
-use swc_common::{sync::Lrc, FileName, SourceMap};
-use swc_ecma_ast::{CallExpr, Expr, Lit, MemberExpr, MemberProp, Str};
-use swc_ecma_parser::{lexer::Lexer, Parser, StringInput, Syntax, TsSyntax};
-use swc_ecma_visit::{Visit, VisitWith};
-use windmill_parser::asset_parser::{
-    merge_assets, parse_asset_syntax, AssetKind, AssetUsageAccessType, ParseAssetsResult,
-};
-use AssetUsageAccessType::*;
-
-pub fn parse_assets(code: &str) -> anyhow::Result<Vec<ParseAssetsResult<String>>> {
-    let cm: Lrc<SourceMap> = Default::default();
-    let fm = cm.new_source_file(FileName::Custom("main.ts".into()).into(), code.into());
-    let lexer = Lexer::new(
-        // We want to parse ecmascript
-        Syntax::Typescript(TsSyntax::default()),
-        // EsVersion defaults to es5
-        Default::default(),
-        StringInput::from(&*fm),
-        None,
-    );
-
-    let mut parser = Parser::new_from(lexer);
-
-    let mut err_s = "".to_string();
-    for e in parser.take_errors() {
-        err_s += &e.into_kind().msg().to_string();
-    }
-
-    let ast = parser
-        .parse_module()
-        .map_err(|e| {
-            anyhow::anyhow!("Error while parsing code, it is invalid TypeScript: {err_s}, {e:?}")
-        })?
-        .body;
-    let mut assets_finder = AssetsFinder { assets: vec![] };
-    assets_finder.visit_module_items(&ast);
-    Ok(merge_assets(assets_finder.assets))
-}
-
-struct AssetsFinder {
-    assets: Vec<ParseAssetsResult<String>>,
-}
-
-impl Visit for AssetsFinder {
-    // visit_call_expr will not recurse if it detects an asset,
-    // so this will only be called when no further context was found
-    fn visit_lit(&mut self, node: &swc_ecma_ast::Lit) {
-        match node {
-            swc_ecma_ast::Lit::Str(str) => {
-                if let Some((kind, path)) = parse_asset_syntax(str.value.as_str()) {
-                    self.assets.push(ParseAssetsResult {
-                        kind,
-                        path: path.to_string(),
-                        access_type: None,
-                    });
-                }
-            }
-            _ => <Lit as VisitWith<Self>>::visit_children_with(node, self),
-        }
-    }
-
-    fn visit_call_expr(&mut self, node: &swc_ecma_ast::CallExpr) {
-        match self.visit_call_expr_inner(node) {
-            Ok(_) => {}
-            Err(_) => <CallExpr as VisitWith<Self>>::visit_children_with(node, self),
-        }
-    }
-}
-
-impl AssetsFinder {
-    fn visit_call_expr_inner(&mut self, node: &swc_ecma_ast::CallExpr) -> Result<(), ()> {
-        let ident = match node.callee.as_expr().map(AsRef::as_ref) {
-            Some(Expr::Ident(i)) => i.sym.as_str(),
-            Some(Expr::Member(MemberExpr { prop: MemberProp::Ident(i), .. })) => i.sym.as_str(),
-            _ => return Err(()),
-        };
-        let (kind, access_type, arg_pos) = match ident {
-            "loadS3File" => (AssetKind::S3Object, Some(R), 0),
-            "loadS3FileStream" => (AssetKind::S3Object, Some(R), 0),
-            "writeS3File" => (AssetKind::S3Object, Some(W), 0),
-            "getResource" => (AssetKind::Resource, None, 0),
-            "setResource" => (AssetKind::Resource, Some(W), 1),
-            "databaseUrlFromResource" => (AssetKind::Resource, None, 0),
-            "denoS3LightClientSettings" => (AssetKind::Resource, None, 0),
-            "duckdbConnectionSettings" => (AssetKind::Resource, None, 0),
-            "polarsConnectionSettings" => (AssetKind::Resource, None, 0),
-            "getVariable" => (AssetKind::Variable, Some(R), 0),
-            "setVariable" => (AssetKind::Variable, Some(W), 0),
-            _ => return Err(()),
-        };
-
-        let arg_value = node.args.get(arg_pos);
-
-        match arg_value.map(|e| e.expr.as_ref()) {
-            Some(Expr::Lit(Lit::Str(Str { value, .. }))) => {
-                let path = parse_asset_syntax(&value).map(|(_, p)| p).unwrap_or(&value);
-                self.assets
-                    .push(ParseAssetsResult { kind, path: path.to_string(), access_type });
-            }
-            _ => return Err(()),
-        }
-        Ok(())
-    }
-}

backend/parsers/windmill-parser-ts/src/lib.rs

@@ -159,9 +159,6 @@ pub fn parse_expr_for_ids(code: &str) -> anyhow::Result<Vec<(String, String)>> {
     Ok(visitor.idents.into_iter().collect())
 }
 
-pub mod asset_parser;
-pub use asset_parser::parse_assets;
-
 /// skip_params is a micro optimization for when we just want to find the main
 /// function without parsing all the params.
 pub fn parse_deno_signature(

backend/parsers/windmill-parser-wasm/package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "windmill-parser-wasm",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

backend/parsers/windmill-parser-wasm/package.json

@@ -0,0 +1 @@
+{}

backend/parsers/windmill-parser-wasm/src/lib.rs

@@ -168,34 +168,4 @@ pub fn parse_java(code: &str) -> String {
     wrap_sig(windmill_parser_java::parse_java_signature(code))
 }
 
-#[cfg(feature = "sql-parser")]
-#[wasm_bindgen]
-pub fn parse_assets_sql(code: &str) -> String {
-    if let Ok(r) = windmill_parser_sql::parse_assets(code) {
-        return serde_json::to_string(&r).unwrap();
-    } else {
-        return "Invalid".to_string();
-    }
-}
-
-#[cfg(feature = "ts-parser")]
-#[wasm_bindgen]
-pub fn parse_assets_ts(code: &str) -> String {
-    if let Ok(r) = windmill_parser_ts::parse_assets(code) {
-        return serde_json::to_string(&r).unwrap();
-    } else {
-        return "Invalid".to_string();
-    }
-}
-
-#[cfg(feature = "py-parser")]
-#[wasm_bindgen]
-pub fn parse_assets_py(code: &str) -> String {
-    if let Ok(r) = windmill_parser_py::parse_assets(code) {
-        return serde_json::to_string(&r).unwrap();
-    } else {
-        return "Invalid".to_string();
-    }
-}
-
 // for related places search: ADD_NEW_LANG

backend/parsers/windmill-parser/src/asset_parser.rs

@@ -1,65 +0,0 @@
-use serde::Serialize;
-
-#[derive(Serialize, PartialEq, Clone, Copy)]
-#[serde(rename_all(serialize = "lowercase"))]
-pub enum AssetUsageAccessType {
-    R,
-    W,
-    RW,
-}
-
-use AssetUsageAccessType::*;
-
-#[derive(Serialize, PartialEq, Clone, Copy)]
-#[serde(rename_all(serialize = "lowercase"))]
-pub enum AssetKind {
-    S3Object,
-    Resource,
-    Variable,
-}
-
-#[derive(Serialize)]
-pub struct ParseAssetsResult<S: AsRef<str>> {
-    pub kind: AssetKind,
-    pub path: S,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub access_type: Option<AssetUsageAccessType>, // None in case of ambiguity
-}
-
-pub fn merge_assets<S: AsRef<str>>(assets: Vec<ParseAssetsResult<S>>) -> Vec<ParseAssetsResult<S>> {
-    let mut arr: Vec<ParseAssetsResult<S>> = vec![];
-    for asset in assets {
-        // Remove duplicates
-        if let Some(existing) = arr
-            .iter_mut()
-            .find(|x| x.path.as_ref() == asset.path.as_ref() && x.kind == asset.kind)
-        {
-            // merge access types
-            existing.access_type = match (asset.access_type, existing.access_type) {
-                (None, _) | (_, None) => None,
-                (Some(R), Some(W)) | (Some(W), Some(R)) => Some(RW),
-                (Some(RW), _) | (_, Some(RW)) => Some(RW),
-                (Some(R), Some(R)) => Some(R),
-                (Some(W), Some(W)) => Some(W),
-            };
-        } else {
-            arr.push(asset);
-        }
-    }
-    arr.sort_by(|a, b| a.path.as_ref().cmp(b.path.as_ref()));
-    arr
-}
-
-pub fn parse_asset_syntax(s: &str) -> Option<(AssetKind, &str)> {
-    if s.starts_with("s3://") {
-        Some((AssetKind::S3Object, &s[5..]))
-    } else if s.starts_with("res://") {
-        Some((AssetKind::Resource, &s[6..]))
-    } else if s.starts_with("$res:") {
-        Some((AssetKind::Resource, &s[5..]))
-    } else if s.starts_with("var://") {
-        Some((AssetKind::Variable, &s[6..]))
-    } else {
-        None
-    }
-}

backend/parsers/windmill-parser/src/lib.rs

@@ -10,8 +10,6 @@ use convert_case::{Boundary, Case, Casing};
 use serde::Serialize;
 use serde_json::Value;
 
-pub mod asset_parser;
-
 #[derive(Serialize, Debug, PartialEq, Default)]
 pub struct MainArgSignature {
     pub star_args: bool,

backend/src/main.rs

@@ -54,7 +54,8 @@ use windmill_common::{
     stats_oss::schedule_stats,
     triggers::TriggerKind,
     utils::{
-        create_default_worker_suffix, create_ssh_agent_worker_suffix, worker_name_with_suffix,
+        create_worker_suffix,
+        worker_name_with_suffix,
         Mode, GIT_VERSION, HOSTNAME, MODE_AND_ADDONS,
     },
     worker::{
@@ -63,9 +64,6 @@ use windmill_common::{
     KillpillSender, METRICS_ENABLED,
 };
 
-#[cfg(feature = "enterprise")]
-use windmill_common::worker::CLOUD_HOSTED;
-
 #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
 use monitor::monitor_mem;
 
@@ -271,21 +269,6 @@ async fn windmill_main() -> anyhow::Result<()> {
         tracing::error!("Failed to install rustls crypto provider");
     }
 
-    #[cfg(feature = "enterprise")]
-    if *CLOUD_HOSTED {
-        // Block access to AWS/GCP metadata endpoints for security in cloud-hosted mode.
-        // This is a best-effort attempt; if it fails, just warn and continue.
-        if let Err(e) = std::process::Command::new("sh")
-            .arg("-c")
-            .arg("iptables -A OUTPUT -d 169.254.169.254 -j DROP && iptables -A FORWARD -d 169.254.169.254 -j DROP")
-            .status()
-        {
-            tracing::warn!("Failed to run iptables to block metadata endpoint: {e}");
-        } else {
-            tracing::info!("Successfully blocked metadata endpoint using iptables");
-        }
-    }
-
     let hostname = HOSTNAME.to_owned();
 
     let mode_and_addons = MODE_AND_ADDONS.clone();
@@ -365,7 +348,7 @@ async fn windmill_main() -> anyhow::Result<()> {
             "Creating http client for cluster using base internal url {}",
             std::env::var("BASE_INTERNAL_URL").unwrap_or_default()
         );
-        let suffix = create_ssh_agent_worker_suffix(&hostname);
+        let suffix = create_worker_suffix(&hostname);
         (
             Connection::Http(build_agent_http_client(&suffix)),
             Some(suffix),
@@ -705,7 +688,7 @@ Windmill Community Edition {GIT_VERSION}
                         let suffix = if i == 0 && first_suffix.is_some() {
                             first_suffix.as_ref().unwrap().clone()
                         } else {
-                            create_default_worker_suffix(&hostname)
+                            create_worker_suffix(&hostname)
                         };
 
                         let worker_conn = WorkerConn {

backend/tests/worker.rs

@@ -1147,7 +1147,6 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
                         is_trigger: None,
-                        asset_fallback_access_types: None,
                     }
                     .into(),
                     stop_after_if: Default::default(),
@@ -1163,7 +1162,6 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                     delete_after_use: None,
                     continue_on_error: None,
                     skip_if: None,
-                    apply_preprocessor: None,
                 },
                 FlowModule {
                     id: "b".to_string(),
@@ -1191,7 +1189,6 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                                 concurrent_limit: None,
                                 concurrency_time_window_s: None,
                                 is_trigger: None,
-                                asset_fallback_access_types: None,
                             }
                             .into(),
                             stop_after_if: Default::default(),
@@ -1207,7 +1204,6 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                             delete_after_use: None,
                             continue_on_error: None,
                             skip_if: None,
-                            apply_preprocessor: None,
                         }],
                         modules_node: None,
                     }
@@ -1225,7 +1221,6 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                     delete_after_use: None,
                     continue_on_error: None,
                     skip_if: None,
-                    apply_preprocessor: None,
                 },
             ],
             same_worker: false,
@@ -1321,7 +1316,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
                         is_trigger: None,
-                        asset_fallback_access_types: None,
 
                     }.into(),
                     stop_after_if: Default::default(),
@@ -1337,7 +1331,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                     delete_after_use: None,
                     continue_on_error: None,
                     skip_if: None,
-                    apply_preprocessor: None,
                 },
                 FlowModule {
                     id: "b".to_string(),
@@ -1376,7 +1369,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                     concurrent_limit: None,
                                     concurrency_time_window_s: None,
                                     is_trigger: None,
-                                    asset_fallback_access_types: None,
                                 }.into(),
                                 stop_after_if: Default::default(),
                                 stop_after_all_iters_if: Default::default(),
@@ -1391,7 +1383,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                 delete_after_use: None,
                                 continue_on_error: None,
                                 skip_if: None,
-                                apply_preprocessor: None,
                             },
                             FlowModule {
                                 id: "e".to_string(),
@@ -1416,7 +1407,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                     concurrent_limit: None,
                                     concurrency_time_window_s: None,
                                     is_trigger: None,
-                                    asset_fallback_access_types: None,
 
                                 }.into(),
                                 stop_after_if: Default::default(),
@@ -1432,7 +1422,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                 delete_after_use: None,
                                 continue_on_error: None,
                                 skip_if: None,
-                                apply_preprocessor: None,
                             },
                         ],
                         modules_node: None,
@@ -1450,7 +1439,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                     delete_after_use: None,
                     continue_on_error: None,
                     skip_if: None,
-                    apply_preprocessor: None,
                 },
                 FlowModule {
                     id: "c".to_string(),
@@ -1482,7 +1470,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
                         is_trigger: None,
-                        asset_fallback_access_types: None,
                     }.into(),
                     stop_after_if: Default::default(),
                     stop_after_all_iters_if: Default::default(),
@@ -1497,7 +1484,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                     delete_after_use: None,
                     continue_on_error: None,
                     skip_if: None,
-                    apply_preprocessor: None,
                 },
             ],
             same_worker: true,

backend/windmill-api/Cargo.toml

@@ -40,7 +40,7 @@ mcp = ["dep:rmcp"]
 python = []
 
 [dependencies]
-rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", rev = "c74b26b3e3c5dfd0be8e85dede8d88f33d46ff06", features=["transport-streamable-http-server", "transport-streamable-http-server-session", "transport-worker"], optional = true }
+rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", features=["transport-streamable-http-server", "transport-streamable-http-server-session", "transport-worker"], optional = true }
 windmill-queue.workspace = true
 windmill-common = { workspace = true, default-features = false }
 windmill-audit.workspace = true

backend/windmill-api/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.505.3
+  version: 1.502.2
   title: Windmill API
 
   contact:
@@ -3099,24 +3099,6 @@ paths:
                 type: array
                 items:
                   $ref: "#/components/schemas/ContextualVariable"
-  
-  /w/{workspace}/workspaces/get_secondary_storage_names:
-    get:
-      summary: get secondary storage names
-      operationId: getSecondaryStorageNames
-      tags:
-        - setting
-      parameters:
-        - $ref: "#/components/parameters/WorkspaceId"
-      responses:
-        "200":
-          description: status
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  type: string
 
   /w/{workspace}/workspaces/critical_alerts:
     get:
@@ -4971,8 +4953,7 @@ paths:
 
   /scripts_u/tokened_raw/{workspace}/{token}/{path}:
     get:
-      summary:
-        raw script by path with a token (mostly used by lsp to be used with
+      summary: raw script by path with a token (mostly used by lsp to be used with
         import maps to resolve scripts)
       operationId: rawScriptByPathTokened
       tags:
@@ -6773,8 +6754,7 @@ paths:
           schema:
             type: string
         - name: branch_or_iteration_n
-          description:
-            for branchall or loop, the iteration at which the flow should
+          description: for branchall or loop, the iteration at which the flow should
             restart
           required: true
           in: path
@@ -8492,7 +8472,7 @@ paths:
             text/plain:
               schema:
                 type: string
-
+    
   /w/{workspace}/openapi/download:
     post:
       summary: Download the OpenAPI v3.1 spec as a file
@@ -9847,6 +9827,7 @@ paths:
               schema:
                 type: string
 
+
   /w/{workspace}/gcp_triggers/subscriptions/delete/{path}:
     delete:
       summary: delete gcp trigger
@@ -9932,7 +9913,7 @@ paths:
             application/json:
               schema:
                 type: string
-
+  
   /w/{workspace}/postgres_triggers/is_valid_postgres_configuration/{path}:
     get:
       summary: check if postgres configuration is set to logical
@@ -11384,7 +11365,7 @@ paths:
                 postgres_trigger,
                 mqtt_trigger,
                 gcp_trigger,
-                sqs_trigger,
+                sqs_trigger
               ]
       responses:
         "200":
@@ -11428,7 +11409,7 @@ paths:
                 postgres_trigger,
                 mqtt_trigger,
                 gcp_trigger,
-                sqs_trigger,
+                sqs_trigger
               ]
       requestBody:
         description: acl to add
@@ -11483,7 +11464,7 @@ paths:
                 postgres_trigger,
                 mqtt_trigger,
                 gcp_trigger,
-                sqs_trigger,
+                sqs_trigger
               ]
       requestBody:
         description: acl to add
@@ -11862,8 +11843,7 @@ paths:
 
   /w/{workspace}/job_helpers/duckdb_connection_settings:
     post:
-      summary:
-        Converts an S3 resource to the set of instructions necessary to connect
+      summary: Converts an S3 resource to the set of instructions necessary to connect
         DuckDB to an S3 bucket
       operationId: duckdbConnectionSettings
       tags:
@@ -11892,8 +11872,7 @@ paths:
                     type: string
   /w/{workspace}/job_helpers/v2/duckdb_connection_settings:
     post:
-      summary:
-        Converts an S3 resource to the set of instructions necessary to connect
+      summary: Converts an S3 resource to the set of instructions necessary to connect
         DuckDB to an S3 bucket
       operationId: duckdbConnectionSettingsV2
       tags:
@@ -11929,8 +11908,7 @@ paths:
 
   /w/{workspace}/job_helpers/polars_connection_settings:
     post:
-      summary:
-        Converts an S3 resource to the set of arguments necessary to connect
+      summary: Converts an S3 resource to the set of arguments necessary to connect
         Polars to an S3 bucket
       operationId: polarsConnectionSettings
       tags:
@@ -11974,8 +11952,7 @@ paths:
                   - client_kwargs
   /w/{workspace}/job_helpers/v2/polars_connection_settings:
     post:
-      summary:
-        Converts an S3 resource to the set of arguments necessary to connect
+      summary: Converts an S3 resource to the set of arguments necessary to connect
         Polars to an S3 bucket
       operationId: polarsConnectionSettingsV2
       tags:
@@ -12052,8 +12029,7 @@ paths:
       parameters:
         - $ref: "#/components/parameters/WorkspaceId"
       requestBody:
-        description:
-          S3 resource path to use. If empty, the S3 resource defined in the
+        description: S3 resource path to use. If empty, the S3 resource defined in the
           workspace settings will be used
         required: true
         content:
@@ -12966,94 +12942,6 @@ paths:
               schema:
                 type: string
 
-  /w/{workspace}/assets/list:
-    get:
-      summary: List all assets in the workspace
-      operationId: listAssets
-      tags:
-        - asset
-      parameters:
-        - $ref: "#/components/parameters/WorkspaceId"
-      responses:
-        "200":
-          description: all assets in the workspace
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  type: object
-                  required: [path, kind, usages]
-                  properties:
-                    path:
-                      type: string
-                    kind:
-                      $ref: "#/components/schemas/AssetKind"
-                    usages:
-                      type: array
-                      items:
-                        type: object
-                        required: [path, kind]
-                        properties:
-                          path:
-                            type: string
-                          kind:
-                            $ref: "#/components/schemas/AssetUsageKind"
-                          access_type:
-                            $ref: "#/components/schemas/AssetUsageAccessType"
-                    metadata:
-                      type: object
-                      properties:
-                        resource_type:
-                          type: string
-
-  /w/{workspace}/assets/list_by_usages:
-    post:
-      summary: List all assets used by given usages paths
-      operationId: listAssetsByUsage
-      tags:
-        - asset
-      parameters:
-        - $ref: "#/components/parameters/WorkspaceId"
-      requestBody:
-        description: list assets by usages
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required: [usages]
-              properties:
-                usages:
-                  type: array
-                  items:
-                    type: object
-                    required: [path, kind]
-                    properties:
-                      path:
-                        type: string
-                      kind:
-                        $ref: "#/components/schemas/AssetUsageKind"
-      responses:
-        "200":
-          description: all assets used by the given usage paths, in the same order
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  type: array
-                  items:
-                    type: object
-                    required: [path, kind]
-                    properties:
-                      path:
-                        type: string
-                      kind:
-                        $ref: "#/components/schemas/AssetKind"
-                      access_type:
-                        $ref: "#/components/schemas/AssetUsageAccessType"
-
 components:
   securitySchemes:
     bearerAuth:
@@ -13200,8 +13088,7 @@ components:
         type: string
     ParentJob:
       name: parent_job
-      description:
-        The parent job that is at the origin and responsible for the execution
+      description: The parent job that is at the origin and responsible for the execution
         of this script if any
       in: query
       schema:
@@ -13221,8 +13108,7 @@ components:
         type: string
     NewJobId:
       name: job_id
-      description:
-        The job id to assign to the created job. if missing, job is chosen
+      description: The job id to assign to the created job. if missing, job is chosen
         randomly using the ULID scheme. If a job id already exists in the queue
         or as a completed job, the request to create one will fail (Bad Request)
       in: query
@@ -13313,8 +13199,7 @@ components:
         format: date-time
     CreatedOrStartedAfter:
       name: created_or_started_after
-      description:
-        filter on created_at for non non started job and started_at otherwise
+      description: filter on created_at for non non started job and started_at otherwise
         after (exclusive) timestamp
       in: query
       schema:
@@ -13322,8 +13207,7 @@ components:
         format: date-time
     CreatedOrStartedAfterCompletedJob:
       name: created_or_started_after_completed_jobs
-      description:
-        filter on created_at for non non started job and started_at otherwise
+      description: filter on created_at for non non started job and started_at otherwise
         after (exclusive) timestamp but only for the completed jobs
       in: query
       schema:
@@ -13331,8 +13215,7 @@ components:
         format: date-time
     CreatedOrStartedBefore:
       name: created_or_started_before
-      description:
-        filter on created_at for non non started job and started_at otherwise
+      description: filter on created_at for non non started job and started_at otherwise
         before (inclusive) timestamp
       in: query
       schema:
@@ -13420,8 +13303,7 @@ components:
         enum: [Create, Update, Delete, Execute]
     JobKinds:
       name: job_kinds
-      description:
-        filter on job kind (values 'preview', 'script', 'dependencies', 'flow')
+      description: filter on job kind (values 'preview', 'script', 'dependencies', 'flow')
         separated by,
       in: query
       schema:
@@ -13516,19 +13398,7 @@ components:
 
     AIProvider:
       type: string
-      enum:
-        [
-          openai,
-          azure_openai,
-          anthropic,
-          mistral,
-          deepseek,
-          googleai,
-          groq,
-          openrouter,
-          togetherai,
-          customai,
-        ]
+      enum: [openai, azure_openai, anthropic, mistral, deepseek, googleai, groq, openrouter, togetherai, customai]
 
     AIProviderModel:
       type: object
@@ -13595,7 +13465,7 @@ components:
         alerts:
           type: array
           items:
-            $ref: "#/components/schemas/Alert"
+            $ref: '#/components/schemas/Alert'
 
     Script:
       type: object
@@ -13769,21 +13639,6 @@ components:
           type: boolean
         on_behalf_of_email:
           type: string
-        fallback_access_types:
-          type: array
-          items:
-            type: object
-            required: [path, kind, access_type]
-            properties:
-              path:
-                type: string
-              kind:
-                type: string
-                enum: [s3object, resource]
-              access_type:
-                type: string
-                enum: [r, w, rw]
-
       required:
         - path
         - summary
@@ -13931,7 +13786,7 @@ components:
               "singlescriptflow",
               "flowscript",
               "flownode",
-              "appscript",
+              "appscript"
             ]
         schedule_path:
           type: string
@@ -14038,7 +13893,7 @@ components:
               "singlescriptflow",
               "flowscript",
               "flownode",
-              "appscript",
+              "appscript"
             ]
         schedule_path:
           type: string
@@ -14490,7 +14345,7 @@ components:
                         "bytes",
                         "dict",
                         "datetime",
-                        "sql",
+                        "sql"
                       ]
                   - type: object
                     properties:
@@ -14530,7 +14385,7 @@ components:
                                       "bytes",
                                       "dict",
                                       "datetime",
-                                      "sql",
+                                      "sql"
                                     ]
                                 - type: object
                                   properties:
@@ -14556,7 +14411,7 @@ components:
                                 "bytes",
                                 "dict",
                                 "datetime",
-                                "sql",
+                                "sql"
                               ]
                           - type: object
                             properties:
@@ -14609,7 +14464,7 @@ components:
           csharp,
           nu,
           java,
-          duckdb,
+          duckdb
           # for related places search: ADD_NEW_LANG
         ]
 
@@ -15084,7 +14939,7 @@ components:
         - user_or_folder_regex_value
         - path
         - runnable_kind
-
+    
     OpenapiV3Info:
       type: object
       properties:
@@ -15185,12 +15040,6 @@ components:
           type: boolean
         raw_string:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - route_path
@@ -15244,12 +15093,6 @@ components:
           type: boolean
         raw_string:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - path
@@ -15303,12 +15146,6 @@ components:
           type: boolean
         raw_string:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - path
         - script_path
@@ -15385,12 +15222,6 @@ components:
           $ref: "#/components/schemas/ScriptArgs"
         can_return_message:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - url
@@ -15430,12 +15261,6 @@ components:
           $ref: "#/components/schemas/ScriptArgs"
         can_return_message:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - path
@@ -15475,12 +15300,6 @@ components:
           $ref: "#/components/schemas/ScriptArgs"
         can_return_message:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - path
@@ -15530,7 +15349,7 @@ components:
       properties:
         clean_start:
           type: boolean
-        topic_alias_maximum:
+        topic_alias:
           type: number
         session_expiry_interval:
           type: number
@@ -15578,12 +15397,6 @@ components:
           type: string
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - enabled
@@ -15615,12 +15428,6 @@ components:
           type: boolean
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - path
         - script_path
@@ -15653,12 +15460,6 @@ components:
           type: boolean
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - path
         - script_path
@@ -15710,12 +15511,6 @@ components:
           type: string
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - gcp_resource_path
         - topic_id
@@ -15724,6 +15519,7 @@ components:
         - delivery_type
         - subscription_mode
 
+
     SubscriptionMode:
       type: string
       enum:
@@ -15731,6 +15527,7 @@ components:
         - create_update
       description: "The mode of subscription. 'existing' means using an existing GCP subscription, while 'create_update' involves creating or updating a new subscription."
 
+
     GcpTriggerData:
       type: object
       properties:
@@ -15756,12 +15553,6 @@ components:
           type: boolean
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - path
         - script_path
@@ -15778,6 +15569,7 @@ components:
       required:
         - topic_id
 
+
     DeleteGcpSubscription:
       type: object
       properties:
@@ -15816,12 +15608,6 @@ components:
           type: string
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - queue_url
@@ -15850,12 +15636,6 @@ components:
           type: boolean
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - queue_url
         - aws_resource_path
@@ -15885,12 +15665,6 @@ components:
           type: boolean
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - queue_url
         - aws_resource_path
@@ -15996,12 +15770,6 @@ components:
         last_server_ping:
           type: string
           format: date-time
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - enabled
         - postgres_resource_path
@@ -16027,12 +15795,6 @@ components:
           type: string
         publication:
           $ref: "#/components/schemas/PublicationData"
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - path
         - script_path
@@ -16059,12 +15821,6 @@ components:
           type: string
         publication:
           $ref: "#/components/schemas/PublicationData"
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
       required:
         - path
         - script_path
@@ -16096,12 +15852,6 @@ components:
           type: string
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - kafka_resource_path
@@ -16128,12 +15878,6 @@ components:
             type: string
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - path
@@ -16160,12 +15904,6 @@ components:
           type: string
         is_flow:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - path
@@ -16201,12 +15939,6 @@ components:
           type: string
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - nats_resource_path
@@ -16237,12 +15969,6 @@ components:
             type: string
         enabled:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - path
@@ -16273,12 +15999,6 @@ components:
           type: string
         is_flow:
           type: boolean
-        error_handler_path:
-          type: string
-        error_handler_args:
-          $ref: "#/components/schemas/ScriptArgs"
-        retry:
-          $ref: "../../openflow.openapi.yaml#/components/schemas/Retry"
 
       required:
         - path
@@ -16845,14 +16565,7 @@ components:
       properties:
         type:
           type: string
-          enum:
-            [
-              "S3Storage",
-              "AzureBlobStorage",
-              "AzureWorkloadIdentity",
-              "S3AwsOidc",
-              "GoogleCloudStorage",
-            ]
+          enum: ["S3Storage", "AzureBlobStorage", "AzureWorkloadIdentity", "S3AwsOidc", "GoogleCloudStorage"]
         s3_resource_path:
           type: string
         azure_blob_resource_path:
@@ -16869,13 +16582,7 @@ components:
               type:
                 type: string
                 enum:
-                  [
-                    "S3Storage",
-                    "AzureBlobStorage",
-                    "AzureWorkloadIdentity",
-                    "S3AwsOidc",
-                    "GoogleCloudStorage",
-                  ]
+                  ["S3Storage", "AzureBlobStorage", "AzureWorkloadIdentity", "S3AwsOidc", "GoogleCloudStorage"]
               s3_resource_path:
                 type: string
               azure_blob_resource_path:
@@ -17265,8 +16972,7 @@ components:
 
     CaptureTriggerKind:
       type: string
-      enum:
-        [webhook, http, websocket, kafka, email, nats, postgres, sqs, mqtt, gcp]
+      enum: [webhook, http, websocket, kafka, email, nats, postgres, sqs, mqtt, gcp]
 
     Capture:
       type: object
@@ -17307,7 +17013,6 @@ components:
         - runs
         - schedules
         - resources
-        - assets
         - variables
         - triggers
         - audit_logs
@@ -17327,9 +17032,6 @@ components:
         variables:
           type: boolean
           description: Whether operators can view variables
-        assets:
-          type: boolean
-          description: Whether operators can view assets
         audit_logs:
           type: boolean
           description: Whether operators can view audit logs
@@ -17468,28 +17170,3 @@ components:
           type: string
           description: Microsoft Teams channel name
           minLength: 1
-    AssetUsageKind:
-      type: string
-      enum:
-        - script
-        - flow
-    AssetUsageAccessType:
-      type: string
-      enum:
-        - r
-        - w
-        - rw
-    AssetKind:
-      type: string
-      enum:
-        - s3object
-        - resource
-        - variable
-    Asset:
-      type: object
-      properties:
-        path:
-          type: string
-        kind:
-          $ref: "#/components/schemas/AssetKind"
-      required: [path, kind]

backend/windmill-api/src/assets.rs

@@ -1,96 +0,0 @@
-use axum::{
-    extract::Path,
-    routing::{get, post},
-    Extension, Json, Router,
-};
-use serde::Deserialize;
-use serde_json::Value;
-use windmill_common::{assets::AssetUsageKind, db::UserDB, error::JsonResult};
-
-use crate::db::ApiAuthed;
-
-pub fn workspaced_service() -> Router {
-    Router::new()
-        .route("/list", get(list_assets))
-        .route("/list_by_usages", post(list_assets_by_usages))
-}
-
-async fn list_assets(
-    authed: ApiAuthed,
-    Path(w_id): Path<String>,
-    Extension(user_db): Extension<UserDB>,
-) -> JsonResult<Vec<Value>> {
-    let assets = sqlx::query_scalar!(
-        r#"SELECT
-            jsonb_strip_nulls(jsonb_build_object(
-                'path', asset.path,
-                'kind', asset.kind,
-                'usages', ARRAY_AGG(jsonb_build_object(
-                    'path', asset.usage_path,
-                    'kind', asset.usage_kind,
-                    'access_type', asset.usage_access_type
-                )),
-                'metadata', (CASE
-                  WHEN asset.kind = 'resource' THEN
-                    jsonb_build_object('resource_type', resource.resource_type)
-                  ELSE
-                    NULL
-                  END
-                )
-            )) as "list!: _"
-        FROM asset
-        LEFT JOIN resource ON asset.kind = 'resource' AND asset.path = resource.path AND resource.workspace_id = $1
-        WHERE asset.workspace_id = $1
-          AND (asset.kind <> 'resource' OR resource.path IS NOT NULL)
-          AND (asset.usage_kind <> 'flow' OR asset.usage_path = ANY(SELECT path FROM flow WHERE workspace_id = $1))
-          AND (asset.usage_kind <> 'script' OR asset.usage_path = ANY(SELECT path FROM script WHERE workspace_id = $1))
-          GROUP BY asset.path, asset.kind, resource.resource_type
-        ORDER BY asset.path, asset.kind"#,
-        w_id,
-    )
-    .fetch_all(&mut *user_db.begin(&authed).await?)
-    .await?;
-
-    Ok(Json(assets))
-}
-
-#[derive(Deserialize)]
-pub struct ListAssetsByUsagesBodyInner {
-    kind: AssetUsageKind,
-    path: String,
-}
-
-#[derive(Deserialize)]
-struct ListAssetsByUsagesBody {
-    usages: Vec<ListAssetsByUsagesBodyInner>,
-}
-
-async fn list_assets_by_usages(
-    authed: ApiAuthed,
-    Path(w_id): Path<String>,
-    Extension(user_db): Extension<UserDB>,
-    Json(body): Json<ListAssetsByUsagesBody>,
-) -> JsonResult<Vec<Vec<Value>>> {
-    let mut tx = user_db.begin(&authed).await?;
-    let mut assets_vec = vec![];
-    for usage in body.usages {
-        let assets = sqlx::query_scalar!(
-            r#"SELECT
-                jsonb_build_object(
-                    'path', path,
-                    'kind', kind,
-                    'access_type', usage_access_type
-                ) as "list!: _"
-            FROM asset
-            WHERE workspace_id = $1 AND usage_path = $2 AND usage_kind = $3
-            ORDER BY path, kind"#,
-            w_id,
-            usage.path,
-            usage.kind as AssetUsageKind
-        )
-        .fetch_all(&mut *tx)
-        .await?;
-        assets_vec.push(assets);
-    }
-    Ok(Json(assets_vec))
-}

backend/windmill-api/src/db.rs

@@ -815,7 +815,7 @@ async fn fix_job_completed_index(db: &DB) -> Result<(), Error> {
 
     run_windmill_migration!("audit_recent_login_activities", db, |tx| {
         sqlx::query!(
-            "CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_audit_recent_login_activities 
+            "CREATE INDEX CONCURRENTLY idx_audit_recent_login_activities 
 ON audit (timestamp, username) 
 WHERE operation IN ('users.login', 'oauth.login', 'users.token.refresh');"
         )

backend/windmill-api/src/flows.rs

@@ -1168,14 +1168,6 @@ async fn archive_flow_by_path(
     .execute(&mut *tx)
     .await?;
 
-    sqlx::query!(
-        "DELETE FROM asset WHERE workspace_id = $1 AND usage_kind = 'flow' AND usage_path = $2",
-        &w_id,
-        path
-    )
-    .execute(&mut *tx)
-    .await?;
-
     audit_log(
         &mut *tx,
         &authed,
@@ -1364,7 +1356,6 @@ mod tests {
                     delete_after_use: None,
                     continue_on_error: None,
                     skip_if: None,
-                    apply_preprocessor: None,
                 },
                 FlowModule {
                     id: "b".to_string(),
@@ -1379,7 +1370,6 @@ mod tests {
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
                         is_trigger: None,
-                        asset_fallback_access_types: None,
                     }),
                     stop_after_if: Some(StopAfterIf {
                         expr: "foo = 'bar'".to_string(),
@@ -1397,7 +1387,6 @@ mod tests {
                     delete_after_use: None,
                     continue_on_error: None,
                     skip_if: None,
-                    apply_preprocessor: None,
                 },
                 FlowModule {
                     id: "c".to_string(),
@@ -1427,7 +1416,6 @@ mod tests {
                     delete_after_use: None,
                     continue_on_error: None,
                     skip_if: None,
-                    apply_preprocessor: None,
                 },
             ],
             failure_module: Some(Box::new(FlowModule {
@@ -1456,7 +1444,6 @@ mod tests {
                 delete_after_use: None,
                 continue_on_error: None,
                 skip_if: None,
-                apply_preprocessor: None,
             })),
             preprocessor_module: None,
             same_worker: false,

backend/windmill-api/src/gcp_triggers_oss.rs

@@ -154,12 +154,6 @@ pub struct GcpTrigger {
     pub server_id: Option<String>,
     pub last_server_ping: Option<chrono::DateTime<chrono::Utc>>,
     pub enabled: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_args: Option<SqlxJson<HashMap<String, Box<RawValue>>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub retry: Option<SqlxJson<windmill_common::flows::Retry>>,
 }
 #[cfg(not(feature = "private"))]
 impl TriggerJobArgs<String> for GcpTrigger {

backend/windmill-api/src/http_triggers.rs

@@ -3,13 +3,15 @@ use crate::http_trigger_args::{HttpMethod, RawHttpTriggerArgs};
 #[cfg(feature = "parquet")]
 use crate::job_helpers_oss::get_workspace_s3_resource;
 use crate::resources::try_get_resource_from_db_as;
-use crate::trigger_helpers::{
-    get_runnable_format, trigger_runnable, trigger_runnable_and_wait_for_result, RunnableId,
-};
+use crate::trigger_helpers::{get_runnable_format, RunnableId};
 use crate::utils::{non_empty_str, ExpiringCacheEntry};
 use crate::{
     auth::{AuthCache, OptTokened},
     db::{ApiAuthed, DB},
+    jobs::{
+        run_flow_by_path_inner, run_script_by_path_inner, run_wait_result_flow_by_path_internal,
+        run_wait_result_script_by_path_internal, RunJobQuery,
+    },
     users::fetch_api_authed,
 };
 use anyhow::anyhow;
@@ -25,7 +27,6 @@ use http::header::IF_NONE_MATCH;
 use http::{HeaderMap, StatusCode};
 use quick_cache::sync::Cache;
 use serde::{Deserialize, Serialize};
-use serde_json::value::RawValue;
 use sql_builder::{bind::Bind, SqlBuilder};
 use sqlx::prelude::FromRow;
 use sqlx::PgConnection;
@@ -36,7 +37,6 @@ use tokio::sync::{RwLock, RwLockReadGuard};
 use tower_http::cors::CorsLayer;
 use windmill_audit::{audit_oss::audit_log, ActionKind};
 use windmill_common::error::{Error, Result as WindmillResult};
-use windmill_common::flows::Retry;
 #[cfg(feature = "parquet")]
 use windmill_common::s3_helpers::build_object_store_client;
 use windmill_common::{
@@ -119,9 +119,6 @@ struct NewTrigger {
     is_static_website: bool,
     wrap_body: Option<bool>,
     raw_string: Option<bool>,
-    error_handler_path: Option<String>,
-    error_handler_args: Option<sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    retry: Option<sqlx::types::Json<Retry>>,
 }
 
 #[derive(FromRow, Serialize)]
@@ -148,11 +145,6 @@ pub struct HttpTrigger {
     pub workspaced_route: bool,
     pub wrap_body: bool,
     pub raw_string: bool,
-    pub error_handler_path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_args: Option<sqlx::types::Json<Box<RawValue>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub retry: Option<sqlx::types::Json<Box<RawValue>>>,
 }
 
 #[derive(Deserialize)]
@@ -173,9 +165,6 @@ struct EditTrigger {
     is_static_website: bool,
     wrap_body: Option<bool>,
     raw_string: Option<bool>,
-    error_handler_path: Option<String>,
-    error_handler_args: Option<sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    retry: Option<sqlx::types::Json<Retry>>,
 }
 
 #[derive(Deserialize)]
@@ -219,9 +208,6 @@ async fn list_triggers(
             "static_asset_config",
             "is_static_website",
             "authentication_resource_path",
-            "error_handler_path",
-            "error_handler_args",
-            "retry",
         ])
         .order_by("edited_at", true)
         .and_where("workspace_id = ?".bind(&w_id))
@@ -279,10 +265,7 @@ async fn get_trigger(
             is_static_website,
             authentication_resource_path,
             wrap_body,
-            raw_string,
-            error_handler_path,
-            error_handler_args as "error_handler_args: _",
-            retry as "retry: _"
+            raw_string
         FROM 
             http_trigger
         WHERE 
@@ -355,13 +338,10 @@ async fn create_trigger_inner(
             edited_by, 
             email, 
             edited_at, 
-            is_static_website,
-            error_handler_path,
-            error_handler_args,
-            retry
+            is_static_website
         ) 
         VALUES (
-            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, now(), $19, $20, $21, $22
+            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, now(), $19
         )
         "#,
         w_id,
@@ -382,10 +362,7 @@ async fn create_trigger_inner(
         new_http_trigger.static_asset_config as _,
         &authed.username,
         &authed.email,
-        new_http_trigger.is_static_website,
-        new_http_trigger.error_handler_path,
-        new_http_trigger.error_handler_args as _,
-        new_http_trigger.retry as _,
+        new_http_trigger.is_static_website
     )
     .execute(&mut *tx)
     .await?;
@@ -639,13 +616,10 @@ async fn update_trigger(
                 summary = $16,
                 description = $17,
                 edited_at = now(), 
-                is_static_website = $18,
-                error_handler_path = $19,
-                error_handler_args = $20,
-                retry = $21
+                is_static_website = $18
             WHERE 
-                workspace_id = $22 AND 
-                path = $23
+                workspace_id = $19 AND 
+                path = $20
             "#,
             route_path,
             &route_path_key,
@@ -665,9 +639,6 @@ async fn update_trigger(
             ct.summary,
             ct.description,
             ct.is_static_website,
-            ct.error_handler_path,
-            ct.error_handler_args as _,
-            ct.retry as _,
             w_id,
             path,
         )
@@ -694,13 +665,10 @@ async fn update_trigger(
                 is_async = $12, 
                 authentication_method = $13, 
                 edited_at = now(), 
-                is_static_website = $14,
-                error_handler_path = $15,
-                error_handler_args = $16,
-                retry = $17
+                is_static_website = $14
             WHERE 
-                workspace_id = $18 AND 
-                path = $19
+                workspace_id = $15 AND 
+                path = $16
             "#,
             ct.workspaced_route,
             ct.wrap_body,
@@ -716,9 +684,6 @@ async fn update_trigger(
             ct.is_async,
             ct.authentication_method as _,
             ct.is_static_website,
-            ct.error_handler_path,
-            ct.error_handler_args as _,
-            ct.retry as _,
             w_id,
             path,
         )
@@ -928,9 +893,6 @@ pub struct TriggerRoute {
     workspaced_route: bool,
     wrap_body: bool,
     raw_string: bool,
-    error_handler_path: Option<String>,
-    error_handler_args: Option<sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    retry: Option<sqlx::types::Json<Retry>>,
 }
 
 pub struct RoutersCache {
@@ -1017,10 +979,7 @@ pub async fn refresh_routers(db: &DB) -> Result<(bool, RwLockReadGuard<'_, Route
                         wrap_body,
                         raw_string,
                         workspaced_route,
-                        is_static_website,
-                        error_handler_path,
-                        error_handler_args as "error_handler_args: _",
-                        retry as "retry: _"
+                        is_static_website
                     FROM 
                         http_trigger 
                     WHERE 
@@ -1427,37 +1386,61 @@ async fn route_job(
         )
         .map_err(|e| e.into_response())?;
 
-    if trigger.is_async {
-        trigger_runnable(
-            &db,
-            Some(user_db),
-            authed,
-            &trigger.workspace_id,
-            &trigger.script_path,
-            trigger.is_flow,
-            args,
-            trigger.retry.as_ref(),
-            trigger.error_handler_path.as_deref(),
-            trigger.error_handler_args.as_ref(),
-            format!("http_trigger/{}", trigger.path),
-        )
-        .await
-        .map_err(|e| e.into_response())
+    let run_query = RunJobQuery::default();
+
+    let response = if trigger.is_flow {
+        if trigger.is_async {
+            run_flow_by_path_inner(
+                authed,
+                db,
+                user_db,
+                trigger.workspace_id.clone(),
+                StripPath(trigger.script_path.to_owned()),
+                run_query,
+                args,
+            )
+            .await
+            .into_response()
+        } else {
+            run_wait_result_flow_by_path_internal(
+                db,
+                run_query,
+                StripPath(trigger.script_path.to_owned()),
+                authed,
+                user_db,
+                args,
+                trigger.workspace_id.clone(),
+            )
+            .await
+            .into_response()
+        }
     } else {
-        trigger_runnable_and_wait_for_result(
-            &db,
-            Some(user_db),
-            authed,
-            &trigger.workspace_id,
-            &trigger.script_path,
-            trigger.is_flow,
-            args,
-            trigger.retry.as_ref(),
-            trigger.error_handler_path.as_deref(),
-            trigger.error_handler_args.as_ref(),
-            format!("http_trigger/{}", trigger.path),
-        )
-        .await
-        .map_err(|e| e.into_response())
-    }
+        if trigger.is_async {
+            run_script_by_path_inner(
+                authed,
+                db,
+                user_db,
+                trigger.workspace_id.clone(),
+                StripPath(trigger.script_path.to_owned()),
+                run_query,
+                args,
+            )
+            .await
+            .into_response()
+        } else {
+            run_wait_result_script_by_path_internal(
+                db,
+                run_query,
+                StripPath(trigger.script_path.to_owned()),
+                authed,
+                user_db,
+                trigger.workspace_id.clone(),
+                args,
+            )
+            .await
+            .into_response()
+        }
+    };
+
+    Ok(response)
 }

backend/windmill-api/src/jobs.rs

@@ -22,13 +22,10 @@ use std::ops::{Deref, DerefMut};
 use std::str::FromStr;
 use tokio::io::AsyncReadExt;
 use tower::ServiceBuilder;
-use windmill_common::auth::TOKEN_PREFIX_LEN;
+use windmill_common::auth::{is_super_admin_email, TOKEN_PREFIX_LEN};
 use windmill_common::error::JsonResult;
 use windmill_common::flow_status::{JobResult, RestartedFrom};
-use windmill_common::jobs::{
-    check_tag_available_for_workspace_internal, format_completed_job_result, format_result,
-    ENTRYPOINT_OVERRIDE,
-};
+use windmill_common::jobs::{format_completed_job_result, format_result, ENTRYPOINT_OVERRIDE};
 use windmill_common::utils::WarnAfterExt;
 use windmill_common::worker::{Connection, CLOUD_HOSTED, TMP_DIR};
 
@@ -68,7 +65,7 @@ use tower_http::cors::{Any, CorsLayer};
 use urlencoding::encode;
 use windmill_audit::audit_oss::{audit_log, AuditAuthor};
 use windmill_audit::ActionKind;
-use windmill_common::worker::to_raw_value;
+use windmill_common::worker::{to_raw_value, CUSTOM_TAGS_PER_WORKSPACE};
 use windmill_common::{
     cache,
     db::UserDB,
@@ -355,9 +352,7 @@ async fn cancel_job_api(
             username: "anonymous".to_string(),
             username_override: None,
             email: "anonymous".to_string(),
-            token_prefix: opt_tokened
-                .token
-                .map(|s| s[0..TOKEN_PREFIX_LEN].to_string()),
+            token_prefix: opt_tokened.token.map(|s| s[0..TOKEN_PREFIX_LEN].to_string()),
         },
     };
     let (mut tx, job_option) = tokio::time::timeout(
@@ -573,14 +568,7 @@ async fn get_flow_job_debug_info(
             }
         }
 
-        log_job_view(
-            &db,
-            opt_authed.as_ref(),
-            tokened_o.token.as_deref(),
-            &w_id,
-            &id,
-        )
-        .await?;
+        log_job_view(&db, opt_authed.as_ref(), tokened_o.token.as_deref(), &w_id, &id).await?;
 
         Ok(Json(jobs).into_response())
     } else {
@@ -660,14 +648,7 @@ async fn get_job(
     let mut job = get.fetch(&db, id, &w_id).await?;
     job.fetch_outstanding_wait_time(&db).await?;
 
-    log_job_view(
-        &db,
-        opt_authed.as_ref(),
-        opt_tokened.token.as_deref(),
-        &w_id,
-        &id,
-    )
-    .await?;
+    log_job_view(&db, opt_authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &id).await?;
 
     Ok(Json(job).into_response())
 }
@@ -1153,14 +1134,7 @@ async fn get_job_logs(
         }
         let logs = record.logs.unwrap_or_default();
 
-        log_job_view(
-            &db,
-            opt_authed.as_ref(),
-            opt_tokened.token.as_deref(),
-            &w_id,
-            &id,
-        )
-        .await?;
+        log_job_view(&db, opt_authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &id).await?;
 
         #[cfg(all(feature = "enterprise", feature = "parquet"))]
         if let Some(r) = get_logs_from_store(record.log_offset, &logs, &record.log_file_index).await
@@ -1197,14 +1171,7 @@ async fn get_job_logs(
         }
         let logs = text.logs.unwrap_or_default();
 
-        log_job_view(
-            &db,
-            opt_authed.as_ref(),
-            opt_tokened.token.as_deref(),
-            &w_id,
-            &id,
-        )
-        .await?;
+        log_job_view(&db, opt_authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &id).await?;
 
         #[cfg(all(feature = "enterprise", feature = "parquet"))]
         if let Some(r) =
@@ -1254,14 +1221,7 @@ async fn get_args(
             ));
         }
 
-        log_job_view(
-            &db,
-            opt_authed.as_ref(),
-            opt_tokened.token.as_deref(),
-            &w_id,
-            &id,
-        )
-        .await?;
+        log_job_view(&db, opt_authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &id).await?;
 
         Ok(Json(record.args.map(|x| x.0).unwrap_or_default()))
     } else {
@@ -1282,14 +1242,7 @@ async fn get_args(
             ));
         }
 
-        log_job_view(
-            &db,
-            opt_authed.as_ref(),
-            opt_tokened.token.as_deref(),
-            &w_id,
-            &id,
-        )
-        .await?;
+        log_job_view(&db, opt_authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &id).await?;
 
         Ok(Json(record.args.map(|x| x.0).unwrap_or_default()))
     }
@@ -2159,9 +2112,7 @@ async fn resume_suspended_job_internal(
             email: approver.clone(),
             username: approver.clone(),
             username_override: None,
-            token_prefix: opt_tokened
-                .token
-                .map(|s| s[0..TOKEN_PREFIX_LEN].to_string()),
+            token_prefix: opt_tokened.token.map(|s| s[0..TOKEN_PREFIX_LEN].to_string()),
         },
     };
     audit_log(
@@ -2338,16 +2289,7 @@ pub async fn cancel_suspended_job(
     QueryOrBody(value): QueryOrBody<serde_json::Value>,
 ) -> error::Result<StatusCode> {
     resume_suspended_job_internal(
-        value,
-        db,
-        w_id,
-        job_id,
-        resume_id,
-        approver,
-        secret,
-        authed,
-        opt_tokened,
-        false,
+        value, db, w_id, job_id, resume_id, approver, secret, authed, opt_tokened, false,
     )
     .await
 }
@@ -2432,14 +2374,7 @@ pub async fn get_suspended_job_flow(
         approvers_from_status
     };
 
-    log_job_view(
-        &db,
-        authed.as_ref(),
-        opt_tokened.token.as_deref(),
-        &w_id,
-        &job,
-    )
-    .await?;
+    log_job_view(&db, authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &job).await?;
 
     Ok(Json(SuspendedJobFlow { job: flow, approvers }).into_response())
 }
@@ -3175,18 +3110,62 @@ pub fn add_raw_string(
     return args;
 }
 
-pub async fn check_tag_available_for_workspace(
+async fn check_tag_available_for_workspace(
     db: &DB,
     w_id: &str,
     tag: &Option<String>,
     authed: &ApiAuthed,
 ) -> error::Result<()> {
-    if let Some(tag) = tag.as_deref().filter(|t| !t.is_empty()) {
+    if let Some(tag) = tag {
+        if tag.is_empty() {
+            return Ok(());
+        }
+
         let tags = get_scope_tags(authed);
-        check_tag_available_for_workspace_internal(&db, w_id, tag, &authed.email, tags).await
-    } else {
-        Ok(())
+        let mut is_tag_available_in_workspace = None;
+        let mut is_tag_in_workspace_custom_tags = false;
+
+        if let Some(tags) = tags.as_ref() {
+            is_tag_available_in_workspace = Some(tags.contains(&tag.as_str()));
+        }
+
+        let custom_tags_per_w = CUSTOM_TAGS_PER_WORKSPACE.read().await;
+        if custom_tags_per_w.0.contains(&tag.to_string()) {
+            is_tag_in_workspace_custom_tags = true;
+        } else if custom_tags_per_w.1.contains_key(tag)
+            && custom_tags_per_w
+                .1
+                .get(tag)
+                .unwrap()
+                .contains(&w_id.to_string())
+        {
+            is_tag_in_workspace_custom_tags = true;
+        }
+
+        match is_tag_available_in_workspace {
+            Some(true) | None => {
+                if is_tag_in_workspace_custom_tags {
+                    return Ok(());
+                }
+            }
+            _ => {}
+        }
+
+        if !is_super_admin_email(db, &authed.email).await? {
+            if tags.is_some() && is_tag_available_in_workspace.is_some() {
+                return Err(Error::BadRequest(format!(
+                    "Tag {tag} is not available in your scope"
+                )));
+            }
+
+            return Err(error::Error::BadRequest(format!(
+                "Only super admins are allowed to use tags that are not included in the allowed CUSTOM_TAGS: {:?}",
+                custom_tags_per_w
+            )));
+        }
     }
+
+    return Ok(());
 }
 
 #[cfg(feature = "enterprise")]
@@ -3427,8 +3406,8 @@ async fn batch_rerun_handle_job(
                 PushArgsOwned { extra: None, args },
             )
             .await;
-            if let Ok(uuid) = result {
-                return Ok(uuid.to_string());
+            if let Ok((_, uuid)) = result {
+                return Ok(uuid);
             }
         }
         JobKind::Script => {
@@ -3455,8 +3434,8 @@ async fn batch_rerun_handle_job(
                 )
                 .await
             };
-            if let Ok((uuid, _)) = result {
-                return Ok(uuid.to_string());
+            if let Ok((_, uuid)) = result {
+                return Ok(uuid);
             }
         }
         _ => {}
@@ -3484,10 +3463,7 @@ pub async fn run_flow_by_path(
         )
         .await?;
 
-    let uuid =
-        run_flow_by_path_inner(authed, db, user_db, w_id, flow_path, run_query, args).await?;
-
-    Ok((StatusCode::CREATED, uuid.to_string()))
+    run_flow_by_path_inner(authed, db, user_db, w_id, flow_path, run_query, args).await
 }
 
 pub async fn run_flow_by_path_inner(
@@ -3498,7 +3474,7 @@ pub async fn run_flow_by_path_inner(
     flow_path: StripPath,
     run_query: RunJobQuery,
     args: PushArgsOwned,
-) -> error::Result<Uuid> {
+) -> error::Result<(StatusCode, String)> {
     #[cfg(feature = "enterprise")]
     check_license_key_valid().await?;
     let flow_path = flow_path.to_path();
@@ -3573,7 +3549,7 @@ pub async fn run_flow_by_path_inner(
     )
     .await?;
     tx.commit().await?;
-    Ok(uuid)
+    Ok((StatusCode::CREATED, uuid.to_string()))
 }
 
 #[cfg(not(feature = "enterprise"))]
@@ -3688,10 +3664,7 @@ pub async fn run_script_by_path(
         )
         .await?;
 
-    let (uuid, _) =
-        run_script_by_path_inner(authed, db, user_db, w_id, script_path, run_query, args).await?;
-
-    Ok((StatusCode::CREATED, uuid.to_string()))
+    run_script_by_path_inner(authed, db, user_db, w_id, script_path, run_query, args).await
 }
 
 pub async fn run_script_by_path_inner(
@@ -3702,7 +3675,7 @@ pub async fn run_script_by_path_inner(
     script_path: StripPath,
     run_query: RunJobQuery,
     args: PushArgsOwned,
-) -> error::Result<(Uuid, Option<bool>)> {
+) -> error::Result<(StatusCode, String)> {
     #[cfg(feature = "enterprise")]
     check_license_key_valid().await?;
 
@@ -3711,7 +3684,7 @@ pub async fn run_script_by_path_inner(
     check_scopes(&authed, || format!("run:script/{script_path}"))?;
 
     let mut tx = user_db.clone().begin(&authed).await?;
-    let (job_payload, tag, delete_after_use, timeout, on_behalf_of) =
+    let (job_payload, tag, _delete_after_use, timeout, on_behalf_of) =
         script_path_to_payload(script_path, &mut *tx, &w_id, run_query.skip_preprocessor).await?;
     drop(tx);
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
@@ -3763,8 +3736,7 @@ pub async fn run_script_by_path_inner(
     )
     .await?;
     tx.commit().await?;
-
-    Ok((uuid, delete_after_use))
+    Ok((StatusCode::CREATED, uuid.to_string()))
 }
 
 #[derive(Deserialize)]
@@ -4111,7 +4083,16 @@ pub async fn run_wait_result_internal(
     }
 }
 
-pub fn result_to_response(result: Box<RawValue>, success: bool) -> error::Result<Response> {
+pub async fn run_wait_result(
+    db: &DB,
+    uuid: Uuid,
+    w_id: String,
+    node_id_for_empty_return: Option<String>,
+    username: &str,
+) -> error::Result<Response> {
+    let (result, success) =
+        run_wait_result_internal(db, uuid, w_id, node_id_for_empty_return, username).await?;
+
     let composite_result = serde_json::from_str::<WindmillCompositeResult>(result.get());
     match composite_result {
         Ok(WindmillCompositeResult {
@@ -4200,20 +4181,7 @@ pub fn result_to_response(result: Box<RawValue>, success: bool) -> error::Result
     }
 }
 
-pub async fn run_wait_result(
-    db: &DB,
-    uuid: Uuid,
-    w_id: String,
-    node_id_for_empty_return: Option<String>,
-    username: &str,
-) -> error::Result<Response> {
-    let (result, success) =
-        run_wait_result_internal(db, uuid, w_id, node_id_for_empty_return, username).await?;
-
-    result_to_response(result, success)
-}
-
-pub async fn delete_job_metadata_after_use(db: &DB, job_uuid: Uuid) -> Result<(), Error> {
+async fn delete_job_metadata_after_use(db: &DB, job_uuid: Uuid) -> Result<(), Error> {
     sqlx::query!(
         "UPDATE v2_job SET args = '{}'::jsonb WHERE id = $1",
         job_uuid,
@@ -4323,7 +4291,7 @@ async fn log_job_view(
                 username: "anonymous".to_string(),
                 username_override: None,
                 email: "anonymous".to_string(),
-                token_prefix: opt_token.map(|t| t[0..TOKEN_PREFIX_LEN].to_string()),
+                token_prefix: opt_token.map(|t| t[0..TOKEN_PREFIX_LEN].to_string())
             },
         };
         if JOB_VIEW_CACHE
@@ -5559,10 +5527,7 @@ pub async fn run_job_by_hash(
         )
         .await?;
 
-    let (uuid, _) =
-        run_job_by_hash_inner(authed, db, user_db, w_id, script_hash, run_query, args).await?;
-
-    Ok((StatusCode::CREATED, uuid.to_string()))
+    run_job_by_hash_inner(authed, db, user_db, w_id, script_hash, run_query, args).await
 }
 
 pub async fn run_job_by_hash_inner(
@@ -5573,7 +5538,7 @@ pub async fn run_job_by_hash_inner(
     script_hash: ScriptHash,
     run_query: RunJobQuery,
     args: PushArgsOwned,
-) -> error::Result<(Uuid, Option<bool>)> {
+) -> error::Result<(StatusCode, String)> {
     #[cfg(feature = "enterprise")]
     check_license_key_valid().await?;
 
@@ -5593,8 +5558,7 @@ pub async fn run_job_by_hash_inner(
         has_preprocessor,
         on_behalf_of_email,
         created_by,
-        delete_after_use,
-        ..
+        .. // delete_after_use not taken into account in async endpoints
     } = get_script_info_for_hash(&mut *tx, &w_id, hash).await?;
     check_scopes(&authed, || format!("run:script/{path}"))?;
     if let Some(run_query_cache_ttl) = run_query.cache_ttl {
@@ -5662,7 +5626,7 @@ pub async fn run_job_by_hash_inner(
     .await?;
     tx.commit().await?;
 
-    Ok((uuid, delete_after_use))
+    Ok((StatusCode::CREATED, uuid.to_string()))
 }
 
 #[derive(Deserialize)]
@@ -5793,14 +5757,7 @@ async fn get_job_update(
             "As a non logged in user, you can only see jobs ran by anonymous users".to_string(),
         ));
     }
-    log_job_view(
-        &db,
-        opt_authed.as_ref(),
-        opt_tokened.token.as_deref(),
-        &w_id,
-        &job_id,
-    )
-    .await?;
+    log_job_view(&db, opt_authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &job_id).await?;
     Ok(Json(JobUpdate {
         running: record.running,
         completed: record.completed,
@@ -6114,14 +6071,7 @@ async fn get_completed_job<'a>(
     // .fetch_optional(db)
     // .await.ok().flatten().flatten();
 
-    log_job_view(
-        &db,
-        opt_authed.as_ref(),
-        opt_tokened.token.as_deref(),
-        &w_id,
-        &id,
-    )
-    .await?;
+    log_job_view(&db, opt_authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &id).await?;
 
     Ok(response)
 }
@@ -6224,14 +6174,7 @@ async fn get_completed_job_result(
         raw_result.result.as_mut(),
     );
 
-    log_job_view(
-        &db,
-        opt_authed.as_ref(),
-        opt_tokened.token.as_deref(),
-        &w_id,
-        &id,
-    )
-    .await?;
+    log_job_view(&db, opt_authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &id).await?;
 
     Ok(Json(raw_result.result).into_response())
 }
@@ -6322,14 +6265,7 @@ async fn get_completed_job_result_maybe(
             ));
         }
 
-        log_job_view(
-            &db,
-            opt_authed.as_ref(),
-            opt_tokened.token.as_deref(),
-            &w_id,
-            &id,
-        )
-        .await?;
+        log_job_view(&db, opt_authed.as_ref(), opt_tokened.token.as_deref(), &w_id, &id).await?;
 
         Ok(Json(CompletedJobResult {
             started: Some(true),

backend/windmill-api/src/kafka_triggers_oss.rs

@@ -51,10 +51,4 @@ pub struct KafkaTrigger {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub error: Option<String>,
     pub enabled: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_args: Option<sqlx::types::Json<std::collections::HashMap<String, Box<serde_json::value::RawValue>>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub retry: Option<sqlx::types::Json<windmill_common::flows::Retry>>,
 }

backend/windmill-api/src/lib.rs

@@ -72,7 +72,6 @@ mod agent_workers_oss;
 mod ai;
 mod apps;
 pub mod args;
-mod assets;
 mod audit;
 pub mod auth;
 mod capture;
@@ -565,7 +564,6 @@ pub async fn run_server(
                         // Reordered alphabetically
                         .nest("/acls", granular_acls::workspaced_service())
                         .nest("/apps", apps::workspaced_service())
-                        .nest("/assets", assets::workspaced_service())
                         .nest("/audit", audit::workspaced_service())
                         .nest("/capture", capture::workspaced_service())
                         .nest(

backend/windmill-api/src/mqtt_triggers.rs

@@ -1,8 +1,9 @@
 use crate::{
     capture::{insert_capture_payload, MqttTriggerConfig},
     db::{ApiAuthed, DB},
+    jobs::{run_flow_by_path_inner, run_script_by_path_inner, RunJobQuery},
     resources::try_get_resource_from_db_as,
-    trigger_helpers::{trigger_runnable, TriggerJobArgs},
+    trigger_helpers::TriggerJobArgs,
     users::fetch_api_authed,
 };
 use windmill_git_sync::{handle_deployment_metadata, DeployedObject};
@@ -105,20 +106,33 @@ async fn run_job(
     )
     .await?;
 
-    trigger_runnable(
-        db,
-        None,
-        authed,
-        &trigger.workspace_id,
-        &trigger.script_path,
-        trigger.is_flow,
-        args,
-        trigger.retry.as_ref(),
-        trigger.error_handler_path.as_deref(),
-        trigger.error_handler_args.as_ref(),
-        format!("mqtt_trigger/{}", trigger.path),
-    )
-    .await?;
+    let user_db = UserDB::new(db.clone());
+
+    let run_query = RunJobQuery::default();
+
+    if trigger.is_flow {
+        run_flow_by_path_inner(
+            authed,
+            db.clone(),
+            user_db,
+            trigger.workspace_id.clone(),
+            StripPath(trigger.script_path.to_owned()),
+            run_query,
+            args,
+        )
+        .await?;
+    } else {
+        run_script_by_path_inner(
+            authed,
+            db.clone(),
+            user_db,
+            trigger.workspace_id.clone(),
+            StripPath(trigger.script_path.to_owned()),
+            run_query,
+            args,
+        )
+        .await?;
+    }
 
     Ok(())
 }
@@ -213,9 +227,6 @@ pub struct NewMqttTrigger {
     script_path: String,
     is_flow: bool,
     enabled: bool,
-    error_handler_path: Option<String>,
-    error_handler_args: Option<SqlxJson<HashMap<String, Box<RawValue>>>>,
-    retry: Option<SqlxJson<windmill_common::flows::Retry>>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -230,9 +241,6 @@ pub struct EditMqttTrigger {
     path: String,
     script_path: String,
     is_flow: bool,
-    error_handler_path: Option<String>,
-    error_handler_args: Option<SqlxJson<HashMap<String, Box<RawValue>>>>,
-    retry: Option<SqlxJson<windmill_common::flows::Retry>>,
 }
 
 #[derive(Debug, Serialize, Deserialize, FromRow)]
@@ -256,12 +264,6 @@ pub struct MqttTrigger {
     pub server_id: Option<String>,
     pub last_server_ping: Option<chrono::DateTime<chrono::Utc>>,
     pub enabled: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_args: Option<SqlxJson<HashMap<String, Box<RawValue>>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub retry: Option<SqlxJson<windmill_common::flows::Retry>>,
 }
 
 #[derive(Deserialize, Serialize)]
@@ -536,9 +538,6 @@ pub async fn create_mqtt_trigger(
         v5_config,
         client_version,
         client_id,
-        error_handler_path,
-        error_handler_args,
-        retry,
     } = new_mqtt_trigger;
 
     let mut tx = user_db.begin(&authed).await?;
@@ -562,10 +561,7 @@ pub async fn create_mqtt_trigger(
             is_flow, 
             email, 
             enabled, 
-            edited_by,
-            error_handler_path,
-            error_handler_args,
-            retry
+            edited_by
         ) 
         VALUES (
             $1, 
@@ -580,10 +576,7 @@ pub async fn create_mqtt_trigger(
             $10,
             $11,
             $12,
-            $13,
-            $14,
-            $15,
-            $16
+            $13
         )"#,
         mqtt_resource_path,
         subscribe_topics.as_slice() as &[SqlxJson<SubscribeTopic>],
@@ -597,10 +590,7 @@ pub async fn create_mqtt_trigger(
         is_flow,
         &authed.email,
         enabled,
-        &authed.username,
-        error_handler_path,
-        error_handler_args as _,
-        retry as _
+        &authed.username
     )
     .execute(&mut *tx)
     .await?;
@@ -660,9 +650,6 @@ pub async fn list_mqtt_triggers(
             "extra_perms",
             "error",
             "enabled",
-            "error_handler_path",
-            "error_handler_args",
-            "retry",
         ])
         .order_by("edited_at", true)
         .and_where("workspace_id = ?".bind(&w_id))
@@ -724,10 +711,7 @@ pub async fn get_mqtt_trigger(
             last_server_ping,
             extra_perms,
             error,
-            enabled,
-            error_handler_path,
-            error_handler_args as "error_handler_args: _",
-            retry as "retry: _"
+            enabled
         FROM 
             mqtt_trigger
         WHERE 
@@ -764,9 +748,6 @@ pub async fn update_mqtt_trigger(
         v5_config,
         client_version,
         client_id,
-        error_handler_path,
-        error_handler_args,
-        retry,
     } = mqtt_trigger;
 
     let mut tx = user_db.begin(&authed).await?;
@@ -794,10 +775,7 @@ pub async fn update_mqtt_trigger(
                 path = $11,
                 edited_at = now(), 
                 error = NULL,
-                server_id = NULL,
-                error_handler_path = $14,
-                error_handler_args = $15,
-                retry = $16
+                server_id = NULL
             WHERE 
                 workspace_id = $12 AND 
                 path = $13
@@ -815,9 +793,6 @@ pub async fn update_mqtt_trigger(
         path,
         w_id,
         workspace_path,
-        error_handler_path,
-        error_handler_args as _,
-        retry as _
     )
     .execute(&mut *tx)
     .await?;
@@ -1812,10 +1787,7 @@ async fn listen_to_unlistened_mqtt_events(
                 last_server_ping,
                 extra_perms,
                 error,
-                enabled,
-                error_handler_path,
-                error_handler_args as "error_handler_args: _",
-                retry as "retry: _"
+                enabled
             FROM
                 mqtt_trigger
             WHERE

backend/windmill-api/src/nats_triggers_oss.rs

@@ -52,10 +52,4 @@ pub struct NatsTrigger {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub error: Option<String>,
     pub enabled: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_args: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub retry: Option<serde_json::Value>,
 }

backend/windmill-api/src/postgres_triggers/handler.rs

@@ -17,7 +17,6 @@ use pg_escape::{quote_identifier, quote_literal};
 use quick_cache::sync::Cache;
 use rust_postgres::{types::Type, Client};
 use serde::{Deserialize, Deserializer, Serialize};
-use serde_json::value::RawValue;
 use sql_builder::{bind::Bind, SqlBuilder};
 use sqlx::FromRow;
 use windmill_audit::{audit_oss::audit_log, ActionKind};
@@ -98,9 +97,6 @@ pub struct EditPostgresTrigger {
     is_flow: bool,
     postgres_resource_path: String,
     publication: Option<PublicationData>,
-    error_handler_path: Option<String>,
-    error_handler_args: Option<sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    retry: Option<sqlx::types::Json<windmill_common::flows::Retry>>,
 }
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -113,9 +109,6 @@ pub struct NewPostgresTrigger {
     replication_slot_name: Option<String>,
     publication_name: Option<String>,
     publication: Option<PublicationData>,
-    error_handler_path: Option<String>,
-    error_handler_args: Option<sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    retry: Option<sqlx::types::Json<windmill_common::flows::Retry>>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -243,12 +236,6 @@ pub struct PostgresTrigger {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub last_server_ping: Option<chrono::DateTime<chrono::Utc>>,
     pub enabled: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_args: Option<sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub retry: Option<sqlx::types::Json<windmill_common::flows::Retry>>,
 }
 
 #[derive(Deserialize, Serialize)]
@@ -388,9 +375,6 @@ pub async fn create_postgres_trigger(
         publication_name,
         replication_slot_name,
         publication,
-        error_handler_path,
-        error_handler_args,
-        retry,
     } = new_postgres_trigger;
 
     if publication_name.is_none() && publication.is_none() {
@@ -440,10 +424,7 @@ pub async fn create_postgres_trigger(
             email, 
             enabled, 
             postgres_resource_path, 
-            edited_by,
-            error_handler_path,
-            error_handler_args,
-            retry
+            edited_by
         ) 
         VALUES (
             $1, 
@@ -455,10 +436,7 @@ pub async fn create_postgres_trigger(
             $7, 
             $8, 
             $9, 
-            $10,
-            $11,
-            $12,
-            $13
+            $10
         )"#,
         pub_name,
         slot_name,
@@ -469,10 +447,7 @@ pub async fn create_postgres_trigger(
         &authed.email,
         enabled,
         postgres_resource_path,
-        &authed.username,
-        error_handler_path,
-        error_handler_args as _,
-        retry as _
+        &authed.username
     )
     .execute(&mut *tx)
     .await?;
@@ -529,9 +504,6 @@ pub async fn list_postgres_triggers(
             "postgres_resource_path",
             "replication_slot_name",
             "publication_name",
-            "error_handler_path",
-            "error_handler_args",
-            "retry",
         ])
         .order_by("edited_at", true)
         .and_where("workspace_id = ?".bind(&w_id))
@@ -1170,10 +1142,7 @@ pub async fn get_postgres_trigger(
             enabled,
             replication_slot_name,
             publication_name,
-            postgres_resource_path,
-            error_handler_path,
-            error_handler_args as "error_handler_args: _",
-            retry as "retry: _"
+            postgres_resource_path
         FROM 
             postgres_trigger
         WHERE 
@@ -1209,9 +1178,6 @@ pub async fn update_postgres_trigger(
         is_flow,
         postgres_resource_path,
         publication,
-        error_handler_path,
-        error_handler_args,
-        retry,
     } = postgres_trigger;
 
     let mut pg_connection = get_default_pg_connection(
@@ -1273,10 +1239,7 @@ pub async fn update_postgres_trigger(
                 publication_name = $8,
                 edited_at = now(), 
                 error = NULL,
-                server_id = NULL,
-                error_handler_path = $11,
-                error_handler_args = $12,
-                retry = $13
+                server_id = NULL
             WHERE 
                 workspace_id = $9 AND 
                 path = $10
@@ -1291,9 +1254,6 @@ pub async fn update_postgres_trigger(
         publication_name,
         w_id,
         workspace_path,
-        error_handler_path,
-        error_handler_args as _,
-        retry as _,
     )
     .execute(&mut *tx)
     .await?;

backend/windmill-api/src/postgres_triggers/mod.rs

@@ -1,7 +1,8 @@
 use crate::{
     db::{ApiAuthed, DB},
+    jobs::{run_flow_by_path_inner, run_script_by_path_inner, RunJobQuery},
     resources::try_get_resource_from_db_as,
-    trigger_helpers::{trigger_runnable, TriggerJobArgs},
+    trigger_helpers::TriggerJobArgs,
     users::fetch_api_authed,
 };
 use chrono::Utc;
@@ -31,6 +32,7 @@ use handler::{
 use windmill_common::{
     db::UserDB,
     error::{to_anyhow, Error, Result},
+    utils::StripPath,
 };
 mod bool;
 mod converter;
@@ -393,20 +395,33 @@ async fn run_job(
     )
     .await?;
 
-    trigger_runnable(
-        db,
-        None,
-        authed,
-        &trigger.workspace_id,
-        &trigger.script_path,
-        trigger.is_flow,
-        args,
-        trigger.retry.as_ref(),
-        trigger.error_handler_path.as_deref(),
-        trigger.error_handler_args.as_ref(),
-        format!("postgres_trigger/{}", trigger.path),
-    )
-    .await?;
+    let user_db = UserDB::new(db.clone());
+
+    let run_query = RunJobQuery::default();
+
+    if trigger.is_flow {
+        run_flow_by_path_inner(
+            authed,
+            db.clone(),
+            user_db,
+            trigger.workspace_id.clone(),
+            StripPath(trigger.script_path.to_owned()),
+            run_query,
+            args,
+        )
+        .await?;
+    } else {
+        run_script_by_path_inner(
+            authed,
+            db.clone(),
+            user_db,
+            trigger.workspace_id.clone(),
+            StripPath(trigger.script_path.to_owned()),
+            run_query,
+            args,
+        )
+        .await?;
+    }
 
     Ok(())
 }

backend/windmill-api/src/postgres_triggers/trigger.rs

@@ -913,10 +913,7 @@ async fn listen_to_unlistened_database_events(
                 extra_perms,
                 error,
                 enabled,
-                postgres_resource_path,
-                error_handler_path,
-                error_handler_args as "error_handler_args: _",
-                retry as "retry: _"
+                postgres_resource_path
             FROM
                 postgres_trigger
             WHERE

backend/windmill-api/src/scripts.rs

@@ -42,11 +42,7 @@ use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_worker::process_relative_imports;
 
-use windmill_common::{
-    assets::{clear_asset_usage, insert_asset_usage, parse_assets, AssetUsageKind},
-    error::to_anyhow,
-    worker::CLOUD_HOSTED,
-};
+use windmill_common::{error::to_anyhow, worker::CLOUD_HOSTED};
 
 use windmill_common::{
     db::UserDB,
@@ -663,15 +659,6 @@ async fn create_script_internal<'c>(
             )
             .execute(&mut *tx)
             .await?;
-
-            sqlx::query!(
-                "DELETE FROM asset WHERE workspace_id = $1 AND usage_kind = 'script' AND usage_path = (SELECT path FROM script WHERE hash = $2 AND workspace_id = $1)",
-                &w_id,
-                p_hash.0
-            )
-            .execute(&mut *tx)
-            .await?;
-
             r
         }
     }?;
@@ -921,19 +908,6 @@ async fn create_script_internal<'c>(
         );
     }
 
-    clear_asset_usage(&mut *tx, &w_id, &script_path, AssetUsageKind::Script).await?;
-    for asset in parse_assets(&ns.content, ns.language)?.iter().flatten() {
-        insert_asset_usage(
-            &mut *tx,
-            &w_id,
-            asset,
-            ns.fallback_access_types.as_ref().map(Vec::as_slice),
-            &ns.path,
-            AssetUsageKind::Script,
-        )
-        .await?;
-    }
-
     let permissioned_as = username_to_permissioned_as(&authed.username);
     if needs_lock_gen {
         let tag = if ns.dedicated_worker.is_some_and(|x| x) {
@@ -1578,15 +1552,6 @@ async fn archive_script_by_path(
     .fetch_one(&db)
     .await
     .map_err(|e| Error::internal_err(format!("archiving script in {w_id}: {e:#}")))?;
-
-    sqlx::query!(
-        "DELETE FROM asset WHERE workspace_id = $1 AND usage_kind = 'script' AND usage_path = $2",
-        &w_id,
-        path
-    )
-    .execute(&mut *tx)
-    .await?;
-
     audit_log(
         &mut *tx,
         &authed,
@@ -1638,14 +1603,6 @@ async fn archive_script_by_hash(
     .await
     .map_err(|e| Error::internal_err(format!("archiving script in {w_id}: {e:#}")))?;
 
-    sqlx::query!(
-        "DELETE FROM asset WHERE workspace_id = $1 AND usage_kind = 'script' AND usage_path = (SELECT path FROM script WHERE hash = $2 AND workspace_id = $1)",
-        &w_id,
-        &hash.0
-    )
-    .execute(&mut *tx)
-    .await?;
-
     audit_log(
         &mut *tx,
         &authed,
@@ -1686,14 +1643,6 @@ async fn delete_script_by_hash(
     .await
     .map_err(|e| Error::internal_err(format!("deleting script by hash {w_id}: {e:#}")))?;
 
-    sqlx::query!(
-        "DELETE FROM asset WHERE workspace_id = $1 AND usage_kind = 'script' AND usage_path = (SELECT path FROM script WHERE hash = $2 AND workspace_id = $1)",
-        &w_id,
-        hash.0
-    )
-    .execute(&mut *tx)
-    .await?;
-
     audit_log(
         &mut *tx,
         &authed,

backend/windmill-api/src/sqs_triggers_oss.rs

@@ -40,10 +40,4 @@ pub struct SqsTrigger {
     pub server_id: Option<String>,
     pub last_server_ping: Option<chrono::DateTime<chrono::Utc>>,
     pub enabled: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_args: Option<sqlx::types::Json<std::collections::HashMap<String, Box<serde_json::value::RawValue>>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub retry: Option<sqlx::types::Json<windmill_common::flows::Retry>>,
 }

backend/windmill-api/src/trigger_helpers.rs

@@ -1,38 +1,23 @@
-use anyhow::Context;
-use axum::response::IntoResponse;
-use http::StatusCode;
 use serde::Deserialize;
 use serde_json::value::RawValue;
 use std::collections::HashMap;
-use uuid::Uuid;
 use windmill_common::{
-    db::UserDB,
     error::Result,
-    flows::{FlowModuleValue, Retry},
+    flows::FlowModuleValue,
     get_latest_deployed_hash_for_path, get_latest_flow_version_info_for_path,
-    jobs::{get_has_preprocessor_from_content_and_lang, script_path_to_payload, JobPayload},
+    jobs::get_has_preprocessor_from_content_and_lang,
     scripts::{get_full_hub_script_by_path, ScriptHash, ScriptLang},
     triggers::{
         HubOrWorkspaceId, RunnableFormat, RunnableFormatVersion, TriggerKind,
         RUNNABLE_FORMAT_VERSION_CACHE,
     },
-    users::username_to_permissioned_as,
     utils::StripPath,
     worker::to_raw_value,
     FlowVersionInfo,
 };
-use windmill_queue::{push, PushArgs, PushArgsOwned, PushIsolationLevel};
+use windmill_queue::PushArgsOwned;
 
-#[cfg(feature = "enterprise")]
-use crate::jobs::check_license_key_valid;
-use crate::{
-    db::{ApiAuthed, DB},
-    jobs::{
-        check_tag_available_for_workspace, delete_job_metadata_after_use, result_to_response,
-        run_flow_by_path_inner, run_script_by_path_inner, run_wait_result_internal, RunJobQuery,
-    },
-    HTTP_CLIENT,
-};
+use crate::{db::DB, HTTP_CLIENT};
 
 struct ScriptInfo {
     has_preprocessor: Option<bool>,
@@ -457,347 +442,3 @@ pub trait TriggerJobArgs<T: Clone> {
         (main_args, preprocessor_args)
     }
 }
-
-#[allow(dead_code)]
-async fn trigger_runnable_inner(
-    db: &DB,
-    user_db: Option<UserDB>,
-    authed: ApiAuthed,
-    workspace_id: &str,
-    runnable_path: &str,
-    is_flow: bool,
-    args: PushArgsOwned,
-    retry: Option<&sqlx::types::Json<Retry>>,
-    error_handler_path: Option<&str>,
-    error_handler_args: Option<&sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    trigger_path: String,
-) -> Result<(Uuid, Option<bool>)> {
-    let user_db = user_db.unwrap_or_else(|| UserDB::new(db.clone()));
-    let (uuid, delete_after_use) = if is_flow {
-        let run_query = RunJobQuery::default();
-        let path = StripPath(runnable_path.to_string());
-        let uuid = run_flow_by_path_inner(
-            authed,
-            db.clone(),
-            user_db,
-            workspace_id.to_string(),
-            path,
-            run_query,
-            args,
-        )
-        .await?;
-        (uuid, None)
-    } else {
-        trigger_script_internal(
-            db,
-            user_db,
-            authed,
-            workspace_id,
-            runnable_path,
-            args,
-            retry,
-            error_handler_path,
-            error_handler_args,
-            trigger_path,
-        )
-        .await?
-    };
-
-    Ok((uuid, delete_after_use))
-}
-
-#[allow(dead_code)]
-pub async fn trigger_runnable(
-    db: &DB,
-    user_db: Option<UserDB>,
-    authed: ApiAuthed,
-    workspace_id: &str,
-    runnable_path: &str,
-    is_flow: bool,
-    args: PushArgsOwned,
-    retry: Option<&sqlx::types::Json<Retry>>,
-    error_handler_path: Option<&str>,
-    error_handler_args: Option<&sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    trigger_path: String,
-) -> Result<axum::response::Response> {
-    let (uuid, _) = trigger_runnable_inner(
-        db,
-        user_db,
-        authed,
-        workspace_id,
-        runnable_path,
-        is_flow,
-        args,
-        retry,
-        error_handler_path,
-        error_handler_args,
-        trigger_path,
-    )
-    .await?;
-    Ok((StatusCode::CREATED, uuid.to_string()).into_response())
-}
-
-#[allow(dead_code)]
-pub async fn trigger_runnable_and_wait_for_result(
-    db: &DB,
-    user_db: Option<UserDB>,
-    authed: ApiAuthed,
-    workspace_id: &str,
-    runnable_path: &str,
-    is_flow: bool,
-    args: PushArgsOwned,
-    retry: Option<&sqlx::types::Json<Retry>>,
-    error_handler_path: Option<&str>,
-    error_handler_args: Option<&sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    trigger_path: String,
-) -> Result<axum::response::Response> {
-    let username = authed.username.clone();
-    let (uuid, delete_after_use) = trigger_runnable_inner(
-        db,
-        user_db,
-        authed,
-        workspace_id,
-        runnable_path,
-        is_flow,
-        args,
-        retry,
-        error_handler_path,
-        error_handler_args,
-        trigger_path,
-    )
-    .await?;
-    let (result, success) =
-        run_wait_result_internal(db, uuid, workspace_id.to_string(), None, &username).await?;
-
-    if delete_after_use.unwrap_or(false) {
-        delete_job_metadata_after_use(&db, uuid).await?;
-    }
-
-    result_to_response(result, success)
-}
-
-#[allow(dead_code)]
-pub async fn trigger_runnable_and_wait_for_raw_result(
-    db: &DB,
-    user_db: Option<UserDB>,
-    authed: ApiAuthed,
-    workspace_id: &str,
-    runnable_path: &str,
-    is_flow: bool,
-    args: PushArgsOwned,
-    retry: Option<&sqlx::types::Json<Retry>>,
-    error_handler_path: Option<&str>,
-    error_handler_args: Option<&sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    trigger_path: String,
-) -> Result<Box<RawValue>> {
-    let username = authed.username.clone();
-    let (uuid, delete_after_use) = trigger_runnable_inner(
-        db,
-        user_db,
-        authed,
-        workspace_id,
-        runnable_path,
-        is_flow,
-        args,
-        retry,
-        error_handler_path,
-        error_handler_args,
-        trigger_path,
-    )
-    .await?;
-
-    let early_return = if is_flow {
-        sqlx::query_scalar!(
-            r#"SELECT flow_version.value->>'early_return' as early_return
-            FROM flow 
-            LEFT JOIN flow_version
-                ON flow_version.id = flow.versions[array_upper(flow.versions, 1)]
-            WHERE flow.path = $1 and flow.workspace_id = $2"#,
-            runnable_path,
-            workspace_id,
-        )
-        .fetch_optional(db)
-        .await?
-        .flatten()
-    } else {
-        None
-    };
-
-    let (result, success) =
-        run_wait_result_internal(db, uuid, workspace_id.to_string(), early_return, &username)
-            .await
-            .with_context(|| {
-                format!(
-                    "Error fetching job result for {} {}",
-                    if is_flow { "flow" } else { "script" },
-                    runnable_path
-                )
-            })?;
-
-    if delete_after_use.unwrap_or(false) {
-        delete_job_metadata_after_use(&db, uuid).await?;
-    }
-
-    if !success {
-        Err(windmill_common::error::Error::internal_err(format!(
-            "{} {runnable_path} failed: {:?}",
-            if is_flow { "Flow" } else { "Script" },
-            result
-        )))
-    } else {
-        Ok(result)
-    }
-}
-
-async fn trigger_script_internal(
-    db: &DB,
-    user_db: UserDB,
-    authed: ApiAuthed,
-    workspace_id: &str,
-    script_path: &str,
-    args: PushArgsOwned,
-    retry: Option<&sqlx::types::Json<Retry>>,
-    error_handler_path: Option<&str>,
-    error_handler_args: Option<&sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    trigger_path: String,
-) -> Result<(Uuid, Option<bool>)> {
-    if retry.is_none() && error_handler_path.is_none() {
-        let run_query = RunJobQuery::default();
-        let path = StripPath(script_path.to_string());
-        run_script_by_path_inner(
-            authed,
-            db.clone(),
-            user_db,
-            workspace_id.to_string(),
-            path,
-            run_query,
-            args,
-        )
-        .await
-    } else {
-        trigger_script_with_retry_and_error_handler(
-            db,
-            user_db,
-            authed,
-            workspace_id,
-            script_path,
-            args,
-            retry,
-            error_handler_path,
-            error_handler_args,
-            trigger_path,
-        )
-        .await
-    }
-}
-
-async fn trigger_script_with_retry_and_error_handler(
-    db: &DB,
-    user_db: UserDB,
-    authed: ApiAuthed,
-    workspace_id: &str,
-    script_path: &str,
-    args: PushArgsOwned,
-    retry: Option<&sqlx::types::Json<Retry>>,
-    error_handler_path: Option<&str>,
-    error_handler_args: Option<&sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
-    trigger_path: String,
-) -> Result<(Uuid, Option<bool>)> {
-    let retry = retry.map(|r| r.0.clone());
-    let error_handler_path = error_handler_path.map(|p| p.to_string());
-    let error_handler_args = error_handler_args.map(|args| args.0.clone());
-
-    #[cfg(feature = "enterprise")]
-    check_license_key_valid().await?;
-
-    let (job_payload, tag, delete_after_use, timeout, on_behalf_of) = {
-        let mut tx = user_db.clone().begin(&authed).await?;
-        script_path_to_payload(script_path, &mut *tx, &workspace_id, Some(false)).await?
-    };
-
-    check_tag_available_for_workspace(&db, &workspace_id, &tag, &authed).await?;
-
-    let (email, permissioned_as, push_authed, tx) =
-        if let Some(on_behalf_of) = on_behalf_of.as_ref() {
-            (
-                on_behalf_of.email.as_str(),
-                on_behalf_of.permissioned_as.clone(),
-                None,
-                PushIsolationLevel::IsolatedRoot(db.clone()),
-            )
-        } else {
-            (
-                authed.email.as_str(),
-                username_to_permissioned_as(&authed.username),
-                Some(authed.clone().into()),
-                PushIsolationLevel::Isolated(user_db, authed.clone().into()),
-            )
-        };
-
-    let push_args = PushArgs { args: &args.args, extra: args.extra };
-
-    let retryable_job_payload = match job_payload {
-        JobPayload::ScriptHash {
-            hash,
-            path,
-            custom_concurrency_key,
-            concurrent_limit,
-            concurrency_time_window_s,
-            cache_ttl,
-            priority,
-            apply_preprocessor,
-            ..
-        } => JobPayload::SingleScriptFlow {
-            path,
-            hash,
-            args: HashMap::from(&push_args),
-            retry,
-            error_handler_path,
-            error_handler_args,
-            custom_concurrency_key,
-            concurrent_limit,
-            concurrency_time_window_s,
-            cache_ttl,
-            priority,
-            tag_override: tag.clone(),
-            apply_preprocessor,
-            trigger_path: Some(trigger_path),
-        },
-        _ => {
-            return Err(windmill_common::error::Error::internal_err(format!(
-                "Unsupported job payload: {:?}",
-                job_payload
-            )))
-        }
-    };
-
-    let (uuid, tx) = push(
-        &db,
-        tx,
-        &workspace_id,
-        retryable_job_payload,
-        push_args,
-        authed.display_username(),
-        email,
-        permissioned_as,
-        authed.token_prefix.as_deref(),
-        None,
-        None,
-        None,
-        None,
-        None,
-        false,
-        false,
-        None,
-        true,
-        tag,
-        timeout,
-        None,
-        None,
-        push_authed.as_ref(),
-    )
-    .await?;
-    tx.commit().await?;
-
-    Ok((uuid, delete_after_use))
-}

backend/windmill-api/src/users.rs

@@ -1280,7 +1280,10 @@ async fn join_workspace<'c>(
     Ok((tx, username))
 }
 
-async fn leave_instance(Extension(db): Extension<DB>, authed: ApiAuthed) -> Result<String> {
+async fn leave_instance(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+) -> Result<String> {
     let mut tx = db.begin().await?;
     sqlx::query!("DELETE FROM password WHERE email = $1", &authed.email)
         .execute(&mut *tx)
@@ -2640,15 +2643,6 @@ async fn update_username_in_workpsace<'c>(
     ).execute(&mut **tx)
     .await?;
 
-    sqlx::query!(
-        r#"UPDATE asset SET usage_path = REGEXP_REPLACE(usage_path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE usage_path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
-        new_username,
-        old_username,
-        w_id
-    )
-    .execute(&mut **tx)
-    .await?;
-
     sqlx::query!(
         r#"UPDATE flow_node SET path = REGEXP_REPLACE(path,'u/' || $2 || '/(.*)','u/' || $1 || '/\1') WHERE path LIKE ('u/' || $2 || '/%') AND workspace_id = $3"#,
         new_username,

backend/windmill-api/src/websocket_triggers.rs

@@ -19,6 +19,7 @@ use sqlx::types::Json as SqlxJson;
 use std::{collections::HashMap, fmt};
 use tokio::net::TcpStream;
 use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream};
+use uuid::Uuid;
 use windmill_audit::{audit_oss::audit_log, ActionKind};
 use windmill_common::{
     db::UserDB,
@@ -34,7 +35,10 @@ use windmill_queue::PushArgsOwned;
 use crate::{
     capture::{insert_capture_payload, WebsocketTriggerConfig},
     db::{ApiAuthed, DB},
-    trigger_helpers::{trigger_runnable, trigger_runnable_and_wait_for_raw_result, TriggerJobArgs},
+    jobs::{
+        run_flow_by_path_inner, run_script_by_path_inner, run_wait_result_internal, RunJobQuery,
+    },
+    trigger_helpers::TriggerJobArgs,
     users::fetch_api_authed,
 };
 
@@ -63,9 +67,6 @@ struct NewWebsocketTrigger {
     initial_messages: Option<Vec<Box<RawValue>>>,
     url_runnable_args: Option<Box<RawValue>>,
     can_return_message: bool,
-    error_handler_path: Option<String>,
-    error_handler_args: Option<SqlxJson<HashMap<String, Box<RawValue>>>>,
-    retry: Option<SqlxJson<windmill_common::flows::Retry>>,
 }
 
 #[derive(Deserialize)]
@@ -111,12 +112,6 @@ pub struct WebsocketTrigger {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub url_runnable_args: Option<SqlxJson<Box<RawValue>>>,
     pub can_return_message: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error_handler_args: Option<SqlxJson<HashMap<String, Box<RawValue>>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub retry: Option<SqlxJson<windmill_common::flows::Retry>>,
 }
 
 #[derive(Deserialize)]
@@ -129,9 +124,6 @@ struct EditWebsocketTrigger {
     initial_messages: Option<Vec<Box<RawValue>>>,
     url_runnable_args: Option<Box<RawValue>>,
     can_return_message: bool,
-    error_handler_path: Option<String>,
-    error_handler_args: Option<SqlxJson<HashMap<String, Box<RawValue>>>>,
-    retry: Option<SqlxJson<windmill_common::flows::Retry>>,
 }
 
 #[derive(Deserialize)]
@@ -223,47 +215,22 @@ async fn create_websocket_trigger(
         .into_iter()
         .map(SqlxJson)
         .collect_vec();
-    sqlx::query!(
-        r#"
-        INSERT INTO websocket_trigger (
-            workspace_id,
-            path,
-            url,
-            script_path,
-            is_flow,
-            enabled,
-            filters,
-            initial_messages,
-            url_runnable_args,
-            edited_by,
-            can_return_message,
-            email,
-            edited_at,
-            error_handler_path,
-            error_handler_args,
-            retry
-        ) VALUES (
-            $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now(), $13, $14, $15
-        )
-        "#,
-        w_id,
-        ct.path,
-        ct.url,
-        ct.script_path,
-        ct.is_flow,
-        ct.enabled.unwrap_or(true),
-        &filters as _,
-        &initial_messages as _,
-        ct.url_runnable_args.map(SqlxJson) as _,
-        authed.username,
-        ct.can_return_message,
-        authed.email,
-        ct.error_handler_path,
-        ct.error_handler_args as _,
-        ct.retry as _
+    sqlx::query_as::<_, WebsocketTrigger>(
+      "INSERT INTO websocket_trigger (workspace_id, path, url, script_path, is_flow, enabled, filters, initial_messages, url_runnable_args, edited_by, can_return_message, email, edited_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now()) RETURNING *",
     )
-    .execute(&mut *tx)
-    .await?;
+    .bind(&w_id)
+    .bind(&ct.path)
+    .bind(ct.url)
+    .bind(ct.script_path)
+    .bind(ct.is_flow)
+    .bind(ct.enabled.unwrap_or(true))
+    .bind(filters.as_slice())
+    .bind(initial_messages.as_slice())
+    .bind(ct.url_runnable_args.map(SqlxJson))
+    .bind(&authed.username)
+    .bind(ct.can_return_message)
+    .bind(&authed.email)
+    .fetch_one(&mut *tx).await?;
 
     audit_log(
         &mut *tx,
@@ -312,7 +279,7 @@ async fn update_websocket_trigger(
 
     // important to update server_id to NULL to stop current websocket listener
     sqlx::query!(
-        "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, initial_messages = $6, url_runnable_args = $7, edited_by = $8, email = $9, can_return_message = $10, edited_at = now(), server_id = NULL, error = NULL, error_handler_path = $13, error_handler_args = $14, retry = $15
+        "UPDATE websocket_trigger SET url = $1, script_path = $2, path = $3, is_flow = $4, filters = $5, initial_messages = $6, url_runnable_args = $7, edited_by = $8, email = $9, can_return_message = $10, edited_at = now(), server_id = NULL, error = NULL
             WHERE workspace_id = $11 AND path = $12",
         ct.url,
         ct.script_path,
@@ -326,9 +293,6 @@ async fn update_websocket_trigger(
         ct.can_return_message,
         w_id,
         path,
-        ct.error_handler_path,
-        ct.error_handler_args as _,
-        ct.retry as _,
     )
     .execute(&mut *tx).await?;
 
@@ -672,6 +636,87 @@ fn raw_value_to_args_hashmap(
     Ok(args)
 }
 
+async fn wait_runnable_result(
+    path: String,
+    is_flow: bool,
+    args: PushArgsOwned,
+    authed: ApiAuthed,
+    db: &DB,
+    workspace_id: &str,
+) -> error::Result<String> {
+    let user_db = UserDB::new(db.clone());
+
+    let username = authed.display_username().to_owned();
+
+    let (job_id, early_return) = if is_flow {
+        let (_, job_id) = run_flow_by_path_inner(
+            authed,
+            db.clone(),
+            user_db,
+            workspace_id.to_string(),
+            StripPath(path.clone()),
+            RunJobQuery::default(),
+            args,
+        )
+        .await?;
+
+        let early_return = sqlx::query_scalar!(
+            r#"SELECT flow_version.value->>'early_return' as early_return
+            FROM flow 
+            LEFT JOIN flow_version
+                ON flow_version.id = flow.versions[array_upper(flow.versions, 1)]
+            WHERE flow.path = $1 and flow.workspace_id = $2"#,
+            path,
+            workspace_id,
+        )
+        .fetch_optional(db)
+        .await?
+        .flatten();
+
+        (job_id, early_return)
+    } else {
+        let (_, job_id) = run_script_by_path_inner(
+            authed,
+            db.clone(),
+            user_db,
+            workspace_id.to_string(),
+            StripPath(path.clone()),
+            RunJobQuery::default(),
+            args,
+        )
+        .await?;
+
+        (job_id, None)
+    };
+
+    let (result, success) = run_wait_result_internal(
+        db,
+        Uuid::parse_str(&job_id).unwrap(),
+        workspace_id.to_string(),
+        early_return,
+        &username,
+    )
+    .await
+    .with_context(|| {
+        format!(
+            "Error fetching job result for {} {}",
+            if is_flow { "flow" } else { "script" },
+            path
+        )
+    })?;
+
+    if !success {
+        Err(anyhow::anyhow!(
+            "{} {path} failed: {:?}",
+            if is_flow { "Flow" } else { "Script" },
+            result
+        )
+        .into())
+    } else {
+        Ok(result.get().to_owned())
+    }
+}
+
 async fn loop_ping(db: &DB, ws: &WebsocketEnum, error: Option<&str>) -> () {
     loop {
         if let None = ws.update_ping(db, error).await {
@@ -697,22 +742,17 @@ async fn get_url_from_runnable(
 
     let args = raw_value_to_args_hashmap(args)?;
 
-    let result = trigger_runnable_and_wait_for_raw_result(
-        db,
-        None,
-        authed,
-        workspace_id,
-        path,
+    let result = wait_runnable_result(
+        path.to_string(),
         is_flow,
         PushArgsOwned { args, extra: None },
-        None,
-        None,
-        None,
-        "".to_string(), // doesn't matter as no retry/error handler
+        authed,
+        db,
+        workspace_id,
     )
     .await?;
 
-    serde_json::from_str::<String>(result.get()).map_err(|_| {
+    serde_json::from_str::<String>(result.as_str()).map_err(|_| {
         error::Error::BadConfig(format!(
             "{} {} did not return a string",
             if is_flow { "Flow" } else { "Script" },
@@ -826,7 +866,6 @@ impl WebsocketTrigger {
             .filter_map(|m| serde_json::from_str(m.get()).ok())
             .collect_vec();
 
-        let mut authed_o = None;
         for start_message in initial_messages {
             match start_message {
                 InitialMessage::RawMessage(msg) => {
@@ -856,26 +895,15 @@ impl WebsocketTrigger {
 
                     let args = raw_value_to_args_hashmap(Some(&args))?;
 
-                    if authed_o.is_none() {
-                        authed_o = Some(self.fetch_authed(db).await?);
-                    }
-                    let authed = authed_o.clone().unwrap();
-
-                    let result = trigger_runnable_and_wait_for_raw_result(
-                        db,
-                        None,
-                        authed.clone(),
-                        &self.workspace_id,
-                        &path,
+                    let result = wait_runnable_result(
+                        path.clone(),
                         is_flow,
                         PushArgsOwned { args, extra: None },
-                        None,
-                        None,
-                        None,
-                        "".to_string(), // doesn't matter as no retry/error handler
+                        self.fetch_authed(db).await?,
+                        db,
+                        &self.workspace_id,
                     )
-                    .await
-                    .map(|r| r.get().to_owned())?;
+                    .await?;
 
                     tracing::info!(
                         "Sending {} {} result to WebSocket {}",
@@ -1370,29 +1398,20 @@ async fn run_job(
         let script_path = trigger.script_path.clone();
         let is_flow = trigger.is_flow;
         let w_id = trigger.workspace_id.clone();
-        let retry = trigger.retry.clone();
-        let error_handler_path = trigger.error_handler_path.clone();
-        let error_handler_args = trigger.error_handler_args.clone();
-        let trigger_path = trigger.path.clone();
         let handle_response_f = async move {
             tokio::select! {
                 _ = killpill_rx.recv() => {
                     return;
                 },
-                result = trigger_runnable_and_wait_for_raw_result(
-                    &db_,
-                    None,
-                    authed,
-                    &w_id,
-                    &script_path,
+                result = wait_runnable_result(
+                    script_path,
                     is_flow,
                     args,
-                    retry.as_ref(),
-                    error_handler_path.as_deref(),
-                    error_handler_args.as_ref(),
-                    format!("websocket_trigger/{}", trigger_path),
+                    authed,
+                    &db_,
+                    &w_id,
                 ) => {
-                    if let Ok(result) = result.map(|r| r.get().to_owned()) {
+                    if let Ok(result) = result  {
                         // only send the result if it's not null
                         if result != "null" {
                             tracing::info!("Sending job result to WebSocket {}", url);
@@ -1410,20 +1429,32 @@ async fn run_job(
 
         tokio::spawn(handle_response_f);
     } else {
-        trigger_runnable(
-            db,
-            None,
-            authed,
-            &trigger.workspace_id,
-            &trigger.script_path,
-            trigger.is_flow,
-            args,
-            trigger.retry.as_ref(),
-            trigger.error_handler_path.as_deref(),
-            trigger.error_handler_args.as_ref(),
-            format!("websocket_trigger/{}", trigger.path),
-        )
-        .await?;
+        let user_db = UserDB::new(db.clone());
+        let run_query = RunJobQuery::default();
+        let runnable_path = StripPath(trigger.script_path.to_owned());
+        if trigger.is_flow {
+            run_flow_by_path_inner(
+                authed,
+                db.clone(),
+                user_db,
+                trigger.workspace_id.clone(),
+                runnable_path,
+                run_query,
+                args,
+            )
+            .await?;
+        } else {
+            run_script_by_path_inner(
+                authed,
+                db.clone(),
+                user_db,
+                trigger.workspace_id.clone(),
+                runnable_path,
+                run_query,
+                args,
+            )
+            .await?;
+        }
     }
 
     Ok(())

backend/windmill-api/src/workspaces.rs

@@ -99,10 +99,6 @@ pub fn workspaced_service() -> Router {
         .route("/edit_webhook", post(edit_webhook))
         .route("/edit_auto_invite", post(edit_auto_invite))
         .route("/edit_deploy_to", post(edit_deploy_to))
-        .route(
-            "/get_secondary_storage_names",
-            get(get_secondary_storage_names),
-        )
         .route("/tarball", get(crate::workspaces_export::tarball_workspace))
         .route("/is_premium", get(is_premium))
         .route("/edit_copilot_config", post(edit_copilot_config))
@@ -584,21 +580,6 @@ async fn run_slack_message_test_job(
     }))
 }
 
-async fn get_secondary_storage_names(
-    _authed: ApiAuthed,
-    Extension(db): Extension<DB>,
-    Path(w_id): Path<String>,
-) -> JsonResult<Vec<String>> {
-    let result: Vec<String> = sqlx::query_scalar!(
-        "SELECT jsonb_object_keys(large_file_storage->'secondary_storage') AS \"secondary_storage_name!: _\"
-        FROM workspace_settings WHERE workspace_id = $1",
-        &w_id
-    )
-    .fetch_all(&db)
-    .await?;
-    Ok(Json(result))
-}
-
 #[cfg(feature = "enterprise")]
 async fn edit_deploy_to(
     authed: ApiAuthed,
@@ -2195,7 +2176,6 @@ struct ChangeOperatorSettings {
     schedules: bool,
     resources: bool,
     variables: bool,
-    assets: bool,
     triggers: bool,
     audit_logs: bool,
     groups: bool,

backend/windmill-api/src/workspaces_export.rs

@@ -560,10 +560,7 @@ pub(crate) async fn tarball_workspace(
                     static_asset_config AS "static_asset_config: _", 
                     is_static_website,
                     wrap_body,
-                    raw_string,
-                    error_handler_path,
-                    error_handler_args as "error_handler_args: _",
-                    retry as "retry: _"
+                    raw_string
                 FROM http_trigger
                 WHERE workspace_id = $1
                 "#,
@@ -602,10 +599,7 @@ pub(crate) async fn tarball_workspace(
                     filters AS "filters: _",
                     initial_messages AS "initial_messages: _",
                     url_runnable_args AS "url_runnable_args: _",
-                    can_return_message,
-                    error_handler_path,
-                    error_handler_args as "error_handler_args: _",
-                    retry as "retry: _"
+                    can_return_message
                 FROM 
                     websocket_trigger
                 WHERE 
@@ -631,27 +625,8 @@ pub(crate) async fn tarball_workspace(
         {
             let kafka_triggers = sqlx::query_as!(
                 crate::kafka_triggers_oss::KafkaTrigger,
-                r#"SELECT 
-                    workspace_id,
-                    path,
-                    kafka_resource_path,
-                    group_id,
-                    topics,
-                    script_path,
-                    is_flow,
-                    edited_by,
-                    email,
-                    edited_at,
-                    server_id,
-                    last_server_ping,
-                    extra_perms,
-                    error,
-                    enabled,
-                    error_handler_path,
-                    error_handler_args as "error_handler_args: _",
-                    retry as "retry: _" 
-                 FROM kafka_trigger
-                 WHERE workspace_id = $1"#,
+                "SELECT * FROM kafka_trigger
+                 WHERE workspace_id = $1",
                 &w_id
             )
             .fetch_all(&mut *tx)
@@ -689,10 +664,7 @@ pub(crate) async fn tarball_workspace(
                     last_server_ping,
                     extra_perms,
                     error,
-                    enabled,
-                    error_handler_path,
-                    error_handler_args as "error_handler_args: _",
-                    retry as "retry: _"
+                    enabled
                 FROM 
                     sqs_trigger
                 WHERE 
@@ -734,10 +706,7 @@ pub(crate) async fn tarball_workspace(
                     last_server_ping,
                     extra_perms,
                     error,
-                    enabled,
-                    error_handler_path,
-                    error_handler_args as "error_handler_args: _",
-                    retry as "retry: _"
+                    enabled
                 FROM 
                     gcp_trigger
                 WHERE 
@@ -760,29 +729,8 @@ pub(crate) async fn tarball_workspace(
         {
             let nats_triggers = sqlx::query_as!(
                 crate::nats_triggers_oss::NatsTrigger,
-                r#"SELECT 
-                    workspace_id,
-                    path,
-                    nats_resource_path,
-                    subjects,
-                    stream_name,
-                    consumer_name,
-                    use_jetstream,
-                    script_path,
-                    is_flow,
-                    edited_by,
-                    email,
-                    edited_at,
-                    server_id,
-                    last_server_ping,
-                    extra_perms,
-                    error,
-                    enabled,
-                    error_handler_path,
-                    error_handler_args as "error_handler_args: _",
-                    retry as "retry: _"
-                 FROM nats_trigger
-                 WHERE workspace_id = $1"#,
+                "SELECT * FROM nats_trigger
+                 WHERE workspace_id = $1",
                 &w_id
             )
             .fetch_all(&mut *tx)
@@ -801,27 +749,8 @@ pub(crate) async fn tarball_workspace(
         {
             let postgres_triggers = sqlx::query_as!(
                 crate::postgres_triggers::PostgresTrigger,
-                r#"SELECT 
-                    workspace_id,
-                    path,
-                    script_path,
-                    is_flow,
-                    edited_by,
-                    email,
-                    edited_at,
-                    server_id,
-                    last_server_ping,
-                    extra_perms,
-                    error,
-                    enabled,
-                    replication_slot_name,
-                    publication_name,
-                    postgres_resource_path,
-                    error_handler_path,
-                    error_handler_args as "error_handler_args: _",
-                    retry as "retry: _" 
-                FROM postgres_trigger
-                WHERE workspace_id = $1"#,
+                "SELECT * FROM postgres_trigger
+                 WHERE workspace_id = $1",
                 &w_id
             )
             .fetch_all(&mut *tx)
@@ -861,10 +790,7 @@ pub(crate) async fn tarball_workspace(
                     last_server_ping,
                     extra_perms,
                     error,
-                    enabled,
-                    error_handler_path,
-                    error_handler_args as "error_handler_args: _",
-                    retry as "retry: _"
+                    enabled
                 FROM 
                     mqtt_trigger
                 "#,