Update dependencies

shopstic · May 20, 2024 · 830524b · 830524b
1 parent acf2d88
commit 830524b
Show file tree

Hide file tree

Showing 15 changed files with 102 additions and 93 deletions.
diff --git a/deno.lock b/deno.lock
@@ -2,63 +2,72 @@
   "version": "3",
   "packages": {
     "specifiers": {
-      "jsr:@std/assert@^0.221.0": "jsr:@std/assert@0.221.0",
-      "jsr:@std/assert@~0.221.0": "jsr:@std/assert@0.221.0",
-      "jsr:@std/async@^0.221.0": "jsr:@std/async@0.221.0",
-      "jsr:@std/async@~0.221.0": "jsr:@std/async@0.221.0",
-      "jsr:@std/bytes@^0.221.0": "jsr:@std/bytes@0.221.0",
-      "jsr:@std/fmt@^0.221.0": "jsr:@std/fmt@0.221.0",
-      "jsr:@std/fs@^0.221.0": "jsr:@std/fs@0.221.0",
-      "jsr:@std/path@^0.221.0": "jsr:@std/path@0.221.0",
-      "jsr:@std/streams@~0.221.0": "jsr:@std/streams@0.221.0",
-      "jsr:@std/yaml@^0.221.0": "jsr:@std/yaml@0.221.0",
-      "jsr:@wok/typebox@~0.32.0": "jsr:@wok/typebox@0.32.20+2",
-      "jsr:@wok/utils@~1.1.3": "jsr:@wok/utils@1.1.5"
+      "jsr:@std/assert@0.224.0": "jsr:@std/assert@0.224.0",
+      "jsr:@std/assert@^0.224.0": "jsr:@std/assert@0.224.0",
+      "jsr:@std/async@0.224.0": "jsr:@std/async@0.224.0",
+      "jsr:@std/bytes@^0.224.0": "jsr:@std/bytes@0.224.0",
+      "jsr:@std/cli@0.224.0": "jsr:@std/cli@0.224.0",
+      "jsr:@std/fmt@0.224.0": "jsr:@std/fmt@0.224.0",
+      "jsr:@std/fs@0.224.0": "jsr:@std/fs@0.224.0",
+      "jsr:@std/path@0.224.0": "jsr:@std/path@0.224.0",
+      "jsr:@std/path@^0.224.0": "jsr:@std/path@0.224.0",
+      "jsr:@std/streams@0.224.0": "jsr:@std/streams@0.224.0",
+      "jsr:@std/yaml@0.224.0": "jsr:@std/yaml@0.224.0",
+      "jsr:@wok/case@1.0.1": "jsr:@wok/case@1.0.1",
+      "jsr:@wok/typebox@0.32.30+1": "jsr:@wok/typebox@0.32.30+1",
+      "jsr:@wok/utils@1.3.2": "jsr:@wok/utils@1.3.2"
     },
     "jsr": {
-      "@std/assert@0.221.0": {
-        "integrity": "a5f1aa6e7909dbea271754fd4ab3f4e687aeff4873b4cef9a320af813adb489a"
+      "@std/assert@0.224.0": {
+        "integrity": "8643233ec7aec38a940a8264a6e3eed9bfa44e7a71cc6b3c8874213ff401967f"
       },
-      "@std/async@0.221.0": {
-        "integrity": "f5519861754a1bb2898d227dd8ccb545abc975534aa9063e53911d6cb4e365cf"
+      "@std/async@0.224.0": {
+        "integrity": "b6da423eeafbd0003fe88d950e069368c6a156f8b5293b7adbd9c8903a8f8d66"
       },
-      "@std/bytes@0.221.0": {
-        "integrity": "64a047011cf833890a4a2ab7293ac55a1b4f5a050624ebc6a0159c357de91966"
+      "@std/bytes@0.224.0": {
+        "integrity": "a2250e1d0eb7d1c5a426f21267ab9bdeac2447fa87a3d0d1a467d3f7a6058e49"
       },
-      "@std/fmt@0.221.0": {
-        "integrity": "379fed69bdd9731110f26b9085aeb740606b20428ce6af31ef6bd45ef8efa62a"
+      "@std/cli@0.224.0": {
+        "integrity": "2612373d68984637bdad8b9c9dd160e9838ac2a6d463354d537d2897a7cc6d1c"
       },
-      "@std/fs@0.221.0": {
-        "integrity": "028044450299de8ed5a716ade4e6d524399f035513b85913794f4e81f07da286",
+      "@std/fmt@0.224.0": {
+        "integrity": "e20e9a2312a8b5393272c26191c0a68eda8d2c4b08b046bad1673148f1d69851"
+      },
+      "@std/fs@0.224.0": {
+        "integrity": "52a5ec89731ac0ca8f971079339286f88c571a4d61686acf75833f03a89d8e69",
         "dependencies": [
-          "jsr:@std/path@^0.221.0"
+          "jsr:@std/path@^0.224.0"
         ]
       },
-      "@std/path@0.221.0": {
-        "integrity": "0a36f6b17314ef653a3a1649740cc8db51b25a133ecfe838f20b79a56ebe0095",
+      "@std/path@0.224.0": {
+        "integrity": "55bca6361e5a6d158b9380e82d4981d82d338ec587de02951e2b7c3a24910ee6",
         "dependencies": [
-          "jsr:@std/assert@^0.221.0"
+          "jsr:@std/assert@^0.224.0"
         ]
       },
-      "@std/streams@0.221.0": {
-        "integrity": "47f2f74634b47449277c0ee79fe878da4424b66bd8975c032e3afdca88986e61",
+      "@std/streams@0.224.0": {
+        "integrity": "9c21feb45113abfc67dd536029624d1792d56dfbb029b8c1baf4ad5a2c35769e",
         "dependencies": [
-          "jsr:@std/bytes@^0.221.0"
+          "jsr:@std/bytes@^0.224.0"
         ]
       },
-      "@std/yaml@0.221.0": {
-        "integrity": "bac8913ee4f6fc600d4b92cc020f755070e22687ad242341f31d123ff690ae98"
+      "@std/yaml@0.224.0": {
+        "integrity": "9bd99c6beb4d2db98de81c50853f15e68d4c95f38d737934b0e909bbeeff2b6d"
+      },
+      "@wok/case@1.0.1": {
+        "integrity": "409e94f961f5b278992bace87a0c7d3c6a3db516d01759bdb827d9ae4d75e9aa"
       },
-      "@wok/typebox@0.32.20+2": {
-        "integrity": "abc7670454142e94c8bc28e7b6dc66bbd9405654846c095499f1dea08bc876b4"
+      "@wok/typebox@0.32.30+1": {
+        "integrity": "da8949d6702f140b3b02c052e636adc35711e67a321be825fe5f43f85038e80b"
       },
-      "@wok/utils@1.1.5": {
-        "integrity": "2a7581c49b3d9738167e0b81018b9a014f0af11726def8534f757a0a1f549ba4",
+      "@wok/utils@1.3.2": {
+        "integrity": "34fea8257436378edda23621c9c1da7d7672e96e8f4e51f8baedf98d394238ab",
         "dependencies": [
-          "jsr:@std/assert@~0.221.0",
-          "jsr:@std/async@~0.221.0",
-          "jsr:@std/streams@~0.221.0",
-          "jsr:@wok/typebox@~0.32.0"
+          "jsr:@std/cli@0.224.0",
+          "jsr:@std/fmt@0.224.0",
+          "jsr:@std/streams@0.224.0",
+          "jsr:@wok/case@1.0.1",
+          "jsr:@wok/typebox@0.32.30+1"
         ]
       }
     }

diff --git a/examples/multi/multi-1.ts b/examples/multi/multi-1.ts
@@ -8,7 +8,7 @@ export default {
   cpus: 15,
   memoryGiBs: 50,
   diskGiBs: 200,
-  k3sVersion: "v1.24.17+k3s1",
+  k3sVersion: "v1.26.15+k3s1",
   serviceCidr: "10.254.244.0/22",
   clusterCidr: "10.254.248.0/21",
   clusterDnsIp: "10.254.244.10",

diff --git a/flake.lock b/flake.lock
diff --git a/src/actions/create.ts b/src/actions/create.ts
@@ -10,7 +10,6 @@ import {
   parseYaml,
   resolvePath,
   stringifyYaml,
-  Type,
 } from "../deps.ts";
 import {
   multipass,
@@ -194,10 +193,10 @@ export async function createInstance(instance: InstanceConfig, signal: AbortSign
 }
 
 export default createCliAction(
-  Type.Object({
+  {
     config: InstanceConfigPathSchema,
-  }),
-  async ({ config: configPath }, _, signal) => {
+  },
+  async ({ config: configPath }, signal) => {
     const absoluteConfigPath = resolvePath(configPath);
     const instance = await loadInstanceConfig(absoluteConfigPath);
 

diff --git a/src/actions/destroy.ts b/src/actions/destroy.ts
@@ -27,12 +27,12 @@ export async function destroyInstance(instance: InstanceConfig) {
 }
 
 export default createCliAction(
-  Type.Object({
+  {
     config: InstanceConfigPathSchema,
     skipConfirm: Type.Optional(Type.Boolean({
       default: false,
     })),
-  }),
+  },
   async ({ config: configPath, skipConfirm }) => {
     const absoluteConfigPath = resolvePath(configPath);
     const instance = await loadInstanceConfig(absoluteConfigPath);

diff --git a/src/actions/refresh.ts b/src/actions/refresh.ts
@@ -1,14 +1,14 @@
-import { createCliAction, ExitCode, resolvePath, Type } from "../deps.ts";
+import { createCliAction, ExitCode, resolvePath } from "../deps.ts";
 import { multipassInfo, multipassPostStart } from "../multipass.ts";
 import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
 import { err, loadInstanceConfig, ok } from "../utils.ts";
 import { updateKubeconfig } from "./create.ts";
 
 export default createCliAction(
-  Type.Object({
+  {
     config: InstanceConfigPathSchema,
-  }),
-  async ({ config: configPath }, _, signal) => {
+  },
+  async ({ config: configPath }, signal) => {
     const absoluteConfigPath = resolvePath(configPath);
     const instance = await loadInstanceConfig(absoluteConfigPath);
 

diff --git a/src/actions/reset.ts b/src/actions/reset.ts
@@ -5,13 +5,13 @@ import { createInstance } from "./create.ts";
 import { destroyInstance } from "./destroy.ts";
 
 export default createCliAction(
-  Type.Object({
+  {
     config: InstanceConfigPathSchema,
     skipConfirm: Type.Optional(Type.Boolean({
       default: false,
     })),
-  }),
-  async ({ config: configPath, skipConfirm }, _, signal) => {
+  },
+  async ({ config: configPath, skipConfirm }, signal) => {
     const absoluteConfigPath = resolvePath(configPath);
     const instance = await loadInstanceConfig(absoluteConfigPath);
     const { name } = instance;

diff --git a/src/actions/resize.ts b/src/actions/resize.ts
@@ -1,12 +1,12 @@
-import { createCliAction, ExitCode, resolvePath, Type } from "../deps.ts";
+import { createCliAction, ExitCode, resolvePath } from "../deps.ts";
 import { multipassInfo, multipassResize } from "../multipass.ts";
 import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
 import { loadInstanceConfig, ok } from "../utils.ts";
 
 export default createCliAction(
-  Type.Object({
+  {
     config: InstanceConfigPathSchema,
-  }),
+  },
   async ({ config: configPath }) => {
     const absoluteConfigPath = resolvePath(configPath);
     const instance = await loadInstanceConfig(absoluteConfigPath);

diff --git a/src/actions/ssh.ts b/src/actions/ssh.ts
@@ -1,14 +1,15 @@
-import { createCliAction, ExitCode, gray, resolvePath, Type } from "../deps.ts";
+import { createCliAction, ExitCode, gray, NonEmptyString, resolvePath, Type } from "../deps.ts";
 import { multipassInfo, multipassSshInteractive } from "../multipass.ts";
 import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
 import { getExternalIp, loadInstanceConfig, log } from "../utils.ts";
 
 export default createCliAction(
-  Type.Object({
+  {
     config: InstanceConfigPathSchema,
-  }),
-  async (args, unparsedArgs) => {
-    const absoluteConfigPath = resolvePath(args.config);
+    "--": Type.Array(NonEmptyString()),
+  },
+  async ({ config, "--": cmd }) => {
+    const absoluteConfigPath = resolvePath(config);
     const instance = await loadInstanceConfig(absoluteConfigPath);
     const { name, sshDirectoryPath } = instance;
 
@@ -23,7 +24,7 @@ export default createCliAction(
     log(gray(`Instance IP is '${ip}'`));
 
     const exitCode = await multipassSshInteractive({
-      cmd: unparsedArgs,
+      cmd: cmd,
       sshDirectoryPath,
       ip: getExternalIp(ipv4, instance.externalNetworkCidr),
     });

diff --git a/src/actions/start.ts b/src/actions/start.ts
@@ -1,14 +1,14 @@
-import { createCliAction, ExitCode, gray, resolvePath, Type } from "../deps.ts";
+import { createCliAction, ExitCode, gray, resolvePath } from "../deps.ts";
 import { multipassInfo, multipassInheritSsh, multipassPostStart, multipassStart } from "../multipass.ts";
 import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
 import { loadInstanceConfig, log, ok } from "../utils.ts";
 import { updateKubeconfig } from "./create.ts";
 
 export default createCliAction(
-  Type.Object({
+  {
     config: InstanceConfigPathSchema,
-  }),
-  async ({ config: configPath }, _, signal) => {
+  },
+  async ({ config: configPath }, signal) => {
     const absoluteConfigPath = resolvePath(configPath);
     const instance = await loadInstanceConfig(absoluteConfigPath);
     const { name } = instance;

diff --git a/src/actions/stop.ts b/src/actions/stop.ts
@@ -1,12 +1,12 @@
-import { createCliAction, ExitCode, resolvePath, Type } from "../deps.ts";
+import { createCliAction, ExitCode, resolvePath } from "../deps.ts";
 import { multipassInfo, multipassK3sKillAll, multipassStop, multipassUnroute } from "../multipass.ts";
 import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
 import { getExternalIp, loadInstanceConfig, ok } from "../utils.ts";
 
 export default createCliAction(
-  Type.Object({
+  {
     config: InstanceConfigPathSchema,
-  }),
+  },
   async ({ config: configPath }) => {
     const absoluteConfigPath = resolvePath(configPath);
     const instance = await loadInstanceConfig(absoluteConfigPath);

diff --git a/src/actions/suspend.ts b/src/actions/suspend.ts
@@ -1,12 +1,12 @@
-import { createCliAction, ExitCode, resolvePath, Type } from "../deps.ts";
+import { createCliAction, ExitCode, resolvePath } from "../deps.ts";
 import { multipassInfo, multipassSuspend, multipassUnroute } from "../multipass.ts";
 import { InstanceConfigPathSchema, InstanceState } from "../types.ts";
 import { loadInstanceConfig, ok } from "../utils.ts";
 
 export default createCliAction(
-  Type.Object({
+  {
     config: InstanceConfigPathSchema,
-  }),
+  },
   async ({ config: configPath }) => {
     const absoluteConfigPath = resolvePath(configPath);
     const instance = await loadInstanceConfig(absoluteConfigPath);

diff --git a/src/actions/version.ts b/src/actions/version.ts
@@ -1,7 +1,7 @@
-import { createCliAction, ExitCode, Type } from "../deps.ts";
+import { createCliAction, ExitCode } from "../deps.ts";
 
 export default createCliAction(
-  Type.Object({}),
+  {},
   () => {
     console.log({ app: Deno.env.get("JETSKI_VERSION") ?? "dev", ...Deno.version });
     return Promise.resolve(ExitCode.Zero);

diff --git a/src/deps.ts b/src/deps.ts
@@ -1,9 +1,9 @@
-export * from "jsr:@wok/utils@~1.1.3/cli";
-export * from "jsr:@wok/utils@~1.1.3/exec";
-export * from "jsr:@wok/utils@~1.1.3/validation";
+export * from "jsr:@wok/utils@1.3.2/cli";
+export * from "jsr:@wok/utils@1.3.2/exec";
+export * from "jsr:@wok/utils@1.3.2/validation";
 export * from "./deps/typebox.ts";
-export type { ValidationResult } from "jsr:@wok/utils@~1.1.3/validation";
-export * from "jsr:@std/fmt@^0.221.0/colors";
+export type { ValidationResult } from "jsr:@wok/utils@1.3.2/validation";
+export * from "jsr:@std/fmt@0.224.0/colors";
 
 export {
   basename,
@@ -12,11 +12,11 @@ export {
   fromFileUrl,
   join as joinPath,
   resolve as resolvePath,
-} from "jsr:@std/path@^0.221.0";
+} from "jsr:@std/path@0.224.0";
 
-export { parse as parseYaml, stringify as stringifyYaml } from "jsr:@std/yaml@^0.221.0";
-export { exists as fsExists } from "jsr:@std/fs@^0.221.0/exists";
-export { ensureFile } from "jsr:@std/fs@^0.221.0/ensure-file";
-export { assertExists } from "jsr:@std/assert@^0.221.0/assert-exists";
-export { memoizePromise } from "jsr:@wok/utils@~1.1.3/async";
-export { delay } from "jsr:@std/async@^0.221.0/delay";
+export { parse as parseYaml, stringify as stringifyYaml } from "jsr:@std/yaml@0.224.0";
+export { exists as fsExists } from "jsr:@std/fs@0.224.0/exists";
+export { ensureFile } from "jsr:@std/fs@0.224.0/ensure-file";
+export { assertExists } from "jsr:@std/assert@0.224.0/assert-exists";
+export { memoizePromise } from "jsr:@wok/utils@1.3.2/async";
+export { delay } from "jsr:@std/async@0.224.0/delay";
diff --git a/src/deps/typebox.ts b/src/deps/typebox.ts
@@ -1 +1 @@
-export * from "jsr:@wok/utils@~1.1.3/typebox";
+export * from "jsr:@wok/utils@1.3.2/typebox";