diff --git a/modules/docker/cmd/docker-tools/prune_images.go b/modules/docker/cmd/docker-tools/prune_images.go index 49f75436..2c1d0e2a 100644 --- a/modules/docker/cmd/docker-tools/prune_images.go +++ b/modules/docker/cmd/docker-tools/prune_images.go @@ -9,7 +9,7 @@ package main // // - every image a container on this machine uses, in any state; // - every image this machine's declaration names — what the mesh would send it now and what it was -// last sent — as the controller's `images` verb answers. **No answer, no removal**: what the +// last sent — as the artifact-store seat's `images` verb answers. **No answer, no removal**: what the // declaration names is the one thing that cannot be guessed; // - every image younger than the floor (seven days, the weekly prune's week); // - in each line of images holding one of those, the newest image besides them: the previous @@ -43,7 +43,7 @@ type PruneImagesAsk struct { Limit int } -// declaredImages is the controller's `images` answer (novox/hq ADR 0251 §5). +// declaredImages is the artifact-store seat's `images` answer (novox/hq ADR 0251 §5). type declaredImages struct { Node string `json:"node"` Images []struct { @@ -129,7 +129,7 @@ func digestOf(ref string) string { return "" } -// askDeclared asks the controller what this machine's declarations name. An error means unknown. +// askDeclared asks the artifact-store seat what this machine's declarations name. An error means unknown. func (c *Client) askDeclared() (*declaredImages, error) { if c.Node == "" { return nil, errors.New("the runtime did not say which machine this is (MESH_NODE is empty)") @@ -137,20 +137,20 @@ func (c *Client) askDeclared() (*declaredImages, error) { if c.Ask == nil { return nil, errors.New("this bundle cannot ask the mesh") } - raw, err := c.Ask("seat:mesh-controller.images", map[string]any{"node": c.Node}) + raw, err := c.Ask("seat:artifact-store.images", map[string]any{"node": c.Node}) if err != nil { - return nil, fmt.Errorf("the controller's images verb did not answer: %w", err) + return nil, fmt.Errorf("the artifact-store seat's images verb did not answer: %w", err) } answer, output, ok := answerOf(raw) if !ok { - return nil, fmt.Errorf("the controller refused images: %s", firstLine(output)) + return nil, fmt.Errorf("the artifact-store seat refused images: %s", firstLine(output)) } var d declaredImages if err := json.Unmarshal(answer, &d); err != nil { - return nil, fmt.Errorf("the controller's images answer is not readable: %v", err) + return nil, fmt.Errorf("the artifact-store seat's images answer is not readable: %v", err) } if d.Node != "" && d.Node != c.Node { - return nil, fmt.Errorf("the controller answered for %q, not for this machine %q", d.Node, c.Node) + return nil, fmt.Errorf("the artifact-store seat answered for %q, not for this machine %q", d.Node, c.Node) } return &d, nil } diff --git a/modules/docker/cmd/docker-tools/prune_images_test.go b/modules/docker/cmd/docker-tools/prune_images_test.go index 62a5d6c7..18149be5 100644 --- a/modules/docker/cmd/docker-tools/prune_images_test.go +++ b/modules/docker/cmd/docker-tools/prune_images_test.go @@ -43,7 +43,7 @@ func imagesMachine() *fake { func declaring(t *testing.T, answer string) Asker { return func(key string, body any) (json.RawMessage, error) { - if key != "seat:mesh-controller.images" { + if key != "seat:artifact-store.images" { t.Errorf("asked %s", key) } if b, _ := body.(map[string]any); b["node"] != "laptop" { diff --git a/modules/docker/go.mod b/modules/docker/go.mod index 5faa536e..4f8b3f10 100644 --- a/modules/docker/go.mod +++ b/modules/docker/go.mod @@ -1,5 +1,5 @@ module docker -go 1.22 +go 1.26.0 -require git.novox.be/novox/mesh-sdk/go v0.1.6 +require git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029220947-f9a496d3e121 diff --git a/modules/docker/go.sum b/modules/docker/go.sum index 0dd60617..eda36e26 100644 --- a/modules/docker/go.sum +++ b/modules/docker/go.sum @@ -1,2 +1,2 @@ -git.novox.be/novox/mesh-sdk/go v0.1.6 h1:9qzdYONYbJdWcu6sxQcq9v1LI0JxcfkiKYkMUzJSkVQ= -git.novox.be/novox/mesh-sdk/go v0.1.6/go.mod h1:GFuZUElBZ9A++mxgIKo97aXXo+kV0uJ/UkbhQPPIbrY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029220947-f9a496d3e121 h1:OsA1v6n736a7RqEV8Nkip8pf5ILMbzj0PWuKqcBOhK0= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029220947-f9a496d3e121/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= diff --git a/modules/docker/module.json b/modules/docker/module.json index fae954c3..5fceafd0 100644 --- a/modules/docker/module.json +++ b/modules/docker/module.json @@ -7,7 +7,7 @@ "privileged" ], "invokes": [ - "seat:mesh-controller.images" + "seat:artifact-store.images" ], "claims": [ {