Merge pull request 'L3 recovery: take core-credentials out of the bus's, the provisioner's and its client's manifests until the judge that knows it runs (issue 774, issue 1585)' (#604) from fix/l3-words-after-judge into main
This commit was merged in pull request #604.
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
"scope": "node"
|
||||
}
|
||||
],
|
||||
"core-credentials": true,
|
||||
"own-secrets": {
|
||||
"provisioner-broker": "${dir:state}/broker"
|
||||
},
|
||||
|
||||
@@ -295,6 +295,11 @@ func TestTheManifestDeclaresWhatTheCodeKeeps(t *testing.T) {
|
||||
if err := json.Unmarshal(raw, &m); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// No "core-credentials" until the indexer whose judge knows the word runs (issue 774): the running judge refuses it,
|
||||
// and a refused manifest holds the bus's user list, so the indexer that knows it is never granted. It comes back then.
|
||||
if strings.Contains(string(raw), `"core-credentials"`) {
|
||||
t.Error("the manifest says \"core-credentials\" before the judge that reads it runs")
|
||||
}
|
||||
if m.Module != "mesh-provisioner" || m.RunsAs != "mesh-provisioner" || m.OwnSecrets["broker"] == "" {
|
||||
t.Errorf("an account of its own: module %q, runs-as %q, own secrets %v", m.Module, m.RunsAs, m.OwnSecrets)
|
||||
}
|
||||
|
||||
@@ -46,7 +46,6 @@
|
||||
"plans",
|
||||
"refused"
|
||||
],
|
||||
"core-credentials": true,
|
||||
"own-secrets": {
|
||||
"broker": "${dir:state}/broker"
|
||||
},
|
||||
|
||||
@@ -43,6 +43,11 @@ func TestTheBussManifestMountsItsProgramsIntoTheUpstreamImage(t *testing.T) {
|
||||
if err := json.Unmarshal(raw, &m); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// No "core-credentials" until the indexer whose judge knows the word runs (issue 774): the running judge refuses it,
|
||||
// and a refused manifest holds the bus's user list, so the indexer that knows it is never granted. It comes back then.
|
||||
if strings.Contains(string(raw), `"core-credentials"`) {
|
||||
t.Error("the manifest says \"core-credentials\" before the judge that reads it runs")
|
||||
}
|
||||
if m.Build.On != nil {
|
||||
t.Error("build.on is declared: nothing is built on a base image any more")
|
||||
}
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
}
|
||||
],
|
||||
"bus-users": "/var/lib/nats-module/conf/accounts.conf",
|
||||
"core-credentials": true,
|
||||
"own-secrets": {
|
||||
"broker": "${dir:mesh-state}/broker",
|
||||
"broker-nats-tools": "${dir:tools-secret}/broker-nats-tools"
|
||||
|
||||
Reference in New Issue
Block a user