windmill-cli 1.651.1 → 1.653.0

package/esm/main.js

@@ -11785,7 +11785,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv2("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.651.1",
+    VERSION: "1.653.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -25369,7 +25369,8 @@ async function remove(_opts, name) {
 }
 async function whoami2(_opts) {
   await requireLogin(_opts);
-  info(await globalWhoami());
+  const whoamiInfo = await globalWhoami();
+  info(JSON.stringify(whoamiInfo, null, 2));
   const activeName = await getActiveWorkspaceName(_opts);
   info("Active: " + colors.green.bold(activeName || "none"));
 }
@@ -62244,6 +62245,7 @@ ${folderList}
         let [_basePath, changes2] = queue.shift();
         const promise = (async () => {
           const alreadySynced = [];
+          const deletedVarsResPaths = [];
           const isRawApp = isRawAppFile(changes2[0].path);
           if (isRawApp) {
             const deleteRawApp = changes2.find((change) => change.name === "deleted" && isRawAppFolderMetadataFile(change.path));
@@ -62371,12 +62373,23 @@ ${folderList}
                     name: change.path.split(SEP8)[1]
                   });
                   break;
-                case "resource":
-                  await deleteResource({
-                    workspace: workspaceId,
-                    path: removeSuffix(target, ".resource.json")
-                  });
+                case "resource": {
+                  const resourcePath = removeSuffix(target, ".resource.json");
+                  try {
+                    await deleteResource({
+                      workspace: workspaceId,
+                      path: resourcePath
+                    });
+                  } catch (e) {
+                    if (e?.status === 404 && deletedVarsResPaths.includes(resourcePath)) {
+                      debug(`Resource ${resourcePath} already deleted by linked variable`);
+                    } else {
+                      throw e;
+                    }
+                  }
+                  deletedVarsResPaths.push(resourcePath);
                   break;
+                }
                 case "resource-type":
                   await deleteResourceType({
                     workspace: workspaceId,
@@ -62495,12 +62508,23 @@ ${folderList}
                   });
                   break;
                 }
-                case "variable":
-                  await deleteVariable({
-                    workspace: workspaceId,
-                    path: removeSuffix(target, ".variable.json")
-                  });
+                case "variable": {
+                  const variablePath = removeSuffix(target, ".variable.json");
+                  try {
+                    await deleteVariable({
+                      workspace: workspaceId,
+                      path: variablePath
+                    });
+                  } catch (e) {
+                    if (e?.status === 404 && deletedVarsResPaths.includes(variablePath)) {
+                      debug(`Variable ${variablePath} already deleted by linked resource`);
+                    } else {
+                      throw e;
+                    }
+                  }
+                  deletedVarsResPaths.push(variablePath);
                   break;
+                }
                 case "user": {
                   const users = await listUsers({
                     workspace: workspaceId
@@ -67131,6 +67155,12 @@ function migrateToGroupedFormat(settings) {
     result.color = settings.color;
   if (settings.operator_settings !== undefined)
     result.operator_settings = settings.operator_settings;
+  if (settings.slack_team_id !== undefined)
+    result.slack_team_id = settings.slack_team_id;
+  if (settings.slack_name !== undefined)
+    result.slack_name = settings.slack_name;
+  if (settings.slack_command_script !== undefined)
+    result.slack_command_script = settings.slack_command_script;
   if (settings.auto_invite && typeof settings.auto_invite === "object") {
     result.auto_invite = settings.auto_invite;
   } else if (settings.auto_invite_enabled !== undefined) {
@@ -67192,12 +67222,17 @@ async function pushWorkspaceSettings(workspace, _path, settings, localSettings)
       name: workspaceName,
       mute_critical_alerts: remoteSettings.mute_critical_alerts,
       color: remoteSettings.color,
-      operator_settings: remoteSettings.operator_settings
+      operator_settings: remoteSettings.operator_settings,
+      slack_team_id: remoteSettings.slack_team_id,
+      slack_name: remoteSettings.slack_name,
+      slack_command_script: remoteSettings.slack_command_script
     };
   } catch (err) {
     throw new Error(`Failed to get workspace settings: ${err}`);
   }
-  if (isSuperset(localSettings, settings)) {
+  const { slack_team_id: _lst, slack_name: _lsn, ...comparableLocal } = localSettings;
+  const { slack_team_id: _rst, slack_name: _rsn, ...comparableRemote } = settings;
+  if (isSuperset(comparableLocal, comparableRemote)) {
     debug(`Workspace settings are up to date`);
     return;
   }
@@ -67346,6 +67381,15 @@ async function pushWorkspaceSettings(workspace, _path, settings, localSettings)
       requestBody: localSettings.operator_settings
     });
   }
+  if (localSettings.slack_command_script != settings.slack_command_script) {
+    debug(`Updating slack command script...`);
+    await editSlackCommand({
+      workspace,
+      requestBody: {
+        slack_command_script: localSettings.slack_command_script
+      }
+    });
+  }
 }
 async function pushWorkspaceKey(workspace, _path, key, localKey) {
   try {
@@ -78416,7 +78460,7 @@ var docs_default = command29;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.651.1";
+var VERSION = "1.653.0";
 var command30 = new Command().name("wmill").action(() => info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`)).description("Windmill CLI").globalOption("--workspace <workspace:string>", "Specify the target workspace. This overrides the default workspace.").globalOption("--debug --verbose", "Show debug/verbose logs").globalOption("--show-diffs", "Show diff informations when syncing (may show sensitive informations)").globalOption("--token <token:string>", "Specify an API token. This will override any stored token.").globalOption("--base-url <baseUrl:string>", "Specify the base URL of the API. If used, --token and --workspace are required and no local remote/workspace already set will be used.").globalOption("--config-dir <configDir:string>", "Specify a custom config directory. Overrides WMILL_CONFIG_DIR environment variable and default ~/.config location.").env("HEADERS <headers:string>", `Specify headers to use for all requests. e.g: "HEADERS='h1: v1, h2: v2'"`).version(VERSION).versionOption(false).command("init", init_default).command("app", app_default).command("flow", flow_default).command("script", script_default).command("workspace", workspace_default).command("resource", resource_default).command("resource-type", resource_type_default).command("user", user_default).command("variable", variable_default).command("hub", hub_default).command("folder", folder_default).command("schedule", schedule_default).command("trigger", trigger_default).command("dev", dev_default2).command("sync", sync_default).command("lint", lint_default).command("gitsync-settings", gitsync_settings_default).command("instance", instance_default).command("worker-groups", worker_groups_default).command("workers", workers_default).command("queues", queues_default).command("dependencies", dependencies_default).command("jobs", jobs_default).command("docs", docs_default).command("version --version", "Show version information").action(async (opts) => {
   console.log("CLI version: " + VERSION);
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.651.1",
+  "version": "1.653.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",