windmill-cli 1.414.1 → 1.415.0

package/esm/gen/core/OpenAPI.js

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

package/esm/instance.js

@@ -108,6 +108,16 @@ export function compareInstanceObjects(fromObjects, toObjects, idProp, objectNam
 }
 export async function pickInstance(opts, allowNew) {
     const instances = await allInstances();
+    if (opts.baseUrl && opts.token && opts.instance) {
+        log.info("Using instance defined by --instance, --base-url and --token");
+        setClient(opts.token, opts.baseUrl.endsWith("/") ? opts.baseUrl.slice(0, -1) : opts.baseUrl);
+        return {
+            name: opts.instance,
+            remote: opts.baseUrl,
+            token: opts.token,
+            prefix: opts.instance,
+        };
+    }
     if (opts.baseUrl && opts.token) {
         log.info("Using instance fully defined by --base-url and --token");
         setClient(opts.token, opts.baseUrl.endsWith("/") ? opts.baseUrl.slice(0, -1) : opts.baseUrl);
@@ -202,7 +212,7 @@ async function instancePull(opts) {
     if (opts.includeWorkspaces) {
         log.info("\nPulling all workspaces");
         const rootDir = dntShim.Deno.cwd();
-        const localWorkspaces = await getLocalWorkspaces(rootDir, instance.prefix);
+        const localWorkspaces = await getLocalWorkspaces(rootDir, instance.prefix, opts.folderPerInstance);
         const previousActiveWorkspace = await getActiveWorkspace(undefined);
         const remoteWorkspaces = await wmill.listWorkspacesAsSuperAdmin({
             page: 1,
@@ -210,7 +220,9 @@ async function instancePull(opts) {
         });
         for (const remoteWorkspace of remoteWorkspaces) {
             log.info("\nPulling workspace " + remoteWorkspace.id);
-            const workspaceName = instance.prefix + "_" + remoteWorkspace.id;
+            const workspaceName = opts?.folderPerInstance
+                ? instance.prefix + "/" + remoteWorkspace.id
+                : instance.prefix + "_" + remoteWorkspace.id;
             await dntShim.Deno.mkdir(path.join(rootDir, workspaceName), {
                 recursive: true,
             });
@@ -310,22 +322,28 @@ async function instancePush(opts) {
     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: [
-                ...instances.map((i) => ({
-                    name: `${i.prefix} (${i.name} - ${i.remote})`,
-                    value: i.prefix,
-                })),
-            ],
-            default: instance.prefix,
-        }));
+        let localPrefix;
+        if (opts.baseUrl && opts.token) {
+            localPrefix = "custom";
+        }
+        else {
+            localPrefix = (await Select.prompt({
+                message: "What is the prefix of the local workspaces you want to sync?",
+                options: [
+                    ...instances.map((i) => ({
+                        name: `${i.prefix} (${i.name} - ${i.remote})`,
+                        value: i.prefix,
+                    })),
+                ],
+                default: instance.prefix,
+            }));
+        }
         const remoteWorkspaces = await wmill.listWorkspacesAsSuperAdmin({
             page: 1,
             perPage: 1000,
         });
         const previousActiveWorkspace = await getActiveWorkspace(undefined);
-        const localWorkspaces = await getLocalWorkspaces(rootDir, localPrefix);
+        const localWorkspaces = await getLocalWorkspaces(rootDir, localPrefix, opts.folderPerInstance);
         log.info(`\nPushing all workspaces: ${localWorkspaces.map((x) => x.id).join(", ")}`);
         for (const localWorkspace of localWorkspaces) {
             log.info("\nPushing workspace " + localWorkspace.id);
@@ -383,16 +401,31 @@ async function instancePush(opts) {
         log.info(colors.green.underline.bold("All workspaces pushed"));
     }
 }
-async function getLocalWorkspaces(rootDir, localPrefix) {
+async function getLocalWorkspaces(rootDir, localPrefix, folderPerInstance) {
     const localWorkspaces = [];
-    for await (const dir of dntShim.Deno.readDir(rootDir)) {
-        const dirName = dir.name;
-        if (dirName.startsWith(localPrefix + "_")) {
+    if (!(await dntShim.Deno.stat(localPrefix).catch(() => null))) {
+        await dntShim.Deno.mkdir(localPrefix);
+    }
+    if (folderPerInstance) {
+        for await (const dir of dntShim.Deno.readDir(rootDir + "/" + localPrefix)) {
+            const dirName = dir.name;
             localWorkspaces.push({
-                dir: dirName,
-                id: dirName.substring(localPrefix.length + 1),
+                dir: localPrefix + "/" + dirName,
+                id: dirName,
             });
         }
+        log.info(localWorkspaces);
+    }
+    else {
+        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;
 }
@@ -489,7 +522,8 @@ const command = new Command()
     .option("--skip-configs", "Skip pulling configs (worker groups and SMTP)")
     .option("--skip-groups", "Skip pulling instance groups")
     .option("--include-workspaces", "Also pull workspaces")
-    .option("--instance <instance:string>", "Name of the instance to push to, override the active instance")
+    .option("--folder-per-instance", "Create a folder per instance")
+    .option("--instance <instance:string>", "Name of the instance to pull from, override the active instance")
     .action(instancePull)
     .command("push")
     .description("Push instance settings, users, configs, group and overwrite remote")
@@ -499,6 +533,7 @@ const command = new Command()
     .option("--skip-configs", "Skip pushing configs (worker groups and SMTP)")
     .option("--skip-groups", "Skip pushing instance groups")
     .option("--include-workspaces", "Also push workspaces")
+    .option("--folder-per-instance", "Create a folder per instance")
     .option("--instance <instance:string>", "Name of the instance to push to, override the active instance")
     .action(instancePush)
     .command("whoami")

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

package/package.json

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

package/types/instance.d.ts

@@ -25,6 +25,7 @@ export type InstanceSyncOptions = {
     instance?: string;
     baseUrl?: string;
     token?: string;
+    folderPerInstance?: boolean;
     yes?: boolean;
 };
 export declare function pickInstance(opts: InstanceSyncOptions, allowNew: boolean): Promise<Instance>;

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,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;AAgBD,QAAA,MAAM,OAAO;;;;;;oBAwFW,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;CACf,CAAC;AAEF,wBAAsB,YAAY,CAChC,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,OAAO,qBAuElB;AA4VD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS9B;AAgBD,QAAA,MAAM,OAAO;;;;;;oBA0FW,CAAC;AAEzB,eAAe,OAAO,CAAC"}

package/types/local_encryption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local_encryption.d.ts","sourceRoot":"","sources":["../src/local_encryption.ts"],"names":[],"mappings":"AAoCA,wBAAsB,OAAO,CAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAoBjB;AAGD,wBAAsB,OAAO,CAC3B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAuBjB"}
+{"version":3,"file":"local_encryption.d.ts","sourceRoot":"","sources":["../src/local_encryption.ts"],"names":[],"mappings":"AAmCA,wBAAsB,OAAO,CAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAoBjB;AAGD,wBAAsB,OAAO,CAC3B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAuBjB"}

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.414.1";
+export declare const VERSION = "1.415.0";
 declare const command: Command<{
     workspace?: (import("./deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType & string) | undefined;
 } & {