Design 47's last milestones: the keeper, self-check, healers, hand-acts, provisioner, vault, artifact sweep, disk readings, credential forms (issues 774, 1952, 1953, 1954, 1955)

One commit with exactly the tree of the reviewed head 35b4509c0a, on main 12c2574c9d, so two compiled programs added and removed on the branch leave no trace in history (issue 1577).

modules/mounts/cmd/mounts/data.go

@@ -6,9 +6,9 @@ package main
 // mesh keeps data in on this machine, from the controller's `data` verb over the bus.
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
+	"git.novox.be/novox/mesh-sdk/go/health"
 	"io"
 	"os"
 	"path/filepath"
@@ -63,44 +63,16 @@ func sortWants(w []Want) {
 	}
 }
 
-// DataFrom reads the paths out of mesh-controller.data's answer: `answer.data`, `data`, or the same as
-// text in `output`. An answer with no data list is an error, never an empty list: an empty list would
-// let every mount point through.
-func DataFrom(raw json.RawMessage) ([]string, error) {
-	type item struct {
-		Path string `json:"path"`
-	}
-	var whole struct {
-		Answer *struct {
-			Data *[]item `json:"data"`
-		} `json:"answer"`
-		Data   *[]item `json:"data"`
-		Output string  `json:"output"`
-	}
-	if err := json.Unmarshal(raw, &whole); err != nil {
-		return nil, fmt.Errorf("the controller's data answer is not JSON: %v", err)
-	}
-	var items *[]item
-	switch {
-	case whole.Answer != nil && whole.Answer.Data != nil:
-		items = whole.Answer.Data
-	case whole.Data != nil:
-		items = whole.Data
-	case whole.Output != "":
-		var inner struct {
-			Data *[]item `json:"data"`
-		}
-		if err := json.Unmarshal([]byte(whole.Output), &inner); err == nil && inner.Data != nil {
-			items = inner.Data
-		}
-	}
-	if items == nil {
-		return nil, errors.New("the controller's data answer names no data list")
+// PathsFrom is the paths disk-load's readings name: where the mesh keeps data here. No reading is an error, never an
+// empty list: an empty list would let every mount point through.
+func PathsFrom(readings []health.Reading) ([]string, error) {
+	if len(readings) == 0 {
+		return nil, errors.New("disk-load keeps no reading of this machine's data yet")
 	}
 	paths := []string{}
-	for _, it := range *items {
-		if strings.HasPrefix(it.Path, "/") {
-			paths = append(paths, filepath.Clean(it.Path))
+	for _, r := range readings {
+		if strings.HasPrefix(r.Path, "/") {
+			paths = append(paths, filepath.Clean(r.Path))
 		}
 	}
 	return paths, nil