fix: use correct event field name setup_key_name (not setup_key)
This commit is contained in:
parent
9ffe1ba7b5
commit
06b54c97f1
@ -12,7 +12,7 @@ function makeEvent(overrides: Partial<NbEvent> = {}): NbEvent {
|
|||||||
initiator_id: "init-1",
|
initiator_id: "init-1",
|
||||||
initiator_name: "admin",
|
initiator_name: "admin",
|
||||||
target_id: "peer-1",
|
target_id: "peer-1",
|
||||||
meta: { setup_key: "drone-key", name: "drone-01" },
|
meta: { setup_key_name: "drone-key", name: "drone-01" },
|
||||||
...overrides,
|
...overrides,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -66,7 +66,7 @@ Deno.test("processEnrollmentEvents filters by lastTimestamp", () => {
|
|||||||
Deno.test("processEnrollmentEvents ignores unknown keys", () => {
|
Deno.test("processEnrollmentEvents ignores unknown keys", () => {
|
||||||
const events: NbEvent[] = [
|
const events: NbEvent[] = [
|
||||||
makeEvent({
|
makeEvent({
|
||||||
meta: { setup_key: "rogue-key", name: "rogue-host" },
|
meta: { setup_key_name: "rogue-key", name: "rogue-host" },
|
||||||
target_id: "peer-x",
|
target_id: "peer-x",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|||||||
@ -21,10 +21,10 @@ export function processEnrollmentEvents(
|
|||||||
.filter((e) => {
|
.filter((e) => {
|
||||||
if (e.activity_code !== "peer.setupkey.add") return false;
|
if (e.activity_code !== "peer.setupkey.add") return false;
|
||||||
if (lastTimestamp && e.timestamp <= lastTimestamp) return false;
|
if (lastTimestamp && e.timestamp <= lastTimestamp) return false;
|
||||||
if (!knownKeyNames.has(e.meta.setup_key)) {
|
if (!knownKeyNames.has(e.meta.setup_key_name)) {
|
||||||
console.log(JSON.stringify({
|
console.log(JSON.stringify({
|
||||||
msg: "unknown_enrollment",
|
msg: "unknown_enrollment",
|
||||||
setup_key: e.meta.setup_key,
|
setup_key_name: e.meta.setup_key_name,
|
||||||
peer_id: e.target_id,
|
peer_id: e.target_id,
|
||||||
}));
|
}));
|
||||||
return false;
|
return false;
|
||||||
@ -32,7 +32,7 @@ export function processEnrollmentEvents(
|
|||||||
return true;
|
return true;
|
||||||
})
|
})
|
||||||
.map((e) => ({
|
.map((e) => ({
|
||||||
setupKeyName: e.meta.setup_key,
|
setupKeyName: e.meta.setup_key_name,
|
||||||
peerId: e.target_id,
|
peerId: e.target_id,
|
||||||
peerHostname: e.meta.name,
|
peerHostname: e.meta.name,
|
||||||
timestamp: e.timestamp,
|
timestamp: e.timestamp,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user