Warn instead of holding the machine for an unissued process account, and drive the delivery path in the test (issue 1226, review round 1)

cmd/mesh-controller/process_accounts_integration_test.go

@@ -3,6 +3,8 @@
 package main
 
 import (
+	"bytes"
+	"encoding/json"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -10,11 +12,24 @@ import (
 	"git.novox.be/novox/mesh-sdk/go/catalogue"
 
 	"github.com/novox/mesh-controller/internal/broker"
+	"github.com/novox/mesh-controller/internal/link"
+	"github.com/novox/mesh-controller/internal/testbus"
 )
 
-// 1226/AC2: given an assigned module whose new definition adds a bus process, when the delivery records it,
-// that process's account is issued and the next compose carries a real account; and (AC1) before it, the
-// composition refuses the module naming issue; (AC3) a later record does not replace the account.
+func gainedAndPlain(t *testing.T) (plain, gained catalogue.Manifest) {
+	t.Helper()
+	plain, err := catalogue.ParseManifest([]byte(`{"module":"mesh-mail","version":"1",
+		"own-secrets":{"broker-send":{"path":"/var/lib/mesh-mail/broker-send","owner":"mesh-mail-send"}},
+		"resources":[{"id":"account","type":"user","name":"mesh-mail-send"}]}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	return plain, mailSenderWithProcess()
+}
+
+// 1226/AC2: given an assigned module whose new definition adds a bus process, when the delivery records it
+// (takeIn, the function that records a build result), the process's account is minted; and 1226/AC3: the same
+// build heard again replaces nothing.
 func TestAGainedProcessIsIssuedWhenTheDeliveryRecordsIt(t *testing.T) {
 	open := aMesh(t)
 	ctx := t.Context()
@@ -24,41 +39,68 @@ func TestAGainedProcessIsIssuedWhenTheDeliveryRecordsIt(t *testing.T) {
 	if err := busCertificate([]string{"--into", dir}); err != nil {
 		t.Fatal(err)
 	}
-	t.Setenv(broker.AddressVar, "127.0.0.1:4222")
+	t.Setenv(broker.AddressVar, strings.TrimPrefix(testbus.URL(t), "nats://"))
 	t.Setenv(broker.CertificateVar, filepath.Join(dir, "tls.crt"))
 
-	// Assigned without the process, then a definition that gains it.
-	plain, err := catalogue.ParseManifest([]byte(`{"module":"mesh-mail","version":"1",
-		"own-secrets":{"broker-send":{"path":"/var/lib/mesh-mail/broker-send","owner":"mesh-mail-send"}},
-		"resources":[{"id":"account","type":"user","name":"mesh-mail-send"}]}`))
-	if err != nil {
-		t.Fatal(err)
-	}
+	plain, gained := gainedAndPlain(t)
 	register(t, open, plain)
 	if _, err := assign(ctx, open, "laptop", "mesh-mail"); err != nil {
 		t.Fatal(err)
 	}
-	gained := mailSenderWithProcess()
-	register(t, open, gained)
-
-	// 1226/AC1 on the store: nothing issued, so the compose refuses, naming issue.
-	if _, err := prepareSend(ctx, open, "laptop"); err == nil || !strings.Contains(err.Error(), "mesh-controller.issue laptop mesh-mail") {
-		t.Fatalf("1226/AC1: the composition did not refuse the unissued account naming issue: %v", err)
+	if _, minted, _ := inv.BusUserHash(ctx, "laptop.mesh-mail.send"); minted {
+		t.Fatal("the account was minted before the module gained the process")
 	}
 
-	issueGainedProcessAccounts(ctx, inv, gained)
+	manifest, _ := json.Marshal(gained)
+	build := func(id, commit string) {
+		t.Helper()
+		if _, _, err := takeIn(ctx, inv, asTheOperator(t, inv, link.BuildResult{
+			ID: id, Repository: "http://forge.internal:20000/novox/mesh-mail.git", Path: "modules/mesh-mail",
+			Ref: "main", On: "anchor", Commit: commit, Manifest: manifest,
+			Source: &link.SourceOnSeat{Seat: "git", Repository: "novox/mesh-mail"},
+		})); err != nil {
+			t.Fatal(err)
+		}
+	}
+	build("b-1", "aaaaaaa1111")
 	hash, held, err := inv.BusUserHash(ctx, "laptop.mesh-mail.send")
 	if err != nil || !held {
-		t.Fatalf("1226/AC2: the gained process's account was not issued: held %v, %v", held, err)
+		t.Fatalf("1226/AC2: recording the gained definition did not mint the process's account: held %v, %v", held, err)
 	}
-	if _, err := prepareSend(ctx, open, "laptop"); err != nil {
-		t.Fatalf("1226/AC2: the next compose does not carry the account: %v", err)
-	}
-
-	// 1226/AC3: recording the definition again, and composing, replaces nothing.
-	issueGainedProcessAccounts(ctx, inv, gained)
+	build("b-2", "bbbbbbb2222")
 	again, _, err := inv.BusUserHash(ctx, "laptop.mesh-mail.send")
 	if err != nil || again != hash {
-		t.Fatalf("1226/AC3: the issued account was replaced (%v)", err)
+		t.Fatalf("1226/AC3: recording again replaced the issued account (%v)", err)
+	}
+}
+
+// 1226/AC1 and AC4 against the store: a process account nobody issued is warned of in the push's answer, naming
+// issue, and the send is not refused, so the machine's other modules are composed.
+func TestAnUnissuedProcessAccountIsWarnedOfAndTheRestIsComposed(t *testing.T) {
+	open := aMesh(t)
+	ctx := t.Context()
+	_, gained := gainedAndPlain(t)
+	register(t, open, gained)
+	other := catalogue.Manifest{Module: "other", Version: "1",
+		OwnSecrets: catalogue.OwnSecrets{"token": {Path: "/var/lib/other/token"}}}
+	register(t, open, other)
+	for _, m := range []string{"mesh-mail", "other"} {
+		if _, err := assign(ctx, open, "laptop", m); err != nil {
+			t.Fatal(err)
+		}
+	}
+	var said bytes.Buffer
+	if _, err := prepareSend(leftOutSaidBy(ctx, &said), open, "laptop"); err != nil {
+		t.Fatalf("1226/AC4: an unissued process account held the machine: %v", err)
+	}
+	want := "laptop/mesh-mail process send: its bus account is not issued — mesh-controller.issue laptop mesh-mail"
+	if !strings.Contains(said.String(), want) {
+		t.Fatalf("1226/AC1: the push says %q, want %q", said.String(), want)
+	}
+	if strings.Contains(said.String(), "other") {
+		t.Fatalf("1226/AC4: the other module is warned of: %q", said.String())
+	}
+	if _, held, err := open.inventory.ModuleSecretIfIssued(ctx, "laptop", "other", "token"); err != nil || !held {
+		t.Fatalf("1226/AC4: the other module's secret was not composed: held %v, %v", held, err)
 	}
 }