Feature 57 (config and provisioning): release the catalogue, the reviewed release branch merged with main, on top of main

modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go

@@ -89,7 +89,8 @@ func TestItDeclaresAndHoldsTheKnowledgeBaseSeatOnceForTheMesh(t *testing.T) {
 			t.Errorf("the manifest invokes %s, which the code never calls", inv)
 		}
 	}
-	if len(m.Build.Artifacts) != 1 || m.Build.Artifacts[0].From != "cmd/mesh-knowledge" || m.Build.Artifacts[0].Binary != Module ||
+	// The tools bundle, and the archive the build packs files/ into for the templates (novox/hq ADR 0349 §2).
+	if len(m.Build.Artifacts) != 2 || m.Build.Artifacts[1].From != "files" || m.Build.Artifacts[0].From != "cmd/mesh-knowledge" || m.Build.Artifacts[0].Binary != Module ||
 		m.Build.Artifacts[0].Env["DATABASE_URL_FILE"] == "" || m.Build.Artifacts[0].Env["MESH_KNOWLEDGE_SETTINGS"] == "" ||
 		m.Build.Artifacts[0].Env["MESH_KNOWLEDGE_STATUS"] == "" || !reflect.DeepEqual(m.Build.Artifacts[0].Loads, []string{Module}) {
 		t.Fatalf("build %+v", m.Build)
@@ -138,7 +139,7 @@ func TestItsProcessesAreThePreparationTheActAndTheJudge(t *testing.T) {
 	}
 	settings := byID["settings"]
 	var s Settings
-	if err := json.Unmarshal([]byte(settings["content"].(string)), &s); err != nil || s.JudgeModel == "" || s.ReservedFor != "168h" {
+	if err := json.Unmarshal([]byte(templateText(t, settings)), &s); err != nil || s.JudgeModel == "" || s.ReservedFor != "168h" {
 		t.Fatalf("the settings the manifest writes are not the module's: %v %+v", err, s)
 	}
 	if d, err := time.ParseDuration(s.ReservedFor); err != nil || d != DefaultReservedFor {

modules/mesh-knowledge/cmd/mesh-knowledge/templates_test.go

@@ -0,0 +1,64 @@
+package main
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+// The module's directory, where its manifest and its files/ are.
+const moduleDir = "../.."
+
+// templateText is the text a file resource places on the machine: its template's, in the module's files/
+// (novox/hq ADR 0349 §2). A resource that names no template, or a template that is not there, fails the test.
+func templateText(t *testing.T, r map[string]any) string {
+	t.Helper()
+	name, _ := r["template"].(string)
+	if name == "" {
+		t.Fatalf("resource %v names no template", r["id"])
+	}
+	raw, err := os.ReadFile(filepath.Join(moduleDir, filepath.FromSlash(name)))
+	if err != nil {
+		t.Fatalf("resource %v names %s: %v", r["id"], name, err)
+	}
+	return string(raw)
+}
+
+// No file resource carries its text inline: each names its template in files/, and the build packs files/
+// into the one archive the controller reads the templates back from (novox/hq ADR 0349 §2).
+func TestEveryFileTakesItsTextFromATemplate(t *testing.T) {
+	raw, err := os.ReadFile(filepath.Join(moduleDir, "module.json"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	var m struct {
+		Resources []map[string]any `json:"resources"`
+		Build     struct {
+			Artifacts []map[string]any `json:"artifacts"`
+		} `json:"build"`
+	}
+	if err := json.Unmarshal(raw, &m); err != nil {
+		t.Fatal(err)
+	}
+	for _, r := range m.Resources {
+		if _, inline := r["content"]; inline {
+			t.Errorf("resource %v keeps its text inline: keep it in files/ and name it as the template", r["id"])
+		}
+		if r["type"] == "file" {
+			templateText(t, r)
+		}
+	}
+	packs := 0
+	for _, a := range m.Build.Artifacts {
+		if a["kind"] == "archive" && a["from"] == "files" {
+			packs++
+			if a["name"] != "files" {
+				t.Errorf("the templates archive is named %v, not files", a["name"])
+			}
+		}
+	}
+	if packs != 1 {
+		t.Errorf("the build packs files/ into %d archives, not one", packs)
+	}
+}

modules/mesh-knowledge/files/database.url

@@ -0,0 +1 @@
+postgresql://${bound:postgres-database:as}:${secret:postgres-database}@${bound:postgres-database:at}:${bound:postgres-database:port}/${bound:postgres-database:as}

modules/mesh-knowledge/files/settings.json

@@ -0,0 +1,5 @@
+{
+  "judge-model": "sonnet",
+  "drafting": "on",
+  "reserved-for": "168h"
+}

modules/mesh-knowledge/module.json

@@ -77,6 +77,24 @@
     "records.records_read",
     "seat:operator-channel.notify"
   ],
+  "config": {
+    "judge-model": {
+      "type": "string",
+      "description": "The model the knowledge base's drafting and confirming judgements ask, by the agent's name for it, such as sonnet; empty is sonnet.",
+      "default": "sonnet"
+    },
+    "drafting": {
+      "type": "string",
+      "description": "Whether the knowledge base drafts and confirms clauses itself: off stops it, anything else is on.",
+      "default": "on"
+    },
+    "reserved-for": {
+      "type": "string",
+      "description": "How long a reserved number waits for its proposal before it is withdrawn, as a duration such as 168h; empty is the knowledge base's own default.",
+      "pattern": "|[0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h)([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))*",
+      "default": "168h"
+    }
+  },
   "resources": [
     {
       "id": "state",
@@ -89,7 +107,7 @@
       "type": "file",
       "path": "${dir:state}/database.url",
       "mode": "0600",
-      "content": "postgresql://${bound:postgres-database:as}:${secret:postgres-database}@${bound:postgres-database:at}:${bound:postgres-database:port}/${bound:postgres-database:as}\n"
+      "template": "files/database.url"
     },
     {
       "id": "settings",
@@ -97,8 +115,9 @@
       "type": "file",
       "path": "${dir:state}/settings.json",
       "mode": "0600",
+      "takes-config": ["judge-model", "drafting", "reserved-for"],
       "merge": "json",
-      "content": "{\n  \"judge-model\": \"sonnet\",\n  \"drafting\": \"on\",\n  \"reserved-for\": \"168h\"\n}\n"
+      "template": "files/settings.json"
     },
     {
       "id": "prepare",
@@ -181,6 +200,11 @@
           "MESH_KNOWLEDGE_SETTINGS": "${dir:state}/settings.json",
           "MESH_KNOWLEDGE_STATUS": "${dir:state}/health.json"
         }
+      },
+      {
+        "name": "files",
+        "kind": "archive",
+        "from": "files"
       }
     ]
   }