src/poller/poller.test.ts

@@ -12,7 +12,7 @@ function makeEvent(overrides: Partial<NbEvent> = {}): NbEvent {
     initiator_id: "init-1",
     initiator_name: "admin",
     target_id: "peer-1",
-    meta: { setup_key_name: "drone-key", name: "drone-01" },
+    meta: { setup_key: "drone-key", name: "drone-01" },
     ...overrides,
   };
 }
@@ -66,7 +66,7 @@ Deno.test("processEnrollmentEvents filters by lastTimestamp", () => {
 Deno.test("processEnrollmentEvents ignores unknown keys", () => {
   const events: NbEvent[] = [
     makeEvent({
-      meta: { setup_key_name: "rogue-key", name: "rogue-host" },
+      meta: { setup_key: "rogue-key", name: "rogue-host" },
       target_id: "peer-x",
     }),
   ];

src/poller/poller.ts

@@ -21,10 +21,10 @@ export function processEnrollmentEvents(
     .filter((e) => {
       if (e.activity_code !== "peer.setupkey.add") return false;
       if (lastTimestamp && e.timestamp <= lastTimestamp) return false;
-      if (!knownKeyNames.has(e.meta.setup_key_name)) {
+      if (!knownKeyNames.has(e.meta.setup_key)) {
         console.log(JSON.stringify({
           msg: "unknown_enrollment",
-          setup_key_name: e.meta.setup_key_name,
+          setup_key: e.meta.setup_key,
           peer_id: e.target_id,
         }));
         return false;
@@ -32,7 +32,7 @@ export function processEnrollmentEvents(
       return true;
     })
     .map((e) => ({
-      setupKeyName: e.meta.setup_key_name,
+      setupKeyName: e.meta.setup_key,
       peerId: e.target_id,
       peerHostname: e.meta.name,
       timestamp: e.timestamp,

state/test.json

@@ -15,40 +15,30 @@
       "type": "one-off",
       "expires_in": 604800,
       "usage_limit": 1,
-      "auto_groups": [
-        "ground-stations"
-      ],
+      "auto_groups": ["ground-stations"],
       "enrolled": false
     },
     "Pilot-TestHawk-1": {
       "type": "one-off",
       "expires_in": 604800,
       "usage_limit": 1,
-      "auto_groups": [
-        "pilots"
-      ],
+      "auto_groups": ["pilots"],
       "enrolled": false
     },
     "GS-Enroll-Test": {
       "type": "one-off",
       "expires_in": 604800,
       "usage_limit": 1,
-      "auto_groups": [
-        "ground-stations"
-      ],
-      "enrolled": true
+      "auto_groups": ["ground-stations"],
+      "enrolled": false
     }
   },
   "policies": {
     "pilots-to-gs": {
       "description": "",
       "enabled": false,
-      "sources": [
-        "pilots"
-      ],
-      "destinations": [
-        "ground-stations"
-      ],
+      "sources": ["pilots"],
+      "destinations": ["ground-stations"],
       "bidirectional": true,
       "protocol": "all",
       "action": "accept",
@@ -57,22 +47,14 @@
     "observers-to-gs": {
       "description": "",
       "enabled": true,
-      "sources": [
-        "observers"
-      ],
-      "destinations": [
-        "ground-stations"
-      ],
+      "sources": ["observers"],
+      "destinations": ["ground-stations"],
       "bidirectional": false,
       "protocol": "all",
       "action": "accept",
       "source_posture_checks": []
     }
   },
-  "routes": {},
-  "dns": {
-    "nameserver_groups": {}
-  },
   "posture_checks": {},
   "networks": {},
   "peers": {},
@@ -82,5 +64,9 @@
       "role": "owner",
       "auto_groups": []
     }
+  },
+  "routes": {},
+  "dns": {
+    "nameserver_groups": {}
   }
-}
+}