From f468aa75e8355d2c871662f6ccbe3d7580b88140 Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 12 Nov 2026 20:40:34 +0100 Subject: [PATCH] N3 (mesh-enrolment): the enrolment names no bucket of its own Its state enrolments is the runtime's bucket of the credential's module; the constant `mesh-enrolment_enrolments` was read by its tests alone, which now name the bed's bucket themselves. Builds: design 47 G A-296 Claude-Session: https://claude.ai/code/session_01NcbgfGKaxw984XyAPfLm4h --- .../mesh-enrolment/cmd/mesh-enrolment/integration_test.go | 2 +- modules/mesh-enrolment/cmd/mesh-enrolment/names.go | 6 +++--- modules/mesh-enrolment/cmd/mesh-enrolment/tokens_test.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/mesh-enrolment/cmd/mesh-enrolment/integration_test.go b/modules/mesh-enrolment/cmd/mesh-enrolment/integration_test.go index 720eedc0..d14fa415 100644 --- a/modules/mesh-enrolment/cmd/mesh-enrolment/integration_test.go +++ b/modules/mesh-enrolment/cmd/mesh-enrolment/integration_test.go @@ -223,7 +223,7 @@ func TestMeshEnrolmentWholeOnARealBus(t *testing.T) { } return kv } - enrolments := mk(enrolmentsBucket, true) + enrolments := mk(Module+"_"+enrolmentsState, true) // the runtime's bucket of the bed's credential's module // No controller lease bucket at all: the controller ended by its unassignment (issue 1126). logins, assignments := mk(nodeLoginsBucket, false), mk("mesh-delivery-assigner_assignments", false) have := mk("node-engine_have", false) diff --git a/modules/mesh-enrolment/cmd/mesh-enrolment/names.go b/modules/mesh-enrolment/cmd/mesh-enrolment/names.go index 6f5ce00e..8d5ee523 100644 --- a/modules/mesh-enrolment/cmd/mesh-enrolment/names.go +++ b/modules/mesh-enrolment/cmd/mesh-enrolment/names.go @@ -9,9 +9,9 @@ const ( vaultModule = "mesh-vault" assignerModule = "mesh-delivery-assigner" - // enrolmentsState is the holder's state of open enrolments, enrolmentsBucket its bucket. - enrolmentsState = meshnodeenroller.StateEnrolments - enrolmentsBucket = Module + "_" + enrolmentsState + // enrolmentsState is the holder's state of open enrolments; its bucket is the runtime's, of the credential's module + // (design 47 G A-296), never named here. + enrolmentsState = meshnodeenroller.StateEnrolments // signersRead is the vault's state signers as the enrolment's manifest reads it, signersKey the key holding its signing key. signersRead = vaultModule + ".signers" signersKey = "key" diff --git a/modules/mesh-enrolment/cmd/mesh-enrolment/tokens_test.go b/modules/mesh-enrolment/cmd/mesh-enrolment/tokens_test.go index cbfca62a..fbfd654f 100644 --- a/modules/mesh-enrolment/cmd/mesh-enrolment/tokens_test.go +++ b/modules/mesh-enrolment/cmd/mesh-enrolment/tokens_test.go @@ -119,8 +119,8 @@ func theManifestSaysWhatTheCodeDoes(t *testing.T) { !slices.Contains(m.Invokes, vaultToken) || !slices.Contains(m.Invokes, vaultAccount) { t.Errorf("reads %v, invokes %v: want %s, %s, %s, %s and %s", m.Reads, m.Invokes, signersRead, assignmentsAdd, vaultSign, vaultToken, vaultAccount) } - if enrolmentsBucket != m.Module+"_"+State || !strings.HasPrefix(AssignmentsTool, assignerModule+".") { - t.Errorf("the names %s, %s are not the manifest's module %s and the assigner %s", enrolmentsBucket, AssignmentsTool, m.Module, assignerModule) + if enrolmentsState != State || !strings.HasPrefix(AssignmentsTool, assignerModule+".") { + t.Errorf("the names %s, %s are not the manifest's state %s and the assigner %s", enrolmentsState, AssignmentsTool, State, assignerModule) } var heard []string for _, e := range EndEvents {