windmill-cli 1.458.3 → 1.460.0

package/esm/gen/core/OpenAPI.js

@@ -32,7 +32,7 @@ export const OpenAPI = {
     PASSWORD: undefined,
     TOKEN: getEnv("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: '1.458.3',
+    VERSION: '1.460.0',
     WITH_CREDENTIALS: true,
     interceptors: {
         request: new Interceptors(),

package/esm/gen/services.gen.js

@@ -6772,6 +6772,25 @@ export const setPostgresTriggerEnabled = (data) => {
         mediaType: 'application/json'
     });
 };
+/**
+ * test postgres connection
+ * @param data The data for the request.
+ * @param data.workspace
+ * @param data.requestBody test postgres connection
+ * @returns string successfuly connected to postgres
+ * @throws ApiError
+ */
+export const testPostgresConnection = (data) => {
+    return __request(OpenAPI, {
+        method: 'POST',
+        url: '/w/{workspace}/postgres_triggers/test',
+        path: {
+            workspace: data.workspace
+        },
+        body: data.requestBody,
+        mediaType: 'application/json'
+    });
+};
 /**
  * list instance groups
  * @returns InstanceGroup instance group list

package/esm/instance.js

@@ -250,6 +250,7 @@ async function instancePull(opts) {
                 baseUrl: undefined,
                 includeGroups: true,
                 includeSchedules: true,
+                includeTriggers: true,
                 includeSettings: true,
                 includeUsers: true,
                 includeKey: true,
@@ -382,6 +383,7 @@ async function instancePush(opts) {
                 baseUrl: undefined,
                 includeGroups: true,
                 includeSchedules: true,
+                includeTriggers: true,
                 includeSettings: true,
                 includeUsers: true,
                 includeKey: true,

package/esm/main.js

@@ -13,6 +13,7 @@ import variable from "./variable.js";
 import hub from "./hub.js";
 import folder from "./folder.js";
 import schedule from "./schedule.js";
+import trigger from "./trigger.js";
 import sync from "./sync.js";
 import instance from "./instance.js";
 import workerGroups from "./worker_groups.js";
@@ -26,14 +27,14 @@ import { pull, push } from "./sync.js";
 import { add as workspaceAdd } from "./workspace.js";
 import workers from "./workers.js";
 import queues from "./queues.js";
-export { flow, app, script, workspace, resource, user, variable, hub, folder, schedule, sync, instance, dev, hubPull, pull, push, workspaceAdd, };
+export { flow, app, script, workspace, resource, user, variable, hub, folder, schedule, trigger, sync, instance, dev, hubPull, pull, push, workspaceAdd, };
 // addEventListener("error", (event) => {
 //   if (event.error) {
 //     console.error("Error details of: " + event.error.message);
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.458.3";
+export const VERSION = "1.460.0";
 const command = new Command()
     .name("wmill")
     .action(() => log.info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`))
@@ -60,6 +61,7 @@ const command = new Command()
         skipResources: true,
         skipSecrets: true,
         includeSchedules: false,
+        includeTriggers: false,
     }));
     log.info(colors.green("wmill.yaml created"));
 })
@@ -73,6 +75,7 @@ const command = new Command()
     .command("hub", hub)
     .command("folder", folder)
     .command("schedule", schedule)
+    .command("trigger", trigger)
     .command("dev", dev)
     .command("sync", sync)
     .command("instance", instance)

package/esm/pull.js

@@ -1,6 +1,6 @@
 import { colors, Command, JSZip, log } from "./deps.js";
 import { getHeaders } from "./utils.js";
-export async function downloadZip(workspace, plainSecrets, skipVariables, skipResources, skipSecrets, includeSchedules, includeUsers, includeGroups, includeSettings, includeKey, defaultTs) {
+export async function downloadZip(workspace, plainSecrets, skipVariables, skipResources, skipSecrets, includeSchedules, includeTriggers, includeUsers, includeGroups, includeSettings, includeKey, defaultTs) {
     const requestHeaders = new Headers();
     requestHeaders.set("Authorization", "Bearer " + workspace.token);
     requestHeaders.set("Content-Type", "application/octet-stream");
@@ -13,7 +13,7 @@ export async function downloadZip(workspace, plainSecrets, skipVariables, skipRe
     const zipResponse = await fetch(workspace.remote +
         "api/w/" +
         workspace.workspaceId +
-        `/workspaces/tarball?archive_type=zip&plain_secret=${plainSecrets ?? false}&skip_variables=${skipVariables ?? false}&skip_resources=${skipResources ?? false}&skip_secrets=${skipSecrets ?? false}&include_schedules=${includeSchedules ?? false}&include_users=${includeUsers ?? false}&include_groups=${includeGroups ?? false}&include_settings=${includeSettings ?? false}&include_key=${includeKey ?? false}&default_ts=${defaultTs ?? "bun"}`, {
+        `/workspaces/tarball?archive_type=zip&plain_secret=${plainSecrets ?? false}&skip_variables=${skipVariables ?? false}&skip_resources=${skipResources ?? false}&skip_secrets=${skipSecrets ?? false}&include_schedules=${includeSchedules ?? false}&include_triggers=${includeTriggers ?? false}&include_users=${includeUsers ?? false}&include_groups=${includeGroups ?? false}&include_settings=${includeSettings ?? false}&include_key=${includeKey ?? false}&default_ts=${defaultTs ?? "bun"}`, {
         headers: requestHeaders,
         method: "GET",
     });

package/esm/settings.js

@@ -51,6 +51,9 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             default_app: remoteSettings.default_app,
             default_scripts: remoteSettings.default_scripts,
             name: workspaceName,
+            mute_critical_alerts: remoteSettings.mute_critical_alerts,
+            color: remoteSettings.color,
+            operator_settings: remoteSettings.operator_settings,
         };
     }
     catch (err) {
@@ -120,9 +123,9 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             },
         });
     }
-    if (localSettings.error_handler !== settings.error_handler ||
+    if (localSettings.error_handler != settings.error_handler ||
         !deepEqual(localSettings.error_handler_extra_args, settings.error_handler_extra_args) ||
-        localSettings.error_handler_muted_on_cancel !==
+        localSettings.error_handler_muted_on_cancel !=
             settings.error_handler_muted_on_cancel) {
         log.debug(`Updating error handler...`);
         await wmill.editErrorHandler({
@@ -134,7 +137,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             },
         });
     }
-    if (localSettings.deploy_to !== settings.deploy_to) {
+    if (localSettings.deploy_to != settings.deploy_to) {
         log.debug(`Updating deploy to...`);
         await wmill.editDeployTo({
             workspace,
@@ -168,7 +171,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             requestBody: localSettings.default_scripts,
         });
     }
-    if (localSettings.default_app !== settings.default_app) {
+    if (localSettings.default_app != settings.default_app) {
         log.debug(`Updating default app...`);
         await wmill.editWorkspaceDefaultApp({
             workspace,
@@ -177,7 +180,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             },
         });
     }
-    if (localSettings.name !== settings.name) {
+    if (localSettings.name != settings.name) {
         log.debug(`Updating workspace name...`);
         await wmill.changeWorkspaceName({
             workspace,
@@ -186,6 +189,31 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             },
         });
     }
+    if (localSettings.mute_critical_alerts != settings.mute_critical_alerts) {
+        log.debug(`Updating mute critical alerts...`);
+        await wmill.workspaceMuteCriticalAlertsUi({
+            workspace,
+            requestBody: {
+                mute_critical_alerts: localSettings.mute_critical_alerts,
+            },
+        });
+    }
+    if (localSettings.color != settings.color) {
+        log.debug(`Updating workspace color...`);
+        await wmill.changeWorkspaceColor({
+            workspace,
+            requestBody: {
+                color: localSettings.color,
+            },
+        });
+    }
+    if (localSettings.operator_settings != settings.operator_settings) {
+        log.debug(`Updating operator settings...`);
+        await wmill.updateOperatorSettings({
+            workspace,
+            requestBody: localSettings.operator_settings,
+        });
+    }
 }
 export async function pushWorkspaceKey(workspace, _path, key, localKey) {
     try {

package/esm/sync.js

@@ -68,7 +68,7 @@ async function addCodebaseDigestIfRelevant(path, content, codebases) {
             const parsed = yamlParseContent(path, content);
             if (parsed && typeof parsed == "object") {
                 parsed["codebase"] = c.digest;
-                parsed["lock"] = '';
+                parsed["lock"] = "";
                 return yamlStringify(parsed, yamlOptions);
             }
             else {
@@ -514,6 +514,13 @@ export async function elementsToMap(els, ignore, json, skips) {
         const ext = json ? ".json" : ".yaml";
         if (!skips.includeSchedules && path.endsWith(".schedule" + ext))
             continue;
+        if (!skips.includeTriggers &&
+            (path.endsWith(".http_trigger" + ext) ||
+                path.endsWith(".websocket_trigger" + ext) ||
+                path.endsWith(".kafka_trigger" + ext) ||
+                path.endsWith(".nats_trigger" + ext) ||
+                path.endsWith(".postgres_trigger" + ext)))
+            continue;
         if (!skips.includeUsers && path.endsWith(".user" + ext))
             continue;
         if (!skips.includeGroups && path.endsWith(".group" + ext))
@@ -649,13 +656,20 @@ async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetada
                     continue;
                 }
             }
-            changes.push({ name: "edited", path: k, after: v, before: m2[k], codebase: codebaseChanges[k] });
+            changes.push({
+                name: "edited",
+                path: k,
+                after: v,
+                before: m2[k],
+                codebase: codebaseChanges[k],
+            });
         }
     }
     const remoteCodebase = {};
     for (const [k] of Object.entries(m2)) {
         if (m1[k] === undefined) {
-            if (!ignoreMetadataDeletion || (!k?.endsWith(".script.yaml") && !k?.endsWith(".script.json"))) {
+            if (!ignoreMetadataDeletion ||
+                (!k?.endsWith(".script.yaml") && !k?.endsWith(".script.json"))) {
                 changes.push({ name: "deleted", path: k });
             }
             else if (k?.endsWith(".script.yaml")) {
@@ -668,12 +682,18 @@ async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetada
     }
     for (const [k, v] of Object.entries(remoteCodebase)) {
         const tsFile = k.replace(".script.yaml", ".ts");
-        if (changes.find(c => c.path == tsFile && (c.name == "edited" || c.name == "deleted"))) {
+        if (changes.find((c) => c.path == tsFile && (c.name == "edited" || c.name == "deleted"))) {
             continue;
         }
         let c = findCodebase(tsFile, codebases);
         if (c?.digest != v) {
-            changes.push({ name: "edited", path: tsFile, codebase: v, before: m1[tsFile], after: m2[tsFile] });
+            changes.push({
+                name: "edited",
+                path: tsFile,
+                codebase: v,
+                before: m1[tsFile],
+                after: m2[tsFile],
+            });
         }
     }
     for (const change of changes) {
@@ -716,21 +736,28 @@ function getOrderFromPath(p) {
     else if (typ == "schedule") {
         return 7;
     }
-    else if (typ == "variable") {
+    else if (typ == "http_trigger" ||
+        typ == "websocket_trigger" ||
+        typ == "kafka_trigger" ||
+        typ == "nats_trigger" ||
+        typ == "postgres_trigger") {
         return 8;
     }
-    else if (typ == "user") {
+    else if (typ == "variable") {
         return 9;
     }
-    else if (typ == "group") {
+    else if (typ == "user") {
         return 10;
     }
-    else if (typ == "encryption_key") {
+    else if (typ == "group") {
         return 11;
     }
-    else {
+    else if (typ == "encryption_key") {
         return 12;
     }
+    else {
+        return 13;
+    }
 }
 const isNotWmillFile = (p, isDirectory) => {
     if (p.endsWith(SEP)) {
@@ -867,7 +894,7 @@ export async function pull(opts) {
     catch {
         // ignore
     }
-    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension);
+    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension);
     const local = !opts.stateful
         ? await FSFSElement(dntShim.Deno.cwd(), codebases)
         : await FSFSElement(path.join(dntShim.Deno.cwd(), ".wmill"), []);
@@ -996,7 +1023,9 @@ function prettyChanges(changes) {
             log.info(colors.red(`- ${getTypeStrFromPath(change.path)} ` + change.path));
         }
         else if (change.name === "edited") {
-            log.info(colors.yellow(`~ ${getTypeStrFromPath(change.path)} ` + change.path + (change.codebase ? ` (codebase changed)` : "")));
+            log.info(colors.yellow(`~ ${getTypeStrFromPath(change.path)} ` +
+                change.path +
+                (change.codebase ? ` (codebase changed)` : "")));
             if (change.before != change.after) {
                 showDiff(change.before, change.after);
             }
@@ -1053,7 +1082,7 @@ export async function push(opts) {
     catch {
         // ignore
     }
-    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension);
+    const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension);
     const local = await FSFSElement(path.join(dntShim.Deno.cwd(), ""), codebases);
     const changes = await compareDynFSElement(local, remote, await ignoreF(opts), opts.json ?? false, opts, true, codebases);
     const globalDeps = await findGlobalDeps();
@@ -1113,7 +1142,7 @@ export async function push(opts) {
         // Group changes by base path (before first dot)
         const groupedChanges = new Map();
         for (const change of changes) {
-            const basePath = change.path.split('.')[0];
+            const basePath = change.path.split(".")[0];
             if (!groupedChanges.has(basePath)) {
                 groupedChanges.set(basePath, []);
             }
@@ -1265,6 +1294,36 @@ export async function push(opts) {
                                         path: removeSuffix(target, ".schedule.json"),
                                     });
                                     break;
+                                case "http_trigger":
+                                    await wmill.deleteHttpTrigger({
+                                        workspace: workspaceId,
+                                        path: removeSuffix(target, ".http_trigger.json"),
+                                    });
+                                    break;
+                                case "websocket_trigger":
+                                    await wmill.deleteWebsocketTrigger({
+                                        workspace: workspaceId,
+                                        path: removeSuffix(target, ".websocket_trigger.json"),
+                                    });
+                                    break;
+                                case "kafka_trigger":
+                                    await wmill.deleteKafkaTrigger({
+                                        workspace: workspaceId,
+                                        path: removeSuffix(target, ".kafka_trigger.json"),
+                                    });
+                                    break;
+                                case "nats_trigger":
+                                    await wmill.deleteNatsTrigger({
+                                        workspace: workspaceId,
+                                        path: removeSuffix(target, ".nats_trigger.json"),
+                                    });
+                                    break;
+                                case "postgres_trigger":
+                                    await wmill.deletePostgresTrigger({
+                                        workspace: workspaceId,
+                                        path: removeSuffix(target, ".postgres_trigger.json"),
+                                    });
+                                    break;
                                 case "variable":
                                     await wmill.deleteVariable({
                                         workspace: workspaceId,
@@ -1331,6 +1390,7 @@ const command = new Command()
     .option("--skip-resources", "Skip syncing  resources")
     // .option("--skip-scripts-metadata", "Skip syncing scripts metadata, focus solely on logic")
     .option("--include-schedules", "Include syncing  schedules")
+    .option("--include-triggers", "Include syncing triggers")
     .option("--include-users", "Include syncing users")
     .option("--include-groups", "Include syncing groups")
     .option("--include-settings", "Include syncing workspace settings")
@@ -1350,6 +1410,7 @@ const command = new Command()
     .option("--skip-resources", "Skip syncing  resources")
     // .option("--skip-scripts-metadata", "Skip syncing scripts metadata, focus solely on logic")
     .option("--include-schedules", "Include syncing schedules")
+    .option("--include-triggers", "Include syncing triggers")
     .option("--include-users", "Include syncing users")
     .option("--include-groups", "Include syncing groups")
     .option("--include-settings", "Include syncing workspace settings")

package/esm/trigger.js

@@ -0,0 +1,149 @@
+import * as dntShim from "./_dnt.shims.js";
+import * as wmill from "./gen/services.gen.js";
+import { colors, Command, log, SEP, Table } from "./deps.js";
+import { isSuperset, parseFromFile, removeType, } from "./types.js";
+import { requireLogin } from "./context.js";
+import { validatePath } from "./context.js";
+import { resolveWorkspace } from "./context.js";
+async function getTrigger(triggerType, workspace, path) {
+    const triggerFunctions = {
+        http: wmill.getHttpTrigger,
+        websocket: wmill.getWebsocketTrigger,
+        kafka: wmill.getKafkaTrigger,
+        nats: wmill.getNatsTrigger,
+        postgres: wmill.getPostgresTrigger,
+    };
+    const triggerFunction = triggerFunctions[triggerType];
+    const trigger = await triggerFunction({ workspace, path });
+    return trigger;
+}
+async function updateTrigger(triggerType, workspace, path, trigger) {
+    const triggerFunctions = {
+        http: wmill.updateHttpTrigger,
+        websocket: wmill.updateWebsocketTrigger,
+        kafka: wmill.updateKafkaTrigger,
+        nats: wmill.updateNatsTrigger,
+        postgres: wmill.updatePostgresTrigger,
+    };
+    const triggerFunction = triggerFunctions[triggerType];
+    await triggerFunction({ workspace, path, requestBody: trigger });
+}
+async function createTrigger(triggerType, workspace, path, trigger) {
+    const triggerFunctions = {
+        http: wmill.createHttpTrigger,
+        websocket: wmill.createWebsocketTrigger,
+        kafka: wmill.createKafkaTrigger,
+        nats: wmill.createNatsTrigger,
+        postgres: wmill.createPostgresTrigger,
+    };
+    const triggerFunction = triggerFunctions[triggerType];
+    await triggerFunction({ workspace, path, requestBody: trigger });
+}
+export async function pushTrigger(triggerType, workspace, path, trigger, localTrigger) {
+    path = removeType(path, triggerType + "_trigger").replaceAll(SEP, "/");
+    log.debug(`Processing local ${triggerType} trigger ${path}`);
+    try {
+        trigger = await getTrigger(triggerType, workspace, path);
+        log.debug(`${triggerType} trigger ${path} exists on remote`);
+    }
+    catch {
+        log.debug(`${triggerType} trigger ${path} does not exist on remote`);
+        //ignore
+    }
+    if (trigger) {
+        if (isSuperset(localTrigger, trigger)) {
+            log.debug(`${triggerType} trigger ${path} is up to date`);
+            return;
+        }
+        log.debug(`${triggerType} trigger ${path} is not up-to-date, updating...`);
+        try {
+            await updateTrigger(triggerType, workspace, path, {
+                ...localTrigger,
+                path,
+            });
+        }
+        catch (e) {
+            console.error(e.body);
+            throw e;
+        }
+    }
+    else {
+        console.log(colors.bold.yellow(`Creating new ${triggerType} trigger: ${path}`));
+        try {
+            await createTrigger(triggerType, workspace, path, {
+                ...localTrigger,
+                path,
+            });
+        }
+        catch (e) {
+            console.error(e.body);
+            throw e;
+        }
+    }
+}
+async function list(opts) {
+    const workspace = await resolveWorkspace(opts);
+    await requireLogin(opts);
+    const httpTriggers = await wmill.listHttpTriggers({
+        workspace: workspace.workspaceId,
+    });
+    const websocketTriggers = await wmill.listWebsocketTriggers({
+        workspace: workspace.workspaceId,
+    });
+    const kafkaTriggers = await wmill.listKafkaTriggers({
+        workspace: workspace.workspaceId,
+    });
+    const natsTriggers = await wmill.listNatsTriggers({
+        workspace: workspace.workspaceId,
+    });
+    const postgresTriggers = await wmill.listPostgresTriggers({
+        workspace: workspace.workspaceId,
+    });
+    const triggers = [
+        ...httpTriggers.map((x) => ({ path: x.path, kind: "http" })),
+        ...websocketTriggers.map((x) => ({ path: x.path, kind: "websocket" })),
+        ...kafkaTriggers.map((x) => ({ path: x.path, kind: "kafka" })),
+        ...natsTriggers.map((x) => ({ path: x.path, kind: "nats" })),
+        ...postgresTriggers.map((x) => ({ path: x.path, kind: "postgres" })),
+    ];
+    new Table()
+        .header(["Path", "Kind"])
+        .padding(2)
+        .border(true)
+        .body(triggers.map((x) => [x.path, x.kind]))
+        .render();
+}
+function checkIfValidTrigger(kind) {
+    if (kind &&
+        ["http", "websocket", "kafka", "nats", "postgres"].includes(kind)) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+async function push(opts, filePath, remotePath) {
+    const workspace = await resolveWorkspace(opts);
+    await requireLogin(opts);
+    if (!validatePath(remotePath)) {
+        return;
+    }
+    const fstat = await dntShim.Deno.stat(filePath);
+    if (!fstat.isFile) {
+        throw new Error("file path must refer to a file.");
+    }
+    console.log(colors.bold.yellow("Pushing trigger..."));
+    const triggerKind = filePath.split(".")[1].split("_")[0];
+    if (!checkIfValidTrigger(triggerKind)) {
+        throw new Error("Invalid trigger kind: " + triggerKind);
+    }
+    await pushTrigger(triggerKind, workspace.workspaceId, remotePath, undefined, parseFromFile(filePath));
+    console.log(colors.bold.underline.green("Trigger pushed"));
+}
+const command = new Command()
+    .description("trigger related commands")
+    .action(list)
+    .command("push", "push a local trigger spec. This overrides any remote versions.")
+    .arguments("<file_path:string> <remote_path:string>")
+    .action(push);
+export default command;

package/esm/types.js

@@ -14,6 +14,7 @@ import { pushSchedule } from "./schedule.js";
 import { pushWorkspaceUser } from "./user.js";
 import { pushGroup } from "./user.js";
 import { pushWorkspaceSettings, pushWorkspaceKey } from "./settings.js";
+import { pushTrigger } from "./trigger.js";
 export function isSuperset(subset, superset) {
     return Object.keys(subset).every((key) => {
         const eq = deepEqual(subset[key], superset[key]);
@@ -37,7 +38,7 @@ export function showDiff(local, remote) {
         log.info("Diff too large to display");
         return;
     }
-    for (const part of Diff.diffLines(local ?? '', remote ?? '')) {
+    for (const part of Diff.diffLines(local ?? "", remote ?? "")) {
         if (part.removed) {
             // print red if removed without newline
             finalString += `\x1b[31m${part.value}\x1b[0m`;
@@ -93,6 +94,21 @@ export async function pushObj(workspace, p, befObj, newObj, plainSecrets, alread
     else if (typeEnding === "schedule") {
         await pushSchedule(workspace, p, befObj, newObj);
     }
+    else if (typeEnding === "http_trigger") {
+        await pushTrigger("http", workspace, p, befObj, newObj);
+    }
+    else if (typeEnding === "websocket_trigger") {
+        await pushTrigger("websocket", workspace, p, befObj, newObj);
+    }
+    else if (typeEnding === "kafka_trigger") {
+        await pushTrigger("kafka", workspace, p, befObj, newObj);
+    }
+    else if (typeEnding === "nats_trigger") {
+        await pushTrigger("nats", workspace, p, befObj, newObj);
+    }
+    else if (typeEnding === "postgres_trigger") {
+        await pushTrigger("postgres", workspace, p, befObj, newObj);
+    }
     else if (typeEnding === "user") {
         await pushWorkspaceUser(workspace, p, befObj, newObj);
     }
@@ -159,6 +175,11 @@ export function getTypeStrFromPath(p) {
         typeEnding === "resource-type" ||
         typeEnding === "app" ||
         typeEnding === "schedule" ||
+        typeEnding === "http_trigger" ||
+        typeEnding === "websocket_trigger" ||
+        typeEnding === "kafka_trigger" ||
+        typeEnding === "nats_trigger" ||
+        typeEnding === "postgres_trigger" ||
         typeEnding === "user" ||
         typeEnding === "group" ||
         typeEnding === "settings" ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.458.3",
+  "version": "1.460.0",
   "description": "CLI for Windmill",
   "repository": {
     "type": "git",

package/types/conf.d.ts

@@ -10,6 +10,7 @@ export interface SyncOptions {
     skipResources?: boolean;
     skipSecrets?: boolean;
     includeSchedules?: boolean;
+    includeTriggers?: boolean;
     includeUsers?: boolean;
     includeGroups?: boolean;
     includeSettings?: boolean;

package/types/conf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conf.d.ts","sourceRoot":"","sources":["../src/conf.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACZ,EAAE,CAAC;IACJ,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAe3D;AAED,wBAAsB,yBAAyB,CAAC,CAAC,EAC/C,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,CAG1B"}
+{"version":3,"file":"conf.d.ts","sourceRoot":"","sources":["../src/conf.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACZ,EAAE,CAAC;IACJ,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAe3D;AAED,wBAAsB,yBAAyB,CAAC,CAAC,EAC/C,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,CAG1B"}