Merge pull request 'Hold the forge to being an ordinary provider, in tests (hq issue 085)' (#45) from feat/packages-port into main
This commit was merged in pull request #45.
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package catalogue
|
package catalogue
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"reflect"
|
"reflect"
|
||||||
@@ -82,3 +83,116 @@ func TestTheFilterModuleNeverFlushesTheRuleset(t *testing.T) {
|
|||||||
load["restart-on"])
|
load["restart-on"])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The package registry's port is the node's, like every other foundation port (novox/hq
|
||||||
|
// 04-ISSUES/085, ADR 0100). Two halves, because the forge is reached two ways: through what the
|
||||||
|
// module that serves it says it serves, and — for the genesis window, before any module provides
|
||||||
|
// `package-registry` at all — through the one binding the builder carries instead of resolving.
|
||||||
|
|
||||||
|
func TestTheForgesPortIsGivenLikeAnyOtherProvidersPort(t *testing.T) {
|
||||||
|
forge := catalogueManifest(t, "gitea")
|
||||||
|
|
||||||
|
// The catalogue's number is a default and the node's setting moves it.
|
||||||
|
given, err := GivenPorts(forge, []Layer{{From: "anchor",
|
||||||
|
Values: map[string]any{PortsSetting: map[string]any{"3000": float64(3100)}}}})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("the forge's port cannot be given on a node: %v", err)
|
||||||
|
}
|
||||||
|
if given[3000] != 3100 {
|
||||||
|
t.Fatalf("the forge was given %v", given)
|
||||||
|
}
|
||||||
|
|
||||||
|
// And every consumer of the package registry is told where the machine actually put it,
|
||||||
|
// because that is read from what the forge serves rather than written in the consumer.
|
||||||
|
if got := ServedOn(forge, "package-registry", given)["port"]; got != 3100 {
|
||||||
|
t.Errorf("the package registry is served on %v, not the port this node gave it", got)
|
||||||
|
}
|
||||||
|
if got := ServedOn(forge, "package-registry", nil)["port"]; got != float64(3000) {
|
||||||
|
t.Errorf("without a setting the forge serves %v, not the catalogue's port", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// bindingIn is the package binding the builder carries, as the machine would receive it.
|
||||||
|
func bindingIn(t *testing.T, m Manifest, layers []Layer) map[string]any {
|
||||||
|
t.Helper()
|
||||||
|
for _, r := range m.Resources {
|
||||||
|
if fmt.Sprint(r["id"]) != "package-binding" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
settled, err := ApplySettings(r, layers)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("the builder's package binding refused %v: %v", layers, err)
|
||||||
|
}
|
||||||
|
if settled["merge"] != nil || settled["protected"] != nil {
|
||||||
|
t.Fatal("the host would be sent fields it does not know")
|
||||||
|
}
|
||||||
|
var out map[string]any
|
||||||
|
if err := json.Unmarshal([]byte(fmt.Sprint(settled["content"])), &out); err != nil {
|
||||||
|
t.Fatalf("the builder's package binding is not a binding: %v", err)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
t.Fatal("the builder carries no package binding")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTheBuildersCarriedPackageBindingTakesThePortFromTheNode(t *testing.T) {
|
||||||
|
builder := catalogueManifest(t, "builder")
|
||||||
|
|
||||||
|
// Nothing set: the catalogue's own number, which is what a mesh raised on the defaults uses.
|
||||||
|
serves := bindingIn(t, builder, nil)["serves"].(map[string]any)
|
||||||
|
if serves["port"] != float64(3000) {
|
||||||
|
t.Fatalf("the builder's binding defaults to %v", serves["port"])
|
||||||
|
}
|
||||||
|
|
||||||
|
// Given a port, the binding dials it — and the rest of what the forge serves survives, because
|
||||||
|
// a setting is merged into the module's own values rather than replacing them.
|
||||||
|
moved := bindingIn(t, builder, []Layer{{From: "anchor",
|
||||||
|
Values: map[string]any{"serves": map[string]any{"port": float64(3100)}}}})
|
||||||
|
got := moved["serves"].(map[string]any)
|
||||||
|
if got["port"] != float64(3100) {
|
||||||
|
t.Errorf("the builder dials %v, not the port this node gave the package registry", got["port"])
|
||||||
|
}
|
||||||
|
if got["scheme"] != "http" || got["npm-path"] != "/api/packages/novox/npm/" {
|
||||||
|
t.Errorf("setting the port lost the rest of what the forge serves: %v", got)
|
||||||
|
}
|
||||||
|
if moved["as"] != "mesh-builder" || moved["from"] != "gitea" {
|
||||||
|
t.Errorf("setting the port changed who the binding is with: %v", moved)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The two halves are one number. The builder carries a binding because at genesis nothing provides
|
||||||
|
// `package-registry` to resolve one from; the day the forge is a module, the same consumer is told
|
||||||
|
// what the forge serves. They have to start from the same port, or a mesh raised on the defaults
|
||||||
|
// dials one number before the forge is assigned and another after.
|
||||||
|
func TestTheBuildersCarriedBindingStartsWhereTheForgeServes(t *testing.T) {
|
||||||
|
forge := ServedOn(catalogueManifest(t, "gitea"), "package-registry", nil)
|
||||||
|
carried := bindingIn(t, catalogueManifest(t, "builder"), nil)["serves"].(map[string]any)
|
||||||
|
for _, key := range []string{"port", "scheme", "npm-path"} {
|
||||||
|
if fmt.Sprint(forge[key]) != fmt.Sprint(carried[key]) {
|
||||||
|
t.Errorf("the forge serves %s %v and the builder's carried binding says %v — the two "+
|
||||||
|
"halves of the same registry have drifted apart in the catalogue",
|
||||||
|
key, forge[key], carried[key])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTheBuildersPackageBindingKeepsItsIdentity(t *testing.T) {
|
||||||
|
builder := catalogueManifest(t, "builder")
|
||||||
|
// `at` above all: a setting that moves it points the builder, and the registry password it
|
||||||
|
// sends as basic auth, at a host somebody else chose.
|
||||||
|
for _, key := range []string{"provision", "from", "at", "as"} {
|
||||||
|
var refused error
|
||||||
|
for _, r := range builder.Resources {
|
||||||
|
if fmt.Sprint(r["id"]) != "package-binding" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
_, refused = ApplySettings(r, []Layer{{From: "anchor",
|
||||||
|
Values: map[string]any{key: "something else"}}})
|
||||||
|
}
|
||||||
|
if refused == nil {
|
||||||
|
t.Errorf("%q can be set on the builder's package binding, which is not a port but who "+
|
||||||
|
"the binding is with", key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user