One bus: the AMQP transport is gone from the controller
The mesh runs on the seat's bus alone (novox/hq ADR 0131, design 28 task 5.5). The old transport's consume loop, build request, tool ask, management API and account scoping are deleted, and the bus switch with them; the controller connects to the broker seat and to nothing else. The store-window tests keep their assertions on a bus-less fake, and the tests that only made sense for the old transport's in-memory holding go with it.
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/novox/mesh-controller/internal/catalogue"
|
||||
"github.com/novox/mesh-controller/internal/inventory"
|
||||
"github.com/novox/mesh-controller/internal/link"
|
||||
)
|
||||
@@ -310,11 +311,8 @@ func orderByBases(entries []inventory.Entry) []inventory.Entry {
|
||||
seen[name] = true
|
||||
if e.Manifest.Build != nil {
|
||||
for _, on := range e.Manifest.Build.On {
|
||||
if on.Module == "" || on.Module == name || !inSet[on.Module] {
|
||||
continue
|
||||
}
|
||||
for _, base := range entries {
|
||||
if base.Manifest.Module == on.Module {
|
||||
if base.Manifest.Module != name && inSet[base.Manifest.Module] && standsOnModule(on, base.Manifest.Module) {
|
||||
place(base, seen)
|
||||
}
|
||||
}
|
||||
@@ -336,10 +334,20 @@ func standsOn(entries []inventory.Entry, module string) bool {
|
||||
continue
|
||||
}
|
||||
for _, on := range e.Manifest.Build.On {
|
||||
if on.Module == module {
|
||||
if standsOnModule(on, module) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// standsOnModule is whether a base names the module: as written in a manifest (`module`), or as
|
||||
// recorded after a build, when the mesh has replaced it with the artifact it resolved to
|
||||
// (`artifact-store://<module>/<artifact>@…`). A recorded manifest is what the catalogue holds.
|
||||
func standsOnModule(on catalogue.BuildsOn, module string) bool {
|
||||
if on.Module == module {
|
||||
return true
|
||||
}
|
||||
return strings.HasPrefix(on.Image, "artifact-store://"+module+"/")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user