mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-07 16:03:21 +00:00
don't print success message when workspace add is cancelled (#8003)
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
committed by
GitHub
co-authored by
Claude Opus 4.5
parent
0fe6722ad3
commit
6366087ede
@@ -260,7 +260,7 @@ export async function add(
|
||||
Deno.exit(1);
|
||||
}
|
||||
|
||||
await addWorkspace(
|
||||
const added = await addWorkspace(
|
||||
{
|
||||
name: workspaceName,
|
||||
remote: remote,
|
||||
@@ -269,6 +269,9 @@ export async function add(
|
||||
},
|
||||
opts
|
||||
);
|
||||
if (!added) {
|
||||
return;
|
||||
}
|
||||
await setActiveWorkspace(workspaceName, opts.configDir);
|
||||
|
||||
log.info(
|
||||
@@ -278,7 +281,7 @@ export async function add(
|
||||
);
|
||||
}
|
||||
|
||||
export async function addWorkspace(workspace: Workspace, opts: any) {
|
||||
export async function addWorkspace(workspace: Workspace, opts: any): Promise<boolean> {
|
||||
workspace.remote = new URL(workspace.remote).toString(); // add trailing slash in all cases!
|
||||
|
||||
// Check for conflicts before adding
|
||||
@@ -330,7 +333,7 @@ export async function addWorkspace(workspace: Workspace, opts: any) {
|
||||
|
||||
if (!overwrite) {
|
||||
log.info(colors.yellow("Operation cancelled."));
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -350,6 +353,7 @@ export async function addWorkspace(workspace: Workspace, opts: any) {
|
||||
await file.write(new TextEncoder().encode(JSON.stringify(workspace) + "\n"));
|
||||
|
||||
file.close();
|
||||
return true;
|
||||
}
|
||||
|
||||
export async function removeWorkspace(
|
||||
|
||||
@@ -121,6 +121,45 @@ Deno.test("addWorkspace: allows same workspace (name, remote, workspaceId) with
|
||||
});
|
||||
});
|
||||
|
||||
Deno.test("addWorkspace: returns true on successful add", async () => {
|
||||
await withTestConfig(async (testConfigDir) => {
|
||||
await clearTestRemotes(testConfigDir);
|
||||
|
||||
const workspace = {
|
||||
name: "return_test",
|
||||
remote: "http://localhost:8001/",
|
||||
workspaceId: "test",
|
||||
token: "token1"
|
||||
};
|
||||
|
||||
const result = await addWorkspace(workspace, { force: true, configDir: testConfigDir });
|
||||
assertEquals(result, true);
|
||||
});
|
||||
});
|
||||
|
||||
Deno.test("addWorkspace: returns true when force-overwriting conflict", async () => {
|
||||
await withTestConfig(async (testConfigDir) => {
|
||||
await clearTestRemotes(testConfigDir);
|
||||
|
||||
const workspace1 = {
|
||||
name: "force_test",
|
||||
remote: "http://localhost:8001/",
|
||||
workspaceId: "workspace1",
|
||||
token: "token1"
|
||||
};
|
||||
await addWorkspace(workspace1, { force: true, configDir: testConfigDir });
|
||||
|
||||
const workspace2 = {
|
||||
name: "force_test",
|
||||
remote: "http://localhost:8002/",
|
||||
workspaceId: "workspace2",
|
||||
token: "token2"
|
||||
};
|
||||
const result = await addWorkspace(workspace2, { force: true, configDir: testConfigDir });
|
||||
assertEquals(result, true);
|
||||
});
|
||||
});
|
||||
|
||||
Deno.test("addWorkspace: allows different workspaces on different remotes", async () => {
|
||||
await withTestConfig(async (testConfigDir) => {
|
||||
await clearTestRemotes(testConfigDir);
|
||||
|
||||
Reference in New Issue
Block a user