diff --git a/node-tools/internal/bus/bindings.go b/node-tools/internal/bus/bindings.go index 85ead67..1a14a8c 100644 --- a/node-tools/internal/bus/bindings.go +++ b/node-tools/internal/bus/bindings.go @@ -62,8 +62,24 @@ func (c *Conn) Bindings(module string) []membership.BusBinding { // A-16, A-27). func (c *Conn) JetStream() (jetstream.JetStream, error) { return jetstream.New(c.nc) } -func (c *Conn) objectStore(ctx context.Context, module, local string) (jetstream.ObjectStore, membership.BusBinding, error) { +// objectBucketOf is the bus name of the module's object store of a local name: its binding's when it has one, else the +// store its membership's old `objects` section names under the name grants created for it, `_` (design 47 G +// lead answers A-379); a name neither names is refused as the binding refuses it. +func (c *Conn) objectBucketOf(module, local string) (membership.BusBinding, error) { b, err := c.Binding(module, local, catalogue.StorageObjectStore) + if err == nil { + return b, nil + } + if m := c.Membership(module); m != nil { + if store := strings.TrimPrefix(m.Objects[local], "OBJ_"); store != "" { + return membership.BusBinding{Local: local, Storage: catalogue.StorageObjectStore, ObjectStore: store}, nil + } + } + return b, err +} + +func (c *Conn) objectStore(ctx context.Context, module, local string) (jetstream.ObjectStore, membership.BusBinding, error) { + b, err := c.objectBucketOf(module, local) if err != nil { return nil, b, err } @@ -178,7 +194,7 @@ func (c *Conn) ObjectsInfo(module string, r buscalls.ObjectsRequest) (buscalls.F if err != nil { return buscalls.Fill{}, err } - b, _ := c.Binding(module, r.Objects, catalogue.StorageObjectStore) + b, _ := c.objectBucketOf(module, r.Objects) fill, err := c.streamFill("OBJ_" + b.ObjectStore) if err != nil { return buscalls.Fill{}, err diff --git a/node-tools/internal/bus/bindings_test.go b/node-tools/internal/bus/bindings_test.go index 8e163d6..0a100dd 100644 --- a/node-tools/internal/bus/bindings_test.go +++ b/node-tools/internal/bus/bindings_test.go @@ -33,6 +33,9 @@ func TestABundleReachesItsOwnBoundObjectsAndStreamsOnly(t *testing.T) { if _, err := js.CreateObjectStore(ctx, jetstream.ObjectStoreConfig{Bucket: "m_files"}); err != nil { t.Fatal(err) } + if _, err := js.CreateObjectStore(ctx, jetstream.ObjectStoreConfig{Bucket: "m_old"}); err != nil { + t.Fatal(err) + } if _, err := js.CreateStream(ctx, jetstream.StreamConfig{Name: "m_events", Subjects: []string{"mesh.state.m.events.>"}}); err != nil { t.Fatal(err) } @@ -47,6 +50,7 @@ func TestABundleReachesItsOwnBoundObjectsAndStreamsOnly(t *testing.T) { {Local: "events", Storage: catalogue.StorageStream, Template: catalogue.TemplateEvents, Stream: "m_events", Subject: "mesh.state.m.events"}, } + m.Objects = map[string]string{"old": "m_old"} // an old `objects` section grants created (design 47 G A-379) other := mt.MembershipOf("other", "anchor", false, nil) mesh.Issue(t, m) mesh.Issue(t, other) @@ -92,6 +96,13 @@ func TestABundleReachesItsOwnBoundObjectsAndStreamsOnly(t *testing.T) { if listed, err := conn.ObjectsList("m", buscalls.ObjectsRequest{Objects: "files"}); err != nil || len(listed.Objects) != 1 { t.Fatalf("listed %+v, %v", listed, err) } + // A-379: an old `objects` section the membership names is reached by its bus name, with no binding of that name. + if _, err := conn.ObjectsPut("m", buscalls.ObjectsPutRequest{Objects: "old", Name: "r", Data: []byte("old section")}); err != nil { + t.Fatalf("put into the old objects section: %v", err) + } + if listed, err := conn.ObjectsList("m", buscalls.ObjectsRequest{Objects: "old"}); err != nil || len(listed.Objects) != 1 { + t.Fatalf("listed the old objects section %+v, %v", listed, err) + } page, err := conn.StreamRead("m", buscalls.StreamReadRequest{Stream: "events", Limit: 1}) if err != nil || len(page.Messages) != 1 || page.Next != 2 || page.Last != 2 { t.Fatalf("read %+v, %v", page, err) diff --git a/node-tools/internal/bus/bus.go b/node-tools/internal/bus/bus.go index b0c0c04..28853d2 100644 --- a/node-tools/internal/bus/bus.go +++ b/node-tools/internal/bus/bus.go @@ -64,6 +64,9 @@ type Membership struct { Tools string `json:"tools"` // State is every bucket the module's code may reach, by the name it uses (novox/hq ADR 0201). State []StateIssued `json:"state,omitempty"` + // Objects maps the name of each old `objects` section of the module to its object store (mesh-sdk membership.Objects, + // design 47 G ยง619), reached when no binding names it (bindings.go objectBucketOf, A-379). + Objects map[string]string `json:"objects,omitempty"` // Logs is every log the module keeps, by its local name (novox/hq ADR 0297): its own alone. Logs []LogIssued `json:"logs,omitempty"` // SeatTraffic is what the module's code may submit, say, take, ask, answer and read on seats that name