Skip to content

Commit 830524b

Browse files
committed
Update dependencies
1 parent acf2d88 commit 830524b

15 files changed

+102
-93
lines changed

deno.lock

+48-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/multi/multi-1.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default {
88
cpus: 15,
99
memoryGiBs: 50,
1010
diskGiBs: 200,
11-
k3sVersion: "v1.24.17+k3s1",
11+
k3sVersion: "v1.26.15+k3s1",
1212
serviceCidr: "10.254.244.0/22",
1313
clusterCidr: "10.254.248.0/21",
1414
clusterDnsIp: "10.254.244.10",

flake.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/actions/create.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
parseYaml,
1111
resolvePath,
1212
stringifyYaml,
13-
Type,
1413
} from "../deps.ts";
1514
import {
1615
multipass,
@@ -194,10 +193,10 @@ export async function createInstance(instance: InstanceConfig, signal: AbortSign
194193
}
195194

196195
export default createCliAction(
197-
Type.Object({
196+
{
198197
config: InstanceConfigPathSchema,
199-
}),
200-
async ({ config: configPath }, _, signal) => {
198+
},
199+
async ({ config: configPath }, signal) => {
201200
const absoluteConfigPath = resolvePath(configPath);
202201
const instance = await loadInstanceConfig(absoluteConfigPath);
203202

src/actions/destroy.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ export async function destroyInstance(instance: InstanceConfig) {
2727
}
2828

2929
export default createCliAction(
30-
Type.Object({
30+
{
3131
config: InstanceConfigPathSchema,
3232
skipConfirm: Type.Optional(Type.Boolean({
3333
default: false,
3434
})),
35-
}),
35+
},
3636
async ({ config: configPath, skipConfirm }) => {
3737
const absoluteConfigPath = resolvePath(configPath);
3838
const instance = await loadInstanceConfig(absoluteConfigPath);

src/actions/refresh.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { createCliAction, ExitCode, resolvePath, Type } from "../deps.ts";
1+
import { createCliAction, ExitCode, resolvePath } from "../deps.ts";
22
import { multipassInfo, multipassPostStart } from "../multipass.ts";
33
import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
44
import { err, loadInstanceConfig, ok } from "../utils.ts";
55
import { updateKubeconfig } from "./create.ts";
66

77
export default createCliAction(
8-
Type.Object({
8+
{
99
config: InstanceConfigPathSchema,
10-
}),
11-
async ({ config: configPath }, _, signal) => {
10+
},
11+
async ({ config: configPath }, signal) => {
1212
const absoluteConfigPath = resolvePath(configPath);
1313
const instance = await loadInstanceConfig(absoluteConfigPath);
1414

src/actions/reset.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import { createInstance } from "./create.ts";
55
import { destroyInstance } from "./destroy.ts";
66

77
export default createCliAction(
8-
Type.Object({
8+
{
99
config: InstanceConfigPathSchema,
1010
skipConfirm: Type.Optional(Type.Boolean({
1111
default: false,
1212
})),
13-
}),
14-
async ({ config: configPath, skipConfirm }, _, signal) => {
13+
},
14+
async ({ config: configPath, skipConfirm }, signal) => {
1515
const absoluteConfigPath = resolvePath(configPath);
1616
const instance = await loadInstanceConfig(absoluteConfigPath);
1717
const { name } = instance;

src/actions/resize.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { createCliAction, ExitCode, resolvePath, Type } from "../deps.ts";
1+
import { createCliAction, ExitCode, resolvePath } from "../deps.ts";
22
import { multipassInfo, multipassResize } from "../multipass.ts";
33
import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
44
import { loadInstanceConfig, ok } from "../utils.ts";
55

66
export default createCliAction(
7-
Type.Object({
7+
{
88
config: InstanceConfigPathSchema,
9-
}),
9+
},
1010
async ({ config: configPath }) => {
1111
const absoluteConfigPath = resolvePath(configPath);
1212
const instance = await loadInstanceConfig(absoluteConfigPath);

src/actions/ssh.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import { createCliAction, ExitCode, gray, resolvePath, Type } from "../deps.ts";
1+
import { createCliAction, ExitCode, gray, NonEmptyString, resolvePath, Type } from "../deps.ts";
22
import { multipassInfo, multipassSshInteractive } from "../multipass.ts";
33
import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
44
import { getExternalIp, loadInstanceConfig, log } from "../utils.ts";
55

66
export default createCliAction(
7-
Type.Object({
7+
{
88
config: InstanceConfigPathSchema,
9-
}),
10-
async (args, unparsedArgs) => {
11-
const absoluteConfigPath = resolvePath(args.config);
9+
"--": Type.Array(NonEmptyString()),
10+
},
11+
async ({ config, "--": cmd }) => {
12+
const absoluteConfigPath = resolvePath(config);
1213
const instance = await loadInstanceConfig(absoluteConfigPath);
1314
const { name, sshDirectoryPath } = instance;
1415

@@ -23,7 +24,7 @@ export default createCliAction(
2324
log(gray(`Instance IP is '${ip}'`));
2425

2526
const exitCode = await multipassSshInteractive({
26-
cmd: unparsedArgs,
27+
cmd: cmd,
2728
sshDirectoryPath,
2829
ip: getExternalIp(ipv4, instance.externalNetworkCidr),
2930
});

src/actions/start.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { createCliAction, ExitCode, gray, resolvePath, Type } from "../deps.ts";
1+
import { createCliAction, ExitCode, gray, resolvePath } from "../deps.ts";
22
import { multipassInfo, multipassInheritSsh, multipassPostStart, multipassStart } from "../multipass.ts";
33
import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
44
import { loadInstanceConfig, log, ok } from "../utils.ts";
55
import { updateKubeconfig } from "./create.ts";
66

77
export default createCliAction(
8-
Type.Object({
8+
{
99
config: InstanceConfigPathSchema,
10-
}),
11-
async ({ config: configPath }, _, signal) => {
10+
},
11+
async ({ config: configPath }, signal) => {
1212
const absoluteConfigPath = resolvePath(configPath);
1313
const instance = await loadInstanceConfig(absoluteConfigPath);
1414
const { name } = instance;

src/actions/stop.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { createCliAction, ExitCode, resolvePath, Type } from "../deps.ts";
1+
import { createCliAction, ExitCode, resolvePath } from "../deps.ts";
22
import { multipassInfo, multipassK3sKillAll, multipassStop, multipassUnroute } from "../multipass.ts";
33
import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
44
import { getExternalIp, loadInstanceConfig, ok } from "../utils.ts";
55

66
export default createCliAction(
7-
Type.Object({
7+
{
88
config: InstanceConfigPathSchema,
9-
}),
9+
},
1010
async ({ config: configPath }) => {
1111
const absoluteConfigPath = resolvePath(configPath);
1212
const instance = await loadInstanceConfig(absoluteConfigPath);

src/actions/suspend.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { createCliAction, ExitCode, resolvePath, Type } from "../deps.ts";
1+
import { createCliAction, ExitCode, resolvePath } from "../deps.ts";
22
import { multipassInfo, multipassSuspend, multipassUnroute } from "../multipass.ts";
33
import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
44
import { loadInstanceConfig, ok } from "../utils.ts";
55

66
export default createCliAction(
7-
Type.Object({
7+
{
88
config: InstanceConfigPathSchema,
9-
}),
9+
},
1010
async ({ config: configPath }) => {
1111
const absoluteConfigPath = resolvePath(configPath);
1212
const instance = await loadInstanceConfig(absoluteConfigPath);

src/actions/version.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { createCliAction, ExitCode, Type } from "../deps.ts";
1+
import { createCliAction, ExitCode } from "../deps.ts";
22

33
export default createCliAction(
4-
Type.Object({}),
4+
{},
55
() => {
66
console.log({ app: Deno.env.get("JETSKI_VERSION") ?? "dev", ...Deno.version });
77
return Promise.resolve(ExitCode.Zero);

src/deps.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
export * from "jsr:@wok/utils@~1.1.3/cli";
2-
export * from "jsr:@wok/utils@~1.1.3/exec";
3-
export * from "jsr:@wok/utils@~1.1.3/validation";
1+
export * from "jsr:@wok/utils@1.3.2/cli";
2+
export * from "jsr:@wok/utils@1.3.2/exec";
3+
export * from "jsr:@wok/utils@1.3.2/validation";
44
export * from "./deps/typebox.ts";
5-
export type { ValidationResult } from "jsr:@wok/utils@~1.1.3/validation";
6-
export * from "jsr:@std/fmt@^0.221.0/colors";
5+
export type { ValidationResult } from "jsr:@wok/utils@1.3.2/validation";
6+
export * from "jsr:@std/fmt@0.224.0/colors";
77

88
export {
99
basename,
@@ -12,11 +12,11 @@ export {
1212
fromFileUrl,
1313
join as joinPath,
1414
resolve as resolvePath,
15-
} from "jsr:@std/path@^0.221.0";
15+
} from "jsr:@std/path@0.224.0";
1616

17-
export { parse as parseYaml, stringify as stringifyYaml } from "jsr:@std/yaml@^0.221.0";
18-
export { exists as fsExists } from "jsr:@std/fs@^0.221.0/exists";
19-
export { ensureFile } from "jsr:@std/fs@^0.221.0/ensure-file";
20-
export { assertExists } from "jsr:@std/assert@^0.221.0/assert-exists";
21-
export { memoizePromise } from "jsr:@wok/utils@~1.1.3/async";
22-
export { delay } from "jsr:@std/async@^0.221.0/delay";
17+
export { parse as parseYaml, stringify as stringifyYaml } from "jsr:@std/yaml@0.224.0";
18+
export { exists as fsExists } from "jsr:@std/fs@0.224.0/exists";
19+
export { ensureFile } from "jsr:@std/fs@0.224.0/ensure-file";
20+
export { assertExists } from "jsr:@std/assert@0.224.0/assert-exists";
21+
export { memoizePromise } from "jsr:@wok/utils@1.3.2/async";
22+
export { delay } from "jsr:@std/async@0.224.0/delay";

src/deps/typebox.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from "jsr:@wok/utils@~1.1.3/typebox";
1+
export * from "jsr:@wok/utils@1.3.2/typebox";

0 commit comments

Comments
 (0)