windmill-cli 1.405.4 → 1.406.0

package/esm/gen/core/OpenAPI.js

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

package/esm/instance.js

@@ -7,9 +7,10 @@ import { getRootStore } from "./store.js";
 import { push, pull } from "./sync.js";
 import { showDiff } from "./types.js";
 import { pushInstanceUsers, pullInstanceUsers, pullInstanceGroups, pushInstanceGroups, } from "./user.js";
-import { add as workspaceSetup, addWorkspace, allWorkspaces, removeWorkspace, } from "./workspace.js";
+import { add as workspaceSetup, addWorkspace, removeWorkspace, setActiveWorkspace, } from "./workspace.js";
 import { pushInstanceSettings, pullInstanceSettings, pullInstanceConfigs, pushInstanceConfigs, } from "./settings.js";
-import { sleep, deepEqual } from "./utils.js";
+import { deepEqual } from "./utils.js";
+import { getActiveWorkspace } from "./workspace.js";
 export async function allInstances() {
     try {
         const file = (await getRootStore()) + "instances.ndjson";
@@ -198,19 +199,17 @@ async function instancePull(opts) {
     else {
         log.info("No instance-level changes to apply");
     }
-    sleep(1000);
     if (opts.includeWorkspaces) {
         log.info("\nPulling all workspaces");
+        const rootDir = dntShim.Deno.cwd();
+        const localWorkspaces = await getLocalWorkspaces(rootDir, instance.prefix);
+        const previousActiveWorkspace = await getActiveWorkspace(undefined);
         const remoteWorkspaces = await wmill.listWorkspacesAsSuperAdmin({
             page: 1,
             perPage: 1000,
         });
-        let localWorkspaces = await allWorkspaces();
-        localWorkspaces = localWorkspaces.filter((w) => w.name.startsWith(instance.prefix + "_"));
-        const rootDir = dntShim.Deno.cwd();
         for (const remoteWorkspace of remoteWorkspaces) {
             log.info("\nPulling workspace " + remoteWorkspace.id);
-            sleep(1000);
             const workspaceName = instance.prefix + "_" + remoteWorkspace.id;
             await dntShim.Deno.mkdir(path.join(rootDir, workspaceName), {
                 recursive: true,
@@ -237,23 +236,26 @@ async function instancePull(opts) {
                 yes: opts.yes,
             });
         }
-        const localWorkspacesToDelete = localWorkspaces.filter((w) => !remoteWorkspaces.find((r) => r.id === w.workspaceId));
+        const localWorkspacesToDelete = localWorkspaces.filter((w) => !remoteWorkspaces.find((r) => r.id === w.id));
         if (localWorkspacesToDelete.length > 0) {
             const confirmDelete = opts.yes ||
                 (await Confirm.prompt({
                     message: "Do you want to delete the local copy of workspaces that don't exist anymore on the instance?\n" +
-                        localWorkspacesToDelete.map((w) => w.workspaceId).join(", "),
+                        localWorkspacesToDelete.map((w) => w).join(", "),
                     default: true,
                 }));
             if (confirmDelete) {
                 for (const workspace of localWorkspacesToDelete) {
-                    await removeWorkspace(workspace.name, false, {});
-                    await dntShim.Deno.remove(path.join(rootDir, workspace.name), {
+                    await removeWorkspace(workspace.id, false, {});
+                    await dntShim.Deno.remove(path.join(rootDir, workspace.dir), {
                         recursive: true,
                     });
                 }
             }
         }
+        if (previousActiveWorkspace) {
+            await setActiveWorkspace(previousActiveWorkspace?.name);
+        }
         log.info(colors.green.underline.bold("All workspaces pulled"));
     }
 }
@@ -305,9 +307,9 @@ async function instancePush(opts) {
     else {
         log.info("No instance-level changes to apply");
     }
-    sleep(1000);
     if (opts.includeWorkspaces) {
         instances = await allInstances();
+        const rootDir = dntShim.Deno.cwd();
         const localPrefix = (await Select.prompt({
             message: "What is the prefix of the local workspaces you want to sync?",
             options: [
@@ -322,15 +324,13 @@ async function instancePush(opts) {
             page: 1,
             perPage: 1000,
         });
-        let localWorkspaces = await allWorkspaces();
-        localWorkspaces = localWorkspaces.filter((w) => w.name.startsWith(localPrefix + "_"));
-        log.info("\nPushing all workspaces");
-        const rootDir = dntShim.Deno.cwd();
+        const previousActiveWorkspace = await getActiveWorkspace(undefined);
+        const localWorkspaces = await getLocalWorkspaces(rootDir, localPrefix);
+        log.info(`\nPushing all workspaces: ${localWorkspaces.map((x) => x.id).join(", ")}`);
         for (const localWorkspace of localWorkspaces) {
-            log.info("\nPushing workspace " + localWorkspace.workspaceId);
-            sleep(1000);
+            log.info("\nPushing workspace " + localWorkspace.id);
             try {
-                await dntShim.Deno.chdir(path.join(rootDir, localWorkspace.name));
+                await dntShim.Deno.chdir(path.join(rootDir, localWorkspace.dir));
             }
             catch (_) {
                 throw new Error("Workspace folder not found, are you in the right directory?");
@@ -344,14 +344,14 @@ async function instancePush(opts) {
                     create: true,
                     createWorkspaceName: workspaceSettings.name,
                     createUsername: undefined,
-                }, localWorkspace.name, localWorkspace.workspaceId, instance.remote);
+                }, localWorkspace.dir, localWorkspace.id, instance.remote);
             }
             catch (_) {
                 log.error("Settings file not found in workspace local folder, skipping");
                 continue;
             }
             await push({
-                workspace: localWorkspace.name,
+                workspace: localWorkspace.dir,
                 token: undefined,
                 baseUrl: undefined,
                 includeGroups: true,
@@ -362,7 +362,7 @@ async function instancePush(opts) {
                 yes: opts.yes,
             });
         }
-        const workspacesToDelete = remoteWorkspaces.filter((w) => !localWorkspaces.find((l) => l.workspaceId === w.id));
+        const workspacesToDelete = remoteWorkspaces.filter((w) => !localWorkspaces.find((l) => l.id === w.id));
         if (workspacesToDelete.length > 0) {
             const confirmDelete = opts.yes ||
                 (await Confirm.prompt({
@@ -377,9 +377,25 @@ async function instancePush(opts) {
                 }
             }
         }
+        if (previousActiveWorkspace) {
+            await setActiveWorkspace(previousActiveWorkspace?.name);
+        }
         log.info(colors.green.underline.bold("All workspaces pushed"));
     }
 }
+async function getLocalWorkspaces(rootDir, localPrefix) {
+    const localWorkspaces = [];
+    for await (const dir of dntShim.Deno.readDir(rootDir)) {
+        const dirName = dir.name;
+        if (dirName.startsWith(localPrefix + "_")) {
+            localWorkspaces.push({
+                dir: dirName,
+                id: dirName.substring(localPrefix.length + 1),
+            });
+        }
+    }
+    return localWorkspaces;
+}
 async function switchI(opts, instanceName) {
     const all = await allInstances();
     if (all.findIndex((x) => x.name === instanceName) === -1) {

package/esm/main.js

@@ -33,7 +33,7 @@ export { flow, app, script, workspace, resource, user, variable, hub, folder, sc
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.405.4";
+export const VERSION = "1.406.0";
 const command = new Command()
     .name("wmill")
     .action(() => log.info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`))

package/esm/workspace.js

@@ -25,8 +25,8 @@ export async function allWorkspaces() {
     }
 }
 async function getActiveWorkspaceName(opts) {
-    if (opts.workspace) {
-        return opts.workspace;
+    if (opts?.workspace) {
+        return opts?.workspace;
     }
     try {
         return await dntShim.Deno.readTextFile((await getRootStore()) + "/activeWorkspace");
@@ -84,7 +84,11 @@ async function switchC(opts, workspaceName) {
         }
         return;
     }
-    return await dntShim.Deno.writeTextFile((await getRootStore()) + "/activeWorkspace", workspaceName);
+    await setActiveWorkspace(workspaceName);
+    return;
+}
+export async function setActiveWorkspace(workspaceName) {
+    await dntShim.Deno.writeTextFile((await getRootStore()) + "/activeWorkspace", workspaceName);
 }
 export async function add(opts, workspaceName, workspaceId, remote) {
     if (opts.workspace) {
@@ -169,7 +173,7 @@ export async function add(opts, workspaceName, workspaceId, remote) {
         workspaceId: workspaceId,
         token: token,
     }, opts);
-    await dntShim.Deno.writeTextFile((await getRootStore()) + "/activeWorkspace", workspaceName);
+    await setActiveWorkspace(workspaceName);
     log.info(colors.green.underline(`Added workspace ${workspaceName} for ${workspaceId} on ${remote}!`));
 }
 export async function addWorkspace(workspace, opts) {

package/package.json

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

package/types/instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AACA,OAAO,EAML,OAAO,EAGR,MAAM,WAAW,CAAC;AA+BnB,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAiBxD;AACD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,EAAE,EACR,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,KAAK,EAAE,MAAM,GAAG,SAAS;;;;;GA2C1B;AA4BD,KAAK,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI;KACpC,CAAC,IAAI,CAAC,GAAG,MAAM;CACjB,CAAC;AACF,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EACrD,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC/B,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC7B,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,MAAM,UAwBnB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAsB,YAAY,CAChC,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,OAAO,qBAwDlB;AA0SD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS9B;AAeD,QAAA,MAAM,OAAO;;;;;;oBAyFW,CAAC;AAEzB,eAAe,OAAO,CAAC"}
+{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AACA,OAAO,EAML,OAAO,EAGR,MAAM,WAAW,CAAC;AAgCnB,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAiBxD;AACD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,EAAE,EACR,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,KAAK,EAAE,MAAM,GAAG,SAAS;;;;;GA2C1B;AA4BD,KAAK,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI;KACpC,CAAC,IAAI,CAAC,GAAG,MAAM;CACjB,CAAC;AACF,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EACrD,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC/B,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC7B,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,MAAM,UAwBnB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAsB,YAAY,CAChC,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,OAAO,qBAwDlB;AA2TD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS9B;AAeD,QAAA,MAAM,OAAO;;;;;;oBAyFW,CAAC;AAEzB,eAAe,OAAO,CAAC"}

package/types/main.d.ts

@@ -19,7 +19,7 @@ import { pull as hubPull } from "./hub.js";
 import { pull, push } from "./sync.js";
 import { add as workspaceAdd } from "./workspace.js";
 export { flow, app, script, workspace, resource, user, variable, hub, folder, schedule, sync, instance, dev, hubPull, pull, push, workspaceAdd, };
-export declare const VERSION = "1.405.4";
+export declare const VERSION = "1.406.0";
 declare const command: Command<{
     workspace?: (import("./deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType & string) | undefined;
 } & {

package/types/workspace.d.ts

@@ -7,8 +7,9 @@ export interface Workspace {
     token: string;
 }
 export declare function allWorkspaces(): Promise<Workspace[]>;
-export declare function getActiveWorkspace(opts: GlobalOptions): Promise<Workspace | undefined>;
+export declare function getActiveWorkspace(opts: GlobalOptions | undefined): Promise<Workspace | undefined>;
 export declare function getWorkspaceByName(workspaceName: string): Promise<Workspace | undefined>;
+export declare function setActiveWorkspace(workspaceName: string): Promise<void>;
 export declare function add(opts: GlobalOptions & {
     create: boolean;
     createWorkspaceName: string | undefined;

package/types/workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAG3C,OAAO,EAAU,OAAO,EAAgC,MAAM,WAAW,CAAC;AAK1E,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAiB1D;AAeD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAMhC;AAED,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAQhC;AAuDD,wBAAsB,GAAG,CACvB,IAAI,EAAE,aAAa,GAAG;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,EACD,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,iBAyH3B;AAED,wBAAsB,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,iBAYjE;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,GAAG,iBA4BV;AAaD,QAAA,MAAM,OAAO;;;;;;oBA8BW,CAAC;AAEzB,eAAe,OAAO,CAAC"}
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAG3C,OAAO,EAAU,OAAO,EAAgC,MAAM,WAAW,CAAC;AAK1E,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAiB1D;AAeD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,aAAa,GAAG,SAAS,GAC9B,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAMhC;AAED,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAQhC;AAqDD,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,MAAM,iBAK7D;AAED,wBAAsB,GAAG,CACvB,IAAI,EAAE,aAAa,GAAG;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,EACD,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,iBAuH3B;AAED,wBAAsB,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,iBAYjE;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,GAAG,iBA4BV;AAaD,QAAA,MAAM,OAAO;;;;;;oBA8BW,CAAC;AAEzB,eAAe,OAAO,CAAC"}