diff --git a/modules/mesh-delivery-builder/manifest_test.go b/modules/mesh-delivery-builder/manifest_test.go index c0f8fbea8..99dae55a5 100644 --- a/modules/mesh-delivery-builder/manifest_test.go +++ b/modules/mesh-delivery-builder/manifest_test.go @@ -45,7 +45,9 @@ type manifest struct { Module string `json:"module"` Version string `json:"version"` Slug string `json:"slug"` - Claims []struct { + // Class is core: the builder claims a seat (design 47 H2 §810, §814; H-A-394 (1)). + Class string `json:"class"` + Claims []struct { Name string `json:"name"` Scope string `json:"scope"` Serves []string `json:"serves"` @@ -82,9 +84,9 @@ type manifest struct { Default any `json:"default"` Runtime bool `json:"runtime"` } `json:"config"` - OwnSecrets map[string]string `json:"own-secrets"` - SecretsOwner string `json:"secrets-owner"` - Resources []map[string]any `json:"resources"` + OwnSecrets map[string]any `json:"own-secrets"` + SecretsOwner string `json:"secrets-owner"` + Resources []map[string]any `json:"resources"` Build struct { Artifacts []artifact `json:"artifacts"` } `json:"build"` @@ -120,7 +122,7 @@ func TestManifestDeclarations(t *testing.T) { // 1607/AC1 if m.Module != "mesh-delivery-builder" { t.Errorf("module = %q", m.Module) } - if want := []state{{Name: "builds", History: 5}, {Name: "engine-reads", History: 1}, {Name: "findings", History: 5}, {Name: "floor-waits", History: 1}, {Name: "hearing", History: 1}, {Name: "instances", History: 1}, {Name: "old-form", History: 1}, {Name: "bounds", History: 1, KeyTTL: true}, {Name: "taken", History: 1, KeyTTL: true, MaxMiB: 8}, {Name: "queues", History: 1}, {Name: "toolchains-heard", History: 1}, {Name: "waits", History: 1, MaxMiB: 4}, {Name: "reserved", History: 1}, {Name: "publish-queue", History: 1, MaxMiB: 4}, {Name: "acted", History: 1, MaxMiB: 1}, {Name: "asked", History: 1}, {Name: "reasks", History: 1}, {Name: "versions", History: 1}, {Name: "first-views", History: 1}, {Name: "unbuildable", History: 1, MaxMiB: 8}, {Name: "consumers", History: 1, MaxMiB: 8}}; !reflect.DeepEqual(m.State, want) { // builds.BuilderBuildsHistory + if want := []state{{Name: "builds", History: 5, MaxMiB: 128}, {Name: "engine-reads", History: 1, MaxMiB: 8}, {Name: "findings", History: 5, MaxMiB: 32}, {Name: "floor-waits", History: 1, MaxMiB: 8}, {Name: "hearing", History: 1, MaxMiB: 8}, {Name: "instances", History: 1, MaxMiB: 8}, {Name: "old-form", History: 1, MaxMiB: 8}, {Name: "bounds", History: 1, KeyTTL: true, MaxMiB: 16}, {Name: "taken", History: 1, KeyTTL: true, MaxMiB: 8}, {Name: "queues", History: 1, MaxMiB: 8}, {Name: "toolchains-heard", History: 1, MaxMiB: 8}, {Name: "waits", History: 1, MaxMiB: 4}, {Name: "reserved", History: 1, MaxMiB: 8}, {Name: "publish-queue", History: 1, MaxMiB: 4}, {Name: "acted", History: 1, MaxMiB: 1}, {Name: "asked", History: 1, MaxMiB: 8}, {Name: "reasks", History: 1, MaxMiB: 8}, {Name: "versions", History: 1, MaxMiB: 32}, {Name: "first-views", History: 1, MaxMiB: 8}, {Name: "unbuildable", History: 1, MaxMiB: 8}, {Name: "consumers", History: 1, MaxMiB: 8}}; !reflect.DeepEqual(m.State, want) { // builds.BuilderBuildsHistory // caps per H-A-437 over the fills read on novox 2026-11-22 (design 47 H2 §812, §814) t.Errorf("state = %+v, want %+v", m.State, want) } // 1887/A4c: the builder chooses no node, so it reads neither presence nor have, invokes no build module's tool and @@ -154,7 +156,7 @@ func TestManifestDeclarations(t *testing.T) { // 1607/AC1 "seat:go-package-registry.publish", "seat:go-package-registry.remove", "seat:go-package-registry.versions", "seat:mesh-artifact-sweep.held", "seat:mesh-builds.reserved", "seat:mesh-builds.drop", "seat:mesh-builds.publish-queue", "seat:mesh-catalog.versions", "seat:mesh-hand-acts.hand-act", "seat:mesh-module-assigner.assignments", "seat:mesh-watchdogs.presence", "seat:node-build-go.drop", "seat:node-build-image.drop", "seat:node-build-node.drop", "seat:node-build-go.answer", "seat:node-build-image.answer", "seat:node-build-node.answer", "seat:node-engine.manifest-reads", "seat:npm-package-registry.publish", "seat:npm-package-registry.remove", "seat:npm-package-registry.versions", "seat:oci-artifact-registry.publish", "seat:oci-artifact-registry.remove", "seat:oci-artifact-registry.versions", // A-231: the build asks on each build seat's queue delivery (accept.delivery.). - "seat:node-build-go.accept.delivery", "seat:node-build-node.accept.delivery", "seat:node-build-image.accept.delivery"}; !reflect.DeepEqual(sorted(m.Invokes), sorted(want)) { + "seat:node-build-go.accept.delivery", "seat:node-build-node.accept.delivery", "seat:node-build-image.accept.delivery", "nats.nats_drop"}; !reflect.DeepEqual(sorted(m.Invokes), sorted(want)) { t.Errorf("invokes = %v, want %v", m.Invokes, want) } // The builder hears the build seats' toolchain-reported and the node-engine seat's running (design 47 G §492, §546) and reads no @@ -174,8 +176,10 @@ func TestManifestDeclarations(t *testing.T) { // 1607/AC1 "oci-artifact-registry.kept", "oci-artifact-registry.published", "oci-artifact-registry.refused", "oci-artifact-registry.removed", "operator-channel.decided"}; !reflect.DeepEqual(sorted(m.Consumes), sorted(want)) { t.Errorf("consumes = %v, want %v", m.Consumes, want) } - if b, ok := m.OwnSecrets["broker"]; !ok || len(m.OwnSecrets) != 1 || b != "${dir:state}/broker" { - t.Errorf("own-secrets = %v, want exactly broker", m.OwnSecrets) + // H-A-454 (second addendum): beside the module's broker, the process's own account's credential broker-builder. + if b, ok := m.OwnSecrets["broker"]; !ok || len(m.OwnSecrets) != 2 || b != "${dir:state}/broker" || + fmt.Sprint(m.OwnSecrets["broker-builder"]) != "map[owner:mesh-delivery-builder path:${dir:state}/broker-builder.secret]" { + t.Errorf("own-secrets = %v, want broker and broker-builder", m.OwnSecrets) } if m.SecretsOwner != "mesh-delivery-builder" { t.Errorf("secrets-owner = %q", m.SecretsOwner) @@ -190,6 +194,7 @@ func TestManifestDeclarations(t *testing.T) { // 1607/AC1 if len(m.Streams) != 4 || m.Streams[0].Name != "waits" || !reflect.DeepEqual(m.Streams[0].Events, []string{"wait-held.**", "wait-ended.**"}) || m.Streams[0].MaxAgeDays != 7 || m.Streams[0].MaxMiB != 16 || m.Streams[1].Name != builds.BuildsStream || !reflect.DeepEqual(m.Streams[1].Events, []string{builds.BuildsStreamEvents}) || m.Streams[1].MaxAgeDays != 7 || !m.Streams[1].LastPerSubject || m.Streams[2].Name != "mesh-delivery-builder-findings" || !reflect.DeepEqual(m.Streams[2].Events, []string{"finding-written.*", "finding-cleared.*", "findings-stated.*"}) || + m.Streams[2].MaxMiB != 8 || m.Streams[2].MaxAgeDays != 7 || // design 47 H2 §783: the findings history 8 MiB, 7 days // Design 47 H2 §793, §820, H-A-446 (2), H-A-454: the work queue publishes in the old section, 64 MiB, 7 days, duplicates 24 h. m.Streams[3].Name != versions.PublishesLocal || !reflect.DeepEqual(m.Streams[3].Events, []string{"publish.**"}) || m.Streams[3].Retention != "work-queue" || m.Streams[3].Duplicates != 24 || m.Streams[3].MaxDeliveries != 10 || m.Streams[3].MaxAgeDays != 7 || m.Streams[3].MaxMiB != 64 { @@ -199,8 +204,8 @@ func TestManifestDeclarations(t *testing.T) { // 1607/AC1 // design 47 H2 §775, H-A-381 (2): the kept-call pace and the taken key's bound, read by the process m.Config["kept-call-pace-first"].Default != "1s" || m.Config["kept-call-pace-max"].Default != "30s" || m.Config["ask-taken-bound"].Default != "10m" || !m.Config["kept-call-pace-first"].Runtime || !m.Config["kept-call-pace-max"].Runtime || !m.Config["ask-taken-bound"].Runtime || m.Config["revision-wait-minutes"].Default != float64(2) || m.Config["package-wait-minutes"].Default != float64(10) || - m.Config["publish-pause"].Default != float64(30) || m.Config["publish-pause-max"].Default != float64(30) || m.Config["publish-tries"].Default != float64(8) { - t.Errorf("config = %+v, want toolchain-wait-minutes of 60, revision-wait-minutes of 2 (H-A-156), package-wait-minutes of 10 (H-A-165), the publish settings 30 s, 30 min and 8 tries (design 47 G §588, §633, A-457a)", m.Config) + m.Config["publish-pause"].Default != float64(30) || m.Config["publish-pause-max"].Default != float64(30) || m.Config["publish-tries"].Default != float64(5) || m.Config["publish-tries"].Maximum != 10 { + t.Errorf("config = %+v, want toolchain-wait-minutes of 60, revision-wait-minutes of 2 (H-A-156), package-wait-minutes of 10 (H-A-165), the publish settings 30 s, 30 min and 5 tries, at most 10 (design 47 G §588, §633, A-457a; H2 H-A-446 (2))", m.Config) } // Design 47 G §349: version.numbered is no longer said; old-form-closed on the family version, apart from the builds' ends. if want := []string{"build.asked-again", "version.old-form-closed"}; !reflect.DeepEqual(m.Emits, want) { @@ -259,7 +264,7 @@ func TestManifestProcess(t *testing.T) { // 1607/AC1 t.Errorf("health = %v, want kind unit alone", p["health"]) } env, _ := p["env"].(map[string]any) - if len(env) != 8 || env["MESH_BUILDER_REVISION_WAIT_FILE"] != "${dir:state}/revision-wait-minutes" || env["MESH_BUILDER_PACKAGE_WAIT_FILE"] != "${dir:state}/package-wait-minutes" || env["MESH_BUILDER_PUBLISH_TRIES_FILE"] != "${dir:state}/publish-tries" || env["MESH_BROKER_FILE"] != "${dir:state}/broker" || env["MESH_BUILDER_TOOLCHAIN_WAIT_FILE"] != "${dir:state}/toolchain-wait-minutes" { + if len(env) != 8 || env["MESH_BUILDER_REVISION_WAIT_FILE"] != "${dir:state}/revision-wait-minutes" || env["MESH_BUILDER_PACKAGE_WAIT_FILE"] != "${dir:state}/package-wait-minutes" || env["MESH_BUILDER_PUBLISH_TRIES_FILE"] != "${dir:state}/publish-tries" || env["MESH_BROKER_FILE"] != "${dir:state}/broker-builder.secret" || env["MESH_BUILDER_TOOLCHAIN_WAIT_FILE"] != "${dir:state}/toolchain-wait-minutes" { t.Errorf("env = %v, want the broker file and the path of the toolchain wait's file, never the setting itself (design 47 G §672, A-71)", p["env"]) } for k, v := range env { @@ -281,8 +286,23 @@ func TestManifestProcess(t *testing.T) { // 1607/AC1 t.Errorf("a settings resource %v: the builder holds no setting since the capacity is the build modules' (ADR 0525 §5)", r) } } - if _, bus := p["bus"]; bus { - t.Errorf("the process declares a bus: it runs on its own broker credential") + // Design 47 H2 §793, H-A-454 (second addendum): the process runs on an account of its own, its bus naming the work queue + // publishes in queues and what it does on the bus: the module's emits, consumes and state, and its invokes but the verb + // publish-queue it serves; its credential is broker-builder. + bus, _ := p["bus"].(map[string]any) + var states []string + for _, st := range m.State { + states = append(states, st.Name) + } + var invokes []string + for _, i := range m.Invokes { + if i != "seat:mesh-builds.publish-queue" { + invokes = append(invokes, i) + } + } + if fmt.Sprint(bus["queues"]) != "[publishes]" || fmt.Sprint(bus["emits"]) != fmt.Sprint(m.Emits) || fmt.Sprint(bus["consumes"]) != fmt.Sprint(m.Consumes) || + fmt.Sprint(bus["state"]) != fmt.Sprint(states) || fmt.Sprint(bus["invokes"]) != fmt.Sprint(invokes) || len(bus) != 5 || env["MESH_BROKER_FILE"] != "${dir:state}/broker-builder.secret" { + t.Errorf("the process's bus = %v, broker file %v: want publishes in queues, the module's emits, consumes, state and invokes, on broker-builder", bus, env["MESH_BROKER_FILE"]) } // H-A-186, design 47 G §370: a Go package another module imports is a declared package artifact of its module, so every // release publishes it: builds (ADR 0634 §1, ADR 0606 §4), imported by the build modules and the node-engine, and diff --git a/modules/mesh-delivery-builder/module.json b/modules/mesh-delivery-builder/module.json index b2ddecd54..9da55f633 100644 --- a/modules/mesh-delivery-builder/module.json +++ b/modules/mesh-delivery-builder/module.json @@ -2,6 +2,7 @@ "module": "mesh-delivery-builder", "version": "0.1", "slug": "builder", + "class": "core", "claims": [ { "name": "mesh-builds", @@ -123,35 +124,36 @@ "seat:mesh-delivery.source", "seat:node-build-go.accept.delivery", "seat:node-build-node.accept.delivery", - "seat:node-build-image.accept.delivery" + "seat:node-build-image.accept.delivery", + "nats.nats_drop" ], "state": [ - { "name": "builds", "history": 5 }, - { "name": "engine-reads", "history": 1 }, - { "name": "findings", "history": 5 }, - { "name": "floor-waits", "history": 1 }, - { "name": "hearing", "history": 1 }, - { "name": "instances", "history": 1 }, - { "name": "old-form", "history": 1 }, - { "name": "bounds", "history": 1, "key-ttl": true }, + { "name": "builds", "history": 5, "max-mib": 128 }, + { "name": "engine-reads", "history": 1, "max-mib": 8 }, + { "name": "findings", "history": 5, "max-mib": 32 }, + { "name": "floor-waits", "history": 1, "max-mib": 8 }, + { "name": "hearing", "history": 1, "max-mib": 8 }, + { "name": "instances", "history": 1, "max-mib": 8 }, + { "name": "old-form", "history": 1, "max-mib": 8 }, + { "name": "bounds", "history": 1, "key-ttl": true, "max-mib": 16 }, { "name": "taken", "history": 1, "key-ttl": true, "max-mib": 8 }, - { "name": "queues", "history": 1 }, - { "name": "toolchains-heard", "history": 1 }, + { "name": "queues", "history": 1, "max-mib": 8 }, + { "name": "toolchains-heard", "history": 1, "max-mib": 8 }, { "name": "waits", "history": 1, "max-mib": 4 }, - { "name": "reserved", "history": 1 }, + { "name": "reserved", "history": 1, "max-mib": 8 }, { "name": "publish-queue", "history": 1, "max-mib": 4 }, { "name": "acted", "history": 1, "max-mib": 1 }, - { "name": "asked", "history": 1 }, - { "name": "reasks", "history": 1 }, - { "name": "versions", "history": 1 }, - { "name": "first-views", "history": 1 }, + { "name": "asked", "history": 1, "max-mib": 8 }, + { "name": "reasks", "history": 1, "max-mib": 8 }, + { "name": "versions", "history": 1, "max-mib": 32 }, + { "name": "first-views", "history": 1, "max-mib": 8 }, { "name": "unbuildable", "history": 1, "max-mib": 8 }, { "name": "consumers", "history": 1, "max-mib": 8 } ], "streams": [ { "name": "waits", "events": ["wait-held.**", "wait-ended.**"], "max-age-days": 7, "max-mib": 16 }, { "name": "mesh-delivery-builder-builds", "events": ["build.ended.**"], "max-age-days": 7, "max-mib": 16, "last-per-subject": true }, - { "name": "mesh-delivery-builder-findings", "events": ["finding-written.*", "finding-cleared.*", "findings-stated.*"], "max-age-days": 7, "max-mib": 16 }, + { "name": "mesh-delivery-builder-findings", "events": ["finding-written.*", "finding-cleared.*", "findings-stated.*"], "max-age-days": 7, "max-mib": 8 }, { "name": "publishes", "events": ["publish.**"], "retention": "work-queue", "duplicates": 24, "max-deliveries": 10, "max-age-days": 7, "max-mib": 64 } ], "config": { @@ -226,11 +228,11 @@ }, "publish-tries": { "type": "number", - "description": "how many times the builder tries a done build's publish before it ends loudly (log and condition) and leaves it readable in builder_publish_queue (design 47 G A-457a).", + "description": "how many times the builder tries a done build's publish before it ends loudly (log and condition) and leaves it readable in builder_publish_queue, at most 10, the work queue publishes' max-deliveries (design 47 G A-457a; H2 H-A-446 (2)).", "minimum": 1, - "maximum": 100, + "maximum": 10, "trusted": false, - "default": 8 + "default": 5 } }, "logs": [ @@ -249,7 +251,11 @@ "operator-channel" ], "own-secrets": { - "broker": "${dir:state}/broker" + "broker": "${dir:state}/broker", + "broker-builder": { + "path": "${dir:state}/broker-builder.secret", + "owner": "mesh-delivery-builder" + } }, "secrets-owner": "mesh-delivery-builder", "resources": [ @@ -339,7 +345,7 @@ "./mesh-delivery-builder" ], "env": { - "MESH_BROKER_FILE": "${dir:state}/broker", + "MESH_BROKER_FILE": "${dir:state}/broker-builder.secret", "MESH_BUILDER_TOOLCHAIN_WAIT_FILE": "${dir:state}/toolchain-wait-minutes", "MESH_BUILDER_REVISION_WAIT_FILE": "${dir:state}/revision-wait-minutes", "MESH_BUILDER_PACKAGE_WAIT_FILE": "${dir:state}/package-wait-minutes", @@ -349,6 +355,113 @@ "MESH_BUILDER_RELEASED_KEPT_FILE": "${dir:state}/released-kept" }, "user": "mesh-delivery-builder", + "bus": { + "emits": [ + "build.asked-again", + "version.old-form-closed" + ], + "consumes": [ + "mesh-conditions.findings-asked", + "container-image-registry.kept", + "container-image-registry.published", + "container-image-registry.refused", + "container-image-registry.removed", + "go-package-registry.kept", + "go-package-registry.published", + "go-package-registry.refused", + "go-package-registry.removed", + "mesh-artifact-sweep.artifacts-gone", + "mesh-catalog.seat-definition-changed", + "mesh-catalog.seat-definition-removed", + "mesh-catalog.version-released", + "mesh-catalog.versions-filled", + "mesh-conditions.condition-cleared", + "mesh-delivery-indexer.take-in.taken", + "node-build-go.toolchain-reported", + "node-build-node.toolchain-reported", + "node-engine.manifest-reads-changed", + "node-engine.running", + "operator-channel.decided", + "npm-package-registry.kept", + "npm-package-registry.published", + "npm-package-registry.refused", + "npm-package-registry.removed", + "oci-artifact-registry.kept", + "oci-artifact-registry.published", + "oci-artifact-registry.refused", + "oci-artifact-registry.removed", + "seat:mesh-module-assigner.views.assignments", + "seat:mesh-module-assigner.views.seat-holders", + "mesh-catalog.catalog-revision", + "mesh-catalog.registration-changed", + "mesh-delivery.source-moved" + ], + "queues": [ + "publishes" + ], + "state": [ + "builds", + "engine-reads", + "findings", + "floor-waits", + "hearing", + "instances", + "old-form", + "bounds", + "taken", + "queues", + "toolchains-heard", + "waits", + "reserved", + "publish-queue", + "acted", + "asked", + "reasks", + "versions", + "first-views", + "unbuildable", + "consumers" + ], + "invokes": [ + "seat:container-image-registry.remove", + "seat:container-image-registry.versions", + "seat:git.tag", + "seat:git.tags", + "seat:go-package-registry.remove", + "seat:go-package-registry.versions", + "seat:mesh-artifact-sweep.held", + "seat:mesh-builds.reserved", + "seat:mesh-builds.drop", + "seat:mesh-catalog.versions", + "seat:mesh-hand-acts.hand-act", + "seat:mesh-module-assigner.assignments", + "seat:mesh-watchdogs.presence", + "seat:node-build-go.drop", + "seat:node-build-image.drop", + "seat:node-build-node.drop", + "seat:node-build-go.answer", + "seat:node-build-image.answer", + "seat:node-build-node.answer", + "seat:node-engine.manifest-reads", + "seat:npm-package-registry.remove", + "seat:npm-package-registry.versions", + "seat:oci-artifact-registry.remove", + "seat:oci-artifact-registry.versions", + "seat:container-image-registry.publish", + "seat:go-package-registry.publish", + "seat:npm-package-registry.publish", + "seat:oci-artifact-registry.publish", + "seat:mesh-catalog.entry", + "seat:mesh-catalog.registrations", + "seat:mesh-catalog.seat-definitions", + "seat:mesh-catalog.revision", + "seat:mesh-delivery.source", + "seat:node-build-go.accept.delivery", + "seat:node-build-node.accept.delivery", + "seat:node-build-image.accept.delivery", + "nats.nats_drop" + ] + }, "health": { "kind": "unit" }