windmill-cli 1.396.1 → 1.397.3

package/esm/gen/types.gen.js

@@ -0,0 +1,2 @@
+// This file is auto-generated by @hey-api/openapi-ts
+export {};

package/esm/hub.js

@@ -1,5 +1,6 @@
 // deno-lint-ignore-file no-explicit-any
-import { Command, ResourceService, SettingService, log } from "./deps.js";
+import { Command, log } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 import { requireLogin, resolveWorkspace } from "./context.js";
 import { pushResourceType } from "./resource-type.js";
 import { deepEqual } from "./utils.js";
@@ -10,10 +11,10 @@ export async function pull(opts) {
         return;
     }
     const userInfo = await requireLogin(opts);
-    const uid = (await SettingService.getGlobal({
+    const uid = (await wmill.getGlobal({
         key: "uid",
     }));
-    const hubBaseUrl = (await SettingService.getGlobal({
+    const hubBaseUrl = (await wmill.getGlobal({
         key: "hubBaseUrl",
     })) ?? "https://hub.windmill.dev";
     const headers = {
@@ -41,7 +42,7 @@ export async function pull(opts) {
         .then((x) => x
         .filter((x) => x)
         .map((x) => x.resource_type));
-    const resourceTypes = await ResourceService.listResourceType({
+    const resourceTypes = await wmill.listResourceType({
         workspace: workspace.workspaceId,
     });
     for (const x of list) {

package/esm/instance.js

@@ -1,5 +1,6 @@
 import * as dntShim from "./_dnt.shims.js";
-import { Select, WorkspaceService, path, Confirm, yamlStringify, yamlParse, Command, setClient, } from "./deps.js";
+import { Select, path, Confirm, yamlStringify, yamlParse, Command, setClient, } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 import { Input, colors, log } from "./deps.js";
 import { loginInteractive } from "./login.js";
 import { getRootStore } from "./store.js";
@@ -170,7 +171,7 @@ async function instancePull(opts) {
     sleep(1000);
     if (opts.includeWorkspaces) {
         log.info("\nPulling all workspaces");
-        const remoteWorkspaces = await WorkspaceService.listWorkspacesAsSuperAdmin({
+        const remoteWorkspaces = await wmill.listWorkspacesAsSuperAdmin({
             page: 1,
             perPage: 1000,
         });
@@ -304,7 +305,7 @@ async function instancePush(opts) {
             ],
             default: instance.prefix,
         }));
-        const remoteWorkspaces = await WorkspaceService.listWorkspacesAsSuperAdmin({
+        const remoteWorkspaces = await wmill.listWorkspacesAsSuperAdmin({
             page: 1,
             perPage: 1000,
         });
@@ -356,7 +357,7 @@ async function instancePush(opts) {
             });
             if (confirmDelete) {
                 for (const workspace of workspacesToDelete) {
-                    await WorkspaceService.deleteWorkspace({ workspace: workspace.id });
+                    await wmill.deleteWorkspace({ workspace: workspace.id });
                     log.info(colors.green.underline("Deleted workspace " + workspace.id));
                 }
             }

package/esm/main.js

@@ -17,7 +17,7 @@ import sync from "./sync.js";
 import instance from "./instance.js";
 import dev from "./dev.js";
 import { fetchVersion } from "./context.js";
-import { OpenAPI } from "./deps.js";
+import { OpenAPI } from "./gen/index.js";
 import { getHeaders } from "./utils.js";
 import { NpmProvider } from "./upgrade.js";
 import { pull as hubPull } from "./hub.js";
@@ -30,7 +30,7 @@ export { flow, app, script, workspace, resource, user, variable, hub, folder, sc
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.396.1";
+export const VERSION = "1.397.3";
 const command = new Command()
     .name("wmill")
     .action(() => log.info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`))
@@ -142,7 +142,9 @@ function isMain() {
     if (isDeno) {
         const isMain = (import.meta.url === ("file:///" + process.argv[1].replace(/\\/g, "/")).replace(/\/{3,}/, "///"));
         if (isMain) {
-            log.warn("Using the deno runtime for the Windmill CLI is deprecated, you can now use node: deno uninstall wmill && npm install -g windmill-cli");
+            if (!Deno.args.includes("completions")) {
+                log.warn("Using the deno runtime for the Windmill CLI is deprecated, you can now use node: deno uninstall wmill && npm install -g windmill-cli");
+            }
         }
         return isMain;
     }

package/esm/metadata.js

@@ -1,6 +1,6 @@
 // deno-lint-ignore-file no-explicit-any
 import * as dntShim from "./_dnt.shims.js";
-import { SEP, colors, log, path, yamlParse, yamlStringify, } from "./deps.js";
+import { SEP, colors, log, path, yamlParse, yamlStringify } from "./deps.js";
 import { defaultScriptMetadata, } from "./bootstrap/script_bootstrap.js";
 import { instantiate as instantiateWasm, parse_bash, parse_bigquery, parse_deno, parse_go, parse_graphql, parse_mssql, parse_mysql, parse_powershell, parse_python, parse_snowflake, parse_sql, } from "./wasm/windmill_parser_wasm.generated.js";
 import { inferContentTypeFromFilePath } from "./script_common.js";

package/esm/resource-type.js

@@ -2,11 +2,12 @@
 import * as dntShim from "./_dnt.shims.js";
 import { isSuperset, parseFromFile, removeType, } from "./types.js";
 import { requireLogin, resolveWorkspace } from "./context.js";
-import { colors, Command, log, ResourceService, Table, } from "./deps.js";
+import { colors, Command, log, Table } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
 export async function pushResourceType(workspace, remotePath, resource, localResource) {
     remotePath = removeType(remotePath, "resource-type");
     try {
-        resource = await ResourceService.getResourceType({
+        resource = await wmill.getResourceType({
             workspace: workspace,
             path: remotePath,
         });
@@ -18,7 +19,7 @@ export async function pushResourceType(workspace, remotePath, resource, localRes
         if (isSuperset(localResource, resource)) {
             return;
         }
-        await ResourceService.updateResourceType({
+        await wmill.updateResourceType({
             workspace: workspace,
             path: remotePath,
             requestBody: {
@@ -28,7 +29,7 @@ export async function pushResourceType(workspace, remotePath, resource, localRes
     }
     else {
         log.info(colors.yellow.bold("Creating new resource type..."));
-        await ResourceService.createResourceType({
+        await wmill.createResourceType({
             workspace: workspace,
             requestBody: {
                 name: remotePath,
@@ -51,7 +52,7 @@ async function push(opts, filePath, name) {
 async function list(opts) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
-    const res = await ResourceService.listResourceType({
+    const res = await wmill.listResourceType({
         workspace: workspace.workspaceId,
     });
     new Table()

package/esm/resource.js

@@ -2,11 +2,13 @@
 import * as dntShim from "./_dnt.shims.js";
 import { isSuperset, parseFromFile, removeType, } from "./types.js";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.js";
-import { colors, Command, log, ResourceService, SEP, Table, } from "./deps.js";
+import { colors, Command, log, SEP, Table } from "./deps.js";
+import * as wmill from "./gen/services.gen.js";
+import { readInlinePathSync } from "./utils.js";
 export async function pushResource(workspace, remotePath, resource, localResource) {
     remotePath = removeType(remotePath, "resource");
     try {
-        resource = await ResourceService.getResource({
+        resource = await wmill.getResource({
             workspace: workspace,
             path: remotePath.replaceAll(SEP, "/"),
         });
@@ -14,11 +16,15 @@ export async function pushResource(workspace, remotePath, resource, localResourc
     catch {
         // flow doesn't exist
     }
+    if (localResource.value["content"]?.startsWith("!inline ")) {
+        const basePath = localResource.value["content"].split(" ")[1];
+        localResource.value["content"] = readInlinePathSync(basePath);
+    }
     if (resource) {
         if (isSuperset(localResource, resource)) {
             return;
         }
-        await ResourceService.updateResource({
+        await wmill.updateResource({
             workspace: workspace,
             path: remotePath.replaceAll(SEP, "/"),
             requestBody: { ...localResource },
@@ -29,7 +35,7 @@ export async function pushResource(workspace, remotePath, resource, localResourc
             log.info(colors.yellow("! is_oauth has been removed in newer versions. Ignoring."));
         }
         log.info(colors.yellow.bold("Creating new resource..."));
-        await ResourceService.createResource({
+        await wmill.createResource({
             workspace: workspace,
             requestBody: {
                 path: remotePath.replaceAll(SEP, "/"),
@@ -59,7 +65,7 @@ async function list(opts) {
     const perPage = 10;
     const total = [];
     while (true) {
-        const res = await ResourceService.listResource({
+        const res = await wmill.listResource({
             workspace: workspace.workspaceId,
             page,
             perPage,

package/esm/schedule.js

@@ -1,12 +1,13 @@
 // deno-lint-ignore-file no-explicit-any
 import * as dntShim from "./_dnt.shims.js";
-import { colors, Command, ScheduleService, log, Table, } from "./deps.js";
+import { colors, Command, log, Table } from "./deps.js";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.js";
+import * as wmill from "./gen/services.gen.js";
 import { isSuperset, parseFromFile, removeType, } from "./types.js";
 async function list(opts) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
-    const schedules = await ScheduleService.listSchedules({
+    const schedules = await wmill.listSchedules({
         workspace: workspace.workspaceId,
     });
     new Table()
@@ -21,7 +22,7 @@ export async function pushSchedule(workspace, path, schedule, localSchedule) {
     log.debug(`Processing local schedule ${path}`);
     // deleting old app if it exists in raw mode
     try {
-        schedule = await ScheduleService.getSchedule({ workspace, path });
+        schedule = await wmill.getSchedule({ workspace, path });
         log.debug(`Schedule ${path} exists on remote`);
     }
     catch {
@@ -35,7 +36,7 @@ export async function pushSchedule(workspace, path, schedule, localSchedule) {
         }
         log.debug(`Schedule ${path} is not up-to-date, updating...`);
         try {
-            await ScheduleService.updateSchedule({
+            await wmill.updateSchedule({
                 workspace: workspace,
                 path,
                 requestBody: {
@@ -51,7 +52,7 @@ export async function pushSchedule(workspace, path, schedule, localSchedule) {
     else {
         console.log(colors.bold.yellow("Creating new schedule: " + path));
         try {
-            await ScheduleService.createSchedule({
+            await wmill.createSchedule({
                 workspace: workspace,
                 requestBody: {
                     path: path,

package/esm/script.js

@@ -2,8 +2,9 @@
 import * as dntShim from "./_dnt.shims.js";
 import { showDiff } from "./types.js";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.js";
-import { colors, Command, Confirm, JobService, log, readAll, ScriptService, SEP, Table, writeAllSync, yamlStringify, } from "./deps.js";
+import { colors, Command, Confirm, log, readAll, SEP, Table, writeAllSync, yamlStringify, } from "./deps.js";
 import { deepEqual } from "./utils.js";
+import * as wmill from "./gen/services.gen.js";
 import { defaultScriptMetadata, scriptBootstrapCode, } from "./bootstrap/script_bootstrap.js";
 import { generateScriptMetadataInternal, parseMetadataFile, updateScriptSchema, } from "./metadata.js";
 import { inferContentTypeFromFilePath, } from "./script_common.js";
@@ -33,6 +34,29 @@ async function push(opts, filePath) {
     await handleFile(filePath, workspace, [], undefined, opts, globalDeps, codebases);
     log.info(colors.bold.underline.green(`Script ${filePath} pushed`));
 }
+export async function findResourceFile(path) {
+    const splitPath = path.split(".");
+    const contentBasePathJSON = splitPath[0] + "." + splitPath[1] + ".json";
+    const contentBasePathYAML = splitPath[0] + "." + splitPath[1] + ".yaml";
+    const validCandidates = (await Promise.all([contentBasePathJSON, contentBasePathYAML].map((x) => {
+        return dntShim.Deno.stat(x)
+            .catch(() => undefined)
+            .then((x) => x?.isFile)
+            .then((e) => {
+            return { path: x, file: e };
+        });
+    })))
+        .filter((x) => x.file)
+        .map((x) => x.path);
+    if (validCandidates.length > 1) {
+        throw new Error("Found two resource files for the same resource" +
+            validCandidates.join(", "));
+    }
+    if (validCandidates.length < 1) {
+        throw new Error(`No resource matching file resource: ${path}.`);
+    }
+    return validCandidates[0];
+}
 export async function handleScriptMetadata(path, workspace, alreadySynced, message, globalDeps, codebases, opts) {
     if (path.endsWith(".script.json") ||
         path.endsWith(".script.yaml") ||
@@ -109,7 +133,7 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
         const workspaceId = workspace.workspaceId;
         let remote = undefined;
         try {
-            remote = await ScriptService.getScriptByPath({
+            remote = await wmill.getScriptByPath({
                 workspace: workspaceId,
                 path: remotePath,
             });
@@ -227,7 +251,7 @@ async function createScript(bundleContent, workspaceId, body, workspace) {
     if (!bundleContent) {
         try {
             // no parent hash
-            await ScriptService.createScript({
+            await wmill.createScript({
                 workspace: workspaceId,
                 requestBody: body,
             });
@@ -334,6 +358,12 @@ export function filePathExtensionFromContentType(language, defaultTs) {
     else if (language === "php") {
         return ".php";
     }
+    else if (language === "rust") {
+        return ".rs";
+    }
+    else if (language === "ansible") {
+        return ".playbook.yml";
+    }
     else {
         throw new Error("Invalid language: " + language);
     }
@@ -355,6 +385,8 @@ export const exts = [
     ".gql",
     ".ps1",
     ".php",
+    ".rs",
+    ".playbook.yml",
 ];
 export function removeExtensionToPath(path) {
     for (const ext of exts) {
@@ -371,7 +403,7 @@ async function list(opts) {
     const perPage = 10;
     const total = [];
     while (true) {
-        const res = await ScriptService.listScripts({
+        const res = await wmill.listScripts({
             workspace: workspace.workspaceId,
             page,
             perPage,
@@ -414,7 +446,7 @@ async function run(opts, path) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
     const input = opts.data ? await resolve(opts.data) : {};
-    const id = await JobService.runScriptByPath({
+    const id = await wmill.runScriptByPath({
         workspace: workspace.workspaceId,
         path,
         requestBody: input,
@@ -424,7 +456,7 @@ async function run(opts, path) {
     }
     while (true) {
         try {
-            const result = (await JobService.getCompletedJob({
+            const result = (await wmill.getCompletedJob({
                 workspace: workspace.workspaceId,
                 id,
             })).result ?? {};
@@ -443,7 +475,7 @@ async function run(opts, path) {
 }
 export async function track_job(workspace, id) {
     try {
-        const result = await JobService.getCompletedJob({ workspace, id });
+        const result = await wmill.getCompletedJob({ workspace, id });
         log.info(result.logs);
         log.info("\n");
         log.info(colors.bold.underline.green("Job Completed"));
@@ -460,7 +492,7 @@ export async function track_job(workspace, id) {
     while (true) {
         let updates;
         try {
-            updates = await JobService.getJobUpdates({
+            updates = await wmill.getJobUpdates({
                 workspace,
                 id,
                 logOffset,
@@ -494,7 +526,7 @@ export async function track_job(workspace, id) {
     }
     await new Promise((resolve, _) => setTimeout(() => resolve(undefined), 1000));
     try {
-        const final_job = await JobService.getCompletedJob({ workspace, id });
+        const final_job = await wmill.getCompletedJob({ workspace, id });
         if ((final_job.logs?.length ?? -1) > logOffset) {
             log.info(final_job.logs.substring(logOffset));
         }
@@ -514,7 +546,7 @@ export async function track_job(workspace, id) {
 async function show(opts, path) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
-    const s = await ScriptService.getScriptByPath({
+    const s = await wmill.getScriptByPath({
         workspace: workspace.workspaceId,
         path,
     });

package/esm/script_common.js

@@ -44,6 +44,12 @@ export function inferContentTypeFromFilePath(contentPath, defaultTs) {
     else if (contentPath.endsWith("php")) {
         return "php";
     }
+    else if (contentPath.endsWith("rs")) {
+        return "rust";
+    }
+    else if (contentPath.endsWith(".playbook.yml")) {
+        return "ansible";
+    }
     else {
         throw new Error("Invalid language: " + contentPath.substring(contentPath.lastIndexOf(".")));
     }

package/esm/settings.js

@@ -1,20 +1,19 @@
 import * as dntShim from "./_dnt.shims.js";
-import { SettingService } from "./deps.js";
 import { yamlStringify } from "./deps.js";
 import { Confirm } from "./deps.js";
 import { colors } from "./deps.js";
-import { ConfigService } from "./deps.js";
 import { yamlParse } from "./deps.js";
-import { WorkspaceService, log } from "./deps.js";
+import { log } from "./deps.js";
 import { compareInstanceObjects } from "./instance.js";
 import { isSuperset } from "./types.js";
 import { deepEqual } from "./utils.js";
+import * as wmill from "./gen/services.gen.js";
 export async function pushWorkspaceSettings(workspace, _path, settings, localSettings) {
     try {
-        const remoteSettings = await WorkspaceService.getSettings({
+        const remoteSettings = await wmill.getSettings({
             workspace,
         });
-        const workspaceName = await WorkspaceService.getWorkspaceName({
+        const workspaceName = await wmill.getWorkspaceName({
             workspace,
         });
         settings = {
@@ -51,7 +50,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
     log.debug(`Workspace settings are not up-to-date, updating...`);
     if (localSettings.webhook !== settings.webhook) {
         log.debug(`Updateing webhook...`);
-        await WorkspaceService.editWebhook({
+        await wmill.editWebhook({
             workspace,
             requestBody: {
                 webhook: localSettings.webhook,
@@ -69,7 +68,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             throw new Error(`Invalid value for auto_invite_mode. Valid values are "invite" and "add"`);
         }
         try {
-            await WorkspaceService.editAutoInvite({
+            await wmill.editAutoInvite({
                 workspace,
                 requestBody: localSettings.auto_invite_enabled
                     ? {
@@ -83,7 +82,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
         catch (_) {
             // on cloud
             log.debug(`Auto invite is not possible on cloud, only auto-inviting same domain...`);
-            await WorkspaceService.editAutoInvite({
+            await wmill.editAutoInvite({
                 workspace,
                 requestBody: localSettings.auto_invite_enabled
                     ? {
@@ -98,7 +97,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
     if (localSettings.openai_resource_path !== settings.openai_resource_path ||
         localSettings.code_completion_enabled !== settings.code_completion_enabled) {
         log.debug(`Updating openai settings...`);
-        await WorkspaceService.editCopilotConfig({
+        await wmill.editCopilotConfig({
             workspace,
             requestBody: {
                 openai_resource_path: localSettings.openai_resource_path,
@@ -111,7 +110,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
         localSettings.error_handler_muted_on_cancel !==
             settings.error_handler_muted_on_cancel) {
         log.debug(`Updating error handler...`);
-        await WorkspaceService.editErrorHandler({
+        await wmill.editErrorHandler({
             workspace,
             requestBody: {
                 error_handler: localSettings.error_handler,
@@ -122,7 +121,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
     }
     if (localSettings.deploy_to !== settings.deploy_to) {
         log.debug(`Updating deploy to...`);
-        await WorkspaceService.editDeployTo({
+        await wmill.editDeployTo({
             workspace,
             requestBody: {
                 deploy_to: localSettings.deploy_to,
@@ -131,7 +130,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
     }
     if (!deepEqual(localSettings.large_file_storage, settings.large_file_storage)) {
         log.debug(`Updating large file storage...`);
-        await WorkspaceService.editLargeFileStorageConfig({
+        await wmill.editLargeFileStorageConfig({
             workspace,
             requestBody: {
                 large_file_storage: localSettings.large_file_storage,
@@ -140,7 +139,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
     }
     if (!deepEqual(localSettings.git_sync, settings.git_sync)) {
         log.debug(`Updating git sync...`);
-        await WorkspaceService.editWorkspaceGitSyncConfig({
+        await wmill.editWorkspaceGitSyncConfig({
             workspace,
             requestBody: {
                 git_sync_settings: localSettings.git_sync,
@@ -149,14 +148,14 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
     }
     if (!deepEqual(localSettings.default_scripts, settings.default_scripts)) {
         log.debug(`Updating default scripts...`);
-        await WorkspaceService.editDefaultScripts({
+        await wmill.editDefaultScripts({
             workspace,
             requestBody: localSettings.default_scripts,
         });
     }
     if (localSettings.default_app !== settings.default_app) {
         log.debug(`Updating default app...`);
-        await WorkspaceService.editWorkspaceDefaultApp({
+        await wmill.editWorkspaceDefaultApp({
             workspace,
             requestBody: {
                 default_app_path: localSettings.default_app,
@@ -165,7 +164,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
     }
     if (localSettings.name !== settings.name) {
         log.debug(`Updating workspace name...`);
-        await WorkspaceService.changeWorkspaceName({
+        await wmill.changeWorkspaceName({
             workspace,
             requestBody: {
                 new_name: localSettings.name,
@@ -175,9 +174,11 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
 }
 export async function pushWorkspaceKey(workspace, _path, key, localKey) {
     try {
-        key = await WorkspaceService.getWorkspaceEncryptionKey({
+        key = await wmill
+            .getWorkspaceEncryptionKey({
             workspace,
-        }).then((r) => r.key);
+        })
+            .then((r) => r.key);
     }
     catch (err) {
         throw new Error(`Failed to get workspace encryption key: ${err}`);
@@ -188,7 +189,7 @@ export async function pushWorkspaceKey(workspace, _path, key, localKey) {
             default: true,
         });
         log.debug(`Updating workspace encryption key...`);
-        await WorkspaceService.setWorkspaceEncryptionKey({
+        await wmill.setWorkspaceEncryptionKey({
             workspace,
             requestBody: {
                 new_key: localKey,
@@ -201,7 +202,7 @@ export async function pushWorkspaceKey(workspace, _path, key, localKey) {
     }
 }
 export async function pullInstanceSettings(preview = false) {
-    const remoteSettings = await SettingService.listGlobalSettings();
+    const remoteSettings = await wmill.listGlobalSettings();
     if (preview) {
         let localSettings = [];
         try {
@@ -217,7 +218,7 @@ export async function pullInstanceSettings(preview = false) {
     }
 }
 export async function pushInstanceSettings(preview = false, baseUrl) {
-    const remoteSettings = await SettingService.listGlobalSettings();
+    const remoteSettings = await wmill.listGlobalSettings();
     let localSettings = (await dntShim.Deno.readTextFile("instance_settings.yaml")
         .then((raw) => yamlParse(raw))
         .catch(() => []));
@@ -239,7 +240,7 @@ export async function pushInstanceSettings(preview = false, baseUrl) {
                 continue;
             }
             try {
-                await SettingService.setGlobal({
+                await wmill.setGlobal({
                     key: setting.name,
                     requestBody: {
                         value: setting.value,
@@ -254,7 +255,7 @@ export async function pushInstanceSettings(preview = false, baseUrl) {
             const localMatch = localSettings.find((s) => s.name === remoteSetting.name);
             if (!localMatch) {
                 try {
-                    await SettingService.setGlobal({
+                    await wmill.setGlobal({
                         key: remoteSetting.name,
                         requestBody: {
                             value: null,
@@ -270,7 +271,7 @@ export async function pushInstanceSettings(preview = false, baseUrl) {
     }
 }
 export async function pullInstanceConfigs(preview = false) {
-    const remoteConfigs = await ConfigService.listConfigs();
+    const remoteConfigs = await wmill.listConfigs();
     if (preview) {
         let localConfigs = [];
         try {
@@ -286,7 +287,7 @@ export async function pullInstanceConfigs(preview = false) {
     }
 }
 export async function pushInstanceConfigs(preview = false) {
-    const remoteConfigs = await ConfigService.listConfigs();
+    const remoteConfigs = await wmill.listConfigs();
     const localConfigs = (await dntShim.Deno.readTextFile("instance_configs.yaml")
         .then((raw) => yamlParse(raw))
         .catch(() => []));
@@ -301,7 +302,7 @@ export async function pushInstanceConfigs(preview = false) {
                 continue;
             }
             try {
-                await ConfigService.updateConfig({
+                await wmill.updateConfig({
                     name: config.name,
                     requestBody: config.config,
                 });
@@ -314,7 +315,7 @@ export async function pushInstanceConfigs(preview = false) {
             const localMatch = localConfigs.find((c) => c.name === removeConfig.name);
             if (!localMatch) {
                 try {
-                    await ConfigService.deleteConfig({
+                    await wmill.deleteConfig({
                         name: removeConfig.name,
                     });
                 }