windmill-cli 1.417.1 → 1.417.3

package/esm/gen/core/OpenAPI.js

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

package/esm/instance.js

@@ -184,6 +184,7 @@ async function instancePull(opts) {
         gChanges = (await pullInstanceGroups(opts, true));
     }
     const totalChanges = uChanges + sChanges + cChanges + gChanges;
+    const rootDir = dntShim.Deno.cwd();
     if (totalChanges > 0) {
         let confirm = true;
         if (opts.yes !== true) {
@@ -193,6 +194,13 @@ async function instancePull(opts) {
             });
         }
         if (confirm) {
+            if (uChanges > 0) {
+                if (opts.folderPerInstance && opts.prefixSettings) {
+                    await dntShim.Deno.mkdir(path.join(rootDir, opts.prefix), {
+                        recursive: true,
+                    });
+                }
+            }
             if (!opts.skipUsers && uChanges > 0) {
                 await pullInstanceUsers(opts);
             }
@@ -212,7 +220,6 @@ async function instancePull(opts) {
     }
     if (opts.includeWorkspaces) {
         log.info("\nPulling all workspaces");
-        const rootDir = dntShim.Deno.cwd();
         const localWorkspaces = await getLocalWorkspaces(rootDir, instance.prefix, opts.folderPerInstance);
         const previousActiveWorkspace = await getActiveWorkspace(undefined);
         const remoteWorkspaces = await wmill.listWorkspacesAsSuperAdmin({
@@ -409,13 +416,14 @@ async function getLocalWorkspaces(rootDir, localPrefix, folderPerInstance) {
     }
     if (folderPerInstance) {
         for await (const dir of dntShim.Deno.readDir(rootDir + "/" + localPrefix)) {
-            const dirName = dir.name;
-            localWorkspaces.push({
-                dir: localPrefix + "/" + dirName,
-                id: dirName,
-            });
+            if (dir.isDirectory) {
+                const dirName = dir.name;
+                localWorkspaces.push({
+                    dir: localPrefix + "/" + dirName,
+                    id: dirName,
+                });
+            }
         }
-        log.info(localWorkspaces);
     }
     else {
         for await (const dir of dntShim.Deno.readDir(rootDir)) {
@@ -428,6 +436,7 @@ async function getLocalWorkspaces(rootDir, localPrefix, folderPerInstance) {
             }
         }
     }
+    log.info("Local workspaces found: " + localWorkspaces.map((x) => x.id).join(", "));
     return localWorkspaces;
 }
 async function switchI(opts, instanceName) {

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.417.1";
+export const VERSION = "1.417.3";
 const command = new Command()
     .name("wmill")
     .action(() => log.info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`))

package/esm/user.js

@@ -7,14 +7,14 @@ import { colors, Command, log, Table, yamlStringify, yamlParseFile, } from "./de
 import * as wmill from "./gen/services.gen.js";
 const INSTANCE_USERS_PATH = "instance_users.yaml";
 let instanceUsersPath = INSTANCE_USERS_PATH;
-async function checkInstanceUsersPath(opts) {
+function checkInstanceUsersPath(opts) {
     if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
         instanceUsersPath = `${opts.prefix}/${INSTANCE_USERS_PATH}`;
     }
 }
 const INSTANCE_GROUPS_PATH = "instance_groups.yaml";
 let instanceGroupsPath = INSTANCE_GROUPS_PATH;
-async function checkInstanceGroupsPath(opts) {
+function checkInstanceGroupsPath(opts) {
     if (opts.prefix && opts.folderPerInstance && opts.prefixSettings) {
         instanceGroupsPath = `${opts.prefix}/${INSTANCE_GROUPS_PATH}`;
     }
@@ -330,7 +330,7 @@ export async function pushGroup(workspace, path, group, localGroup) {
 }
 export async function pullInstanceUsers(opts, preview = false) {
     const remoteUsers = await wmill.globalUsersExport();
-    await checkInstanceUsersPath(opts);
+    checkInstanceUsersPath(opts);
     if (preview) {
         const localUsers = await readInstanceUsers(opts);
         return compareInstanceObjects(remoteUsers, localUsers, "email", "user");
@@ -354,7 +354,7 @@ export async function readInstanceUsers(opts) {
 }
 export async function readInstanceGroups(opts) {
     let localGroups = [];
-    await checkInstanceGroupsPath(opts);
+    checkInstanceGroupsPath(opts);
     try {
         localGroups = (await yamlParseFile(instanceGroupsPath));
     }
@@ -379,7 +379,7 @@ export async function pushInstanceUsers(opts, preview = false) {
 }
 export async function pullInstanceGroups(opts, preview = false) {
     const remoteGroups = await wmill.exportInstanceGroups();
-    await checkInstanceGroupsPath(opts);
+    checkInstanceGroupsPath(opts);
     if (preview) {
         const localGroups = await readInstanceGroups(opts);
         return compareInstanceObjects(remoteGroups, localGroups, "name", "group");

package/esm/workspace.js

@@ -198,8 +198,8 @@ export async function removeWorkspace(name, silent, opts) {
         }
         return;
     }
-    if (silent) {
-        log.info(colors.yellow(`Replacing existing workspace ${name}`));
+    if (!silent) {
+        log.info(colors.yellow(`Removing existing workspace ${name}`));
     }
     await dntShim.Deno.writeTextFile((await getRootStore()) + "remotes.ndjson", orgWorkspaces
         .filter((x) => x.name !== name)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.417.1",
+  "version": "1.417.3",
   "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;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,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wBAAsB,YAAY,CAChC,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,OAAO,qBAuElB;AA6VD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS9B;AAgBD,QAAA,MAAM,OAAO;;;;;;oBA0GW,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,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,wBAAsB,YAAY,CAChC,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,OAAO,qBAuElB;AAyWD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS9B;AAgBD,QAAA,MAAM,OAAO;;;;;;oBA0GW,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.417.1";
+export declare const VERSION = "1.417.3";
 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/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../src/user.ts"],"names":[],"mappings":"AAUA,OAAO,EAA0B,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,EAEL,OAAO,EAKR,MAAM,WAAW,CAAC;AAEnB,OAAO,EAEL,YAAY,EAEZ,aAAa,EACd,MAAM,oBAAoB,CAAC;AAwG5B,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,GAAG,SAAS,EAChC,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,IAAI,CAAC,CA2Ef;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,eAAe,GAAG,SAAS,EAClC,UAAU,EAAE,eAAe,GAC1B,OAAO,CAAC,IAAI,CAAC,CAgLf;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAiBzB;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,mBAAmB,2BAY1B;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,mBAAmB,4BAY1B;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAezB;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,mBAAmB,EACzB,OAAO,UAAQ,+BAmBhB;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAezB;AAED,QAAA,MAAM,OAAO;;;;;;;;;;oBA8BgB,CAAC;AAE9B,eAAe,OAAO,CAAC"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../src/user.ts"],"names":[],"mappings":"AAUA,OAAO,EAA0B,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,EAEL,OAAO,EAKR,MAAM,WAAW,CAAC;AAEnB,OAAO,EAEL,YAAY,EAEZ,aAAa,EACd,MAAM,oBAAoB,CAAC;AAwG5B,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,GAAG,SAAS,EAChC,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,IAAI,CAAC,CA2Ef;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,eAAe,GAAG,SAAS,EAClC,UAAU,EAAE,eAAe,GAC1B,OAAO,CAAC,IAAI,CAAC,CAgLf;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAiBzB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,mBAAmB,2BAWhE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,4BAajE;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAezB;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,mBAAmB,EACzB,OAAO,UAAQ,+BAmBhB;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,OAAe,+BAezB;AAED,QAAA,MAAM,OAAO;;;;;;;;;;oBA8BgB,CAAC;AAE9B,eAAe,OAAO,CAAC"}