From 7bdb527fabdee4e33578926f79a27b05216f934c Mon Sep 17 00:00:00 2001 From: Robert Sese <734194+rsese@users.noreply.github.com> Date: Fri, 1 Sep 2023 13:16:58 -0500 Subject: [PATCH] audit log pipeline: no ghae events (#41781) --- src/audit-logs/lib/index.js | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/audit-logs/lib/index.js b/src/audit-logs/lib/index.js index c3924f5c1c75..378de2cb453b 100644 --- a/src/audit-logs/lib/index.js +++ b/src/audit-logs/lib/index.js @@ -28,18 +28,27 @@ export function getAuditLogEvents(page, version) { openApiVersion = openApiVersion.split('-')[0] } + // There's no ghae versioned audit log events + if (openApiVersion === 'ghae') { + openApiVersion = 'ghes' + } + const auditLogFileName = path.join(AUDIT_LOG_DATA_DIR, openApiVersion, `${page}.json`) // If the data isn't cached for an entire version or a particular page, read // the data from the JSON file the first time around - if (!auditLogEventsCache.has(version)) { - auditLogEventsCache.set(version, new Map()) - auditLogEventsCache.get(version).set(page, new Map()) - auditLogEventsCache.get(version).set(page, readCompressedJsonFileFallback(auditLogFileName)) - } else if (!auditLogEventsCache.get(version).has(page)) { - auditLogEventsCache.get(version).set(page, new Map()) - auditLogEventsCache.get(version).set(page, readCompressedJsonFileFallback(auditLogFileName)) + if (!auditLogEventsCache.has(openApiVersion)) { + auditLogEventsCache.set(openApiVersion, new Map()) + auditLogEventsCache.get(openApiVersion).set(page, new Map()) + auditLogEventsCache + .get(openApiVersion) + .set(page, readCompressedJsonFileFallback(auditLogFileName)) + } else if (!auditLogEventsCache.get(openApiVersion).has(page)) { + auditLogEventsCache.get(openApiVersion).set(page, new Map()) + auditLogEventsCache + .get(openApiVersion) + .set(page, readCompressedJsonFileFallback(auditLogFileName)) } - return auditLogEventsCache.get(version).get(page) + return auditLogEventsCache.get(openApiVersion).get(page) }