all

.github/workflows/git-commands.yaml

@@ -88,8 +88,6 @@ jobs:
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
-          git config pull.rebase true
-          git pull origin ${{ env.BRANCH_NAME }}
           git add backend/.sqlx
           git commit -m "Update SQLx metadata"
           git push origin ${{ env.BRANCH_NAME }}
@@ -160,8 +158,6 @@ jobs:
           git checkout $BRANCH_NAME
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
-          git config pull.rebase true
-          git pull origin $BRANCH_NAME
           git add backend/ee-repo-ref.txt
           git commit -m "Update ee-repo-ref.txt" || echo "No changes to commit"
           git push origin $BRANCH_NAME

.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,113 +1,5 @@
 # Changelog
 
-## [1.506.0](https://github.com/windmill-labs/windmill/compare/v1.505.4...v1.506.0) (2025-07-15)
-
-
-### Features
-
-* add oauth client_credentials support ([#6110](https://github.com/windmill-labs/windmill/issues/6110)) ([d562625](https://github.com/windmill-labs/windmill/commit/d562625474260d16699329884dd6c3b890f808ad))
-* **frontend:** app static and user resource picker default values ([#6179](https://github.com/windmill-labs/windmill/issues/6179)) ([b58c46a](https://github.com/windmill-labs/windmill/commit/b58c46a50452bce098695f52220946f87d62f840))
-
-## [1.505.4](https://github.com/windmill-labs/windmill/compare/v1.505.3...v1.505.4) (2025-07-14)
-
-
-### Bug Fixes
-
-* retry telemetry and renewal ([#6175](https://github.com/windmill-labs/windmill/issues/6175)) ([00ab0e8](https://github.com/windmill-labs/windmill/commit/00ab0e8f3883d2ef884438a957b8d26a4672836d))
-
-## [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-115544a96173f9cb1d27757e7b931fb27912cfd05ba768a42cf9b3dfd7205e9a.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-1488e1b5007752e1ebae4235ad04c398fe6398745e16fd119008b8ea67662416.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-299e16725162888c01712f371785199960264b54c1ddf928c0c654ab15176f63.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55.json

@@ -15,7 +15,7 @@
       ]
     },
     "nullable": [
-      null
+      true
     ]
   },
   "hash": "5a219a2532517869578c4504ff3153c43903f929ae5d62fbba12610f89c36d55"

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-5bd8ae8d694ac9f6afef762276141d95ba195f5543120e76e68f6e6715b65a71.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

backend/.sqlx/query-6b776693091191f36eaf9e35fb3cabb01481a19bef5a956dc36cac41acad0e53.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-74d928f4c3f0de191f414471b9a4fbe9c20f9685b06ad5bbded424948b2dc88c.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-92c2b66eb6287449f5f8cc9f8d1329f748006ab131489d2fcac21d32641bb633.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

backend/.sqlx/query-92e60af0d3ae8c73d74ae68d70e20ae18f79cc84626097b766307cd42722baa3.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-99a2c935acf5d6bbeb70ea1255679115b6e9042800d40899a36b3867049c5c46.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-b9d57959f2696f74e9d24f55fb78ff9e9041ab84b896a8b980df7b550ef27a22.json

@@ -1,47 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT client, refresh_token, grant_type, cc_client_id, cc_client_secret FROM account WHERE workspace_id = $1 AND id = $2",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "client",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "refresh_token",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "grant_type",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "cc_client_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 4,
-        "name": "cc_client_secret",
-        "type_info": "Varchar"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Int4"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true
-    ]
-  },
-  "hash": "b9d57959f2696f74e9d24f55fb78ff9e9041ab84b896a8b980df7b550ef27a22"
-}

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-bfff3d8df18db198d6ebba8a049b00147fc8bcd42f3df37ef81b9ded80974bd0.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-cac594031a21b4806de9c4616317d3541522ef9712a83ecff7bd8b5f6e870748.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE account SET refresh_token = $1, expires_at = $2, refresh_error = NULL WHERE workspace_id = $3 AND id = $4",
+  "query": "UPDATE account SET refresh_token = $1, expires_at = $2 WHERE workspace_id = $3 AND id = $4",
   "describe": {
     "columns": [],
     "parameters": {
@@ -13,5 +13,5 @@
     },
     "nullable": []
   },
-  "hash": "db9831a3218b36c32b305b9f2ba21abceec74c9c277f27231dba12868e68126b"
+  "hash": "cac594031a21b4806de9c4616317d3541522ef9712a83ecff7bd8b5f6e870748"
 }

backend/.sqlx/query-cd5d62d456b74237b941bc72ea8de007185263167bf1dfa2e469d319cc4da674.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-d06efdc24706e0d7479bffc0b19a0c5976ee60125289e9f7b0b04090bce4a3a3.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-d78ecf85c1e1e95650c380c9488aa90d8d8c5c76f3971484e4c515ff60293d3b.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

backend/.sqlx/query-dc649111c4c862c36c26ad8a9eff8c31c2533a4a73184d0276f9a388ff2fa574.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO account (workspace_id, client, expires_at, refresh_token, grant_type, cc_client_id, cc_client_secret) VALUES ($1, $2, now() + ($3 || ' seconds')::interval, $4, $5, $6, $7) RETURNING id",
+  "query": "INSERT INTO account (workspace_id, client, expires_at, refresh_token) VALUES ($1, $2, now() + ($3 || ' seconds')::interval, $4) RETURNING id",
   "describe": {
     "columns": [
       {
@@ -14,9 +14,6 @@
         "Varchar",
         "Varchar",
         "Text",
-        "Varchar",
-        "Varchar",
-        "Varchar",
         "Varchar"
       ]
     },
@@ -24,5 +21,5 @@
       false
     ]
   },
-  "hash": "00418f2e621cbe7aed536cff357898f7250544dfcb3bd85d314af1058f3148d8"
+  "hash": "dc649111c4c862c36c26ad8a9eff8c31c2533a4a73184d0276f9a388ff2fa574"
 }

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-f16b00bad2880f896f4452e5894fe101cd5c2fe3e4c143c0b979668143d85dd2.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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-fbe14569717b4c4937b74e6dc6f6b4ea29a2b0c2b1cde48ef06d687f6f9e8f15.json

@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT client, refresh_token FROM account WHERE workspace_id = $1 AND id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "client",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "refresh_token",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int4"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "fbe14569717b4c4937b74e6dc6f6b4ea29a2b0c2b1cde48ef06d687f6f9e8f15"
+}

backend/.sqlx/query-fc932ecf697b921fe9143c36872e9cc4e9aca7f9129b0466aacae51334a3db96.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],

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.506.0"
+version = "1.502.2"
 authors.workspace = true
 edition.workspace = true
 
@@ -32,7 +32,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.506.0"
+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 @@
-22aa4778f97d034e5faea8b8d8c971c89ce74137
+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/20250630164531_client_credentials_oauth.down.sql

@@ -1,4 +0,0 @@
--- Rollback client_credentials OAuth flow support
-ALTER TABLE account DROP COLUMN IF EXISTS grant_type;
-ALTER TABLE account DROP COLUMN IF EXISTS cc_client_id;
-ALTER TABLE account DROP COLUMN IF EXISTS cc_client_secret;

backend/migrations/20250630164531_client_credentials_oauth.up.sql

@@ -1,10 +0,0 @@
--- Add support for client_credentials OAuth flow
--- Add grant_type column to distinguish between OAuth flows for backwards compatibility
-ALTER TABLE account ADD COLUMN grant_type VARCHAR(50) NOT NULL DEFAULT 'authorization_code';
-
--- Add client_id and client_secret columns for resource-level client credentials
--- These are used when grant_type = 'client_credentials' and user wants to use resource-level credentials
--- instead of instance-level credentials configured by admin
-ALTER TABLE account
-ADD COLUMN cc_client_id VARCHAR(500),
-ADD COLUMN cc_client_secret VARCHAR(500);

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,