Skip to content

Agent Mesh

mobile: remember the labels the node enrolled with

Tomas Tormo06f6f2023f88
diff --git a/mobile/sam-node-ffi/ffi/ffi.go b/mobile/sam-node-ffi/ffi/ffi.go
index f29ced8f..e221e3c9 100644
--- a/mobile/sam-node-ffi/ffi/ffi.go
+++ b/mobile/sam-node-ffi/ffi/ffi.go
@@ -92,6 +92,13 @@ func StartNode(configJSON string) error {
if err != nil {
return fmt.Errorf("invalid labels: %w", err)
}
+ // The app only shows the labels field on its enrollment screen, so an
+ // empty start config reuses the labels the node enrolled with.
+ if len(labels) == 0 {
+ if labels, err = loadEnrolledLabels(config.DataDir); err != nil {
+ return err
+ }
+ }
lvl := golog.LevelInfo
if config.LogLevel != "" {
@@ -319,6 +326,21 @@ func GetNodeID() string {
return ""
}
+// labelsFile keeps the enrolled labels in the app's data directory. The CLI
+// has no equivalent: --labels is passed on every run.
+const labelsFile = "labels"
+
+func loadEnrolledLabels(dataDir string) (map[string]string, error) {
+ raw, err := os.ReadFile(filepath.Join(dataDir, labelsFile))
+ if errors.Is(err, os.ErrNotExist) {
+ return nil, nil
+ }
+ if err != nil {
+ return nil, fmt.Errorf("failed to read labels: %w", err)
+ }
+ return api.ParseLabels(string(raw))
+}
+
// EnrollNode enrolls a node. Labels use the CLI --labels syntax and are
// minted into the node's Biscuit here — changing them requires re-enrolling.
func EnrollNode(dataDir string, controlPlaneURL string, jwt string, allowLoopback bool, labels string) error {
@@ -328,6 +350,9 @@ func EnrollNode(dataDir string, controlPlaneURL string, jwt string, allowLoopbac
}
_ = os.MkdirAll(dataDir, 0700)
+ if err := os.WriteFile(filepath.Join(dataDir, labelsFile), []byte(labels), 0600); err != nil {
+ return fmt.Errorf("failed to save labels: %w", err)
+ }
logFilePath := filepath.Join(dataDir, "node.log")
golog.SetupLogging(golog.Config{
File: logFilePath,
diff --git a/mobile/sam-node-ffi/ffi/ffi_test.go b/mobile/sam-node-ffi/ffi/ffi_test.go
index a4da5b7a..37186b72 100644
--- a/mobile/sam-node-ffi/ffi/ffi_test.go
+++ b/mobile/sam-node-ffi/ffi/ffi_test.go
@@ -113,6 +113,9 @@ func TestMobileFFILifecycle(t *testing.T) {
if enrolledLabels["region"] != "eu-west-1" {
t.Fatalf("Expected label region=eu-west-1 in enroll request, got %v", enrolledLabels)
}
+ if got, err := loadEnrolledLabels(tmpDir); err != nil || got["region"] != "eu-west-1" {
+ t.Fatalf("Expected enrolled labels persisted for StartNode, got %v, %v", got, err)
+ }
// 3. Mobile Node Start
cfg := MobileConfig{
@@ -122,7 +125,7 @@ func TestMobileFFILifecycle(t *testing.T) {
BindAddr: "127.0.0.1:0", // random free port
ApiToken: "test-token",
AllowLoopback: true,
- Labels: "region=eu-west-1",
+ // No labels: StartNode must fall back to the enrolled ones.
}
cfgBytes, _ := json.Marshal(cfg)