feat(incus): support agent:config in vm

adaltas · May 6, 2024 · cc39db9 · cc39db9
1 parent 70dd2c7
commit cc39db9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/packages/incus/lib/init/index.js b/packages/incus/lib/init/index.js
@@ -1,15 +1,18 @@
 // Dependencies
 import dedent from "dedent";
 import definitions from "./schema.json" assert { type: "json" };
+import { escapeshellarg as esa } from "@nikitajs/core/utils/string";
 
 // Action
 export default {
   handler: async function({config}) {
-    const command_init = [
+    const configValue = Object.entries(config.config).map(([key, value]) => `--config ${key}=${value}`).join(` `)
+    const commandInit = [
       "incus",
       "init",
       config.image,
       config.container,
+      configValue,
       config.network && `--network ${config.network}`,
       config.storage && `--storage ${config.storage}`,
       config.ephemeral && "--ephemeral",
@@ -18,13 +21,22 @@ export default {
       config.target && `--target ${config.target}`,
     ].filter(Boolean).join(" ");
     // Execution
-    const {$status} = (await this.execute({
+    const {$status} = await this.execute({
       command: dedent`
         incus info ${config.container} >/dev/null && exit 42
-        echo '' | ${command_init}
+        echo '' | ${commandInit}
       `,
       code: [0, 42]
-    }));
+    });
+    if (config.vm) {
+      // See `agent:config` annoucement in 0.5.1
+      // https://discuss.linuxcontainers.org/t/incus-0-5-1-has-been-released/18848
+      await this.execute({
+        command: dedent`
+          incus config device add ${esa(config.container)} agent disk source=agent:config
+        `,
+      });
+    } 
     await this.incus.start({
       $if: config.start,
       container: config.container

diff --git a/packages/incus/lib/init/schema.json b/packages/incus/lib/init/schema.json
@@ -23,6 +23,11 @@
         "type": "string",
         "description": "Profile to set this container up."
       },
+      "config": {
+        "type": "object",
+        "default": {},
+        "description": "Config key/value to apply to the new instance."
+      },
       "ephemeral": {
         "type": "boolean",
         "default": false,

diff --git a/packages/incus/test/wait/ready.coffee b/packages/incus/test/wait/ready.coffee
@@ -47,7 +47,7 @@ describe 'incus.wait.ready', ->
             image: "images:centos/7"
             container: 'nikita-wait-2'
             vm: true
-            properties:
+            config:
               'security.secureboot': false
             start: true
           {$status} = await @incus.wait.ready 'nikita-wait-2'
@@ -72,7 +72,7 @@ describe 'incus.wait.ready', ->
             image: "images:centos/7"
             container: 'nikita-wait-3'
             vm: true
-            properties:
+            config:
               'security.secureboot': false
             start: true
           await @incus.wait.ready 'nikita-wait-3'
@@ -102,10 +102,10 @@ describe 'incus.wait.ready', ->
             image: "images:centos/7"
             container: 'nikita-wait-4'
             vm: true
-            properties:
+            config:
               'security.secureboot': false
             start: true
-          {$status} = await @incus.exec 
+          await @incus.exec 
             container: 'nikita-wait-4'
             command: '''
             echo "hello"