Nit: Dedupe languages

This commit is contained in:
Henry Mercer
2026-05-07 11:01:15 +01:00
parent 01bc9be56a
commit 7525c68ea1
8 changed files with 54 additions and 21 deletions
+4 -3
View File
@@ -91155,9 +91155,10 @@ async function getCodeQlVersionsForOverlayBaseDatabases(rawLanguages, logger) {
);
return void 0;
}
const cacheKeyPrefix = await getCacheKeyPrefixBase(
languages.filter((l) => l !== void 0)
);
const dedupedLanguages = [
...new Set(languages.filter((l) => l !== void 0))
];
const cacheKeyPrefix = await getCacheKeyPrefixBase(dedupedLanguages);
logger.debug(
`Searching for overlay-base databases in Actions cache with prefix ${cacheKeyPrefix}`
);
+4 -3
View File
@@ -132126,9 +132126,10 @@ async function getCodeQlVersionsForOverlayBaseDatabases(rawLanguages, logger) {
);
return void 0;
}
const cacheKeyPrefix = await getCacheKeyPrefixBase(
languages.filter((l) => l !== void 0)
);
const dedupedLanguages = [
...new Set(languages.filter((l) => l !== void 0))
];
const cacheKeyPrefix = await getCacheKeyPrefixBase(dedupedLanguages);
logger.debug(
`Searching for overlay-base databases in Actions cache with prefix ${cacheKeyPrefix}`
);
+4 -3
View File
@@ -90084,9 +90084,10 @@ async function getCodeQlVersionsForOverlayBaseDatabases(rawLanguages, logger) {
);
return void 0;
}
const cacheKeyPrefix = await getCacheKeyPrefixBase(
languages.filter((l) => l !== void 0)
);
const dedupedLanguages = [
...new Set(languages.filter((l) => l !== void 0))
];
const cacheKeyPrefix = await getCacheKeyPrefixBase(dedupedLanguages);
logger.debug(
`Searching for overlay-base databases in Actions cache with prefix ${cacheKeyPrefix}`
);
+4 -3
View File
@@ -87526,9 +87526,10 @@ async function getCodeQlVersionsForOverlayBaseDatabases(rawLanguages, logger) {
);
return void 0;
}
const cacheKeyPrefix = await getCacheKeyPrefixBase(
languages.filter((l) => l !== void 0)
);
const dedupedLanguages = [
...new Set(languages.filter((l) => l !== void 0))
];
const cacheKeyPrefix = await getCacheKeyPrefixBase(dedupedLanguages);
logger.debug(
`Searching for overlay-base databases in Actions cache with prefix ${cacheKeyPrefix}`
);
+4 -3
View File
@@ -90181,9 +90181,10 @@ async function getCodeQlVersionsForOverlayBaseDatabases(rawLanguages, logger) {
);
return void 0;
}
const cacheKeyPrefix = await getCacheKeyPrefixBase(
languages.filter((l) => l !== void 0)
);
const dedupedLanguages = [
...new Set(languages.filter((l) => l !== void 0))
];
const cacheKeyPrefix = await getCacheKeyPrefixBase(dedupedLanguages);
logger.debug(
`Searching for overlay-base databases in Actions cache with prefix ${cacheKeyPrefix}`
);
+4 -3
View File
@@ -90858,9 +90858,10 @@ async function getCodeQlVersionsForOverlayBaseDatabases(rawLanguages, logger) {
);
return void 0;
}
const cacheKeyPrefix = await getCacheKeyPrefixBase(
languages.filter((l) => l !== void 0)
);
const dedupedLanguages = [
...new Set(languages.filter((l) => l !== void 0))
];
const cacheKeyPrefix = await getCacheKeyPrefixBase(dedupedLanguages);
logger.debug(
`Searching for overlay-base databases in Actions cache with prefix ${cacheKeyPrefix}`
);
+26
View File
@@ -391,6 +391,32 @@ test.serial(
},
);
test.serial(
"getCodeQlVersionsForOverlayBaseDatabases de-duplicates resolved language aliases",
async (t) => {
const logger = getRunnerLogger(true);
sinon.stub(apiClient, "getAutomationID").resolves("test-automation-id/");
const listActionsCachesStub = sinon
.stub(apiClient, "listActionsCaches")
.resolves([
{
key: "codeql-overlay-base-database-1-c5666c509a2d9895-javascript_python-2.25.0-abc123-1-1",
},
]);
const result = await getCodeQlVersionsForOverlayBaseDatabases(
["javascript", "typescript", "Python", "python"],
logger,
);
t.deepEqual(result, ["2.25.0"]);
sinon.assert.calledOnceWithExactly(
listActionsCachesStub,
"codeql-overlay-base-database-1-c5666c509a2d9895-javascript_python-",
);
},
);
test.serial(
"getCodeQlVersionsForOverlayBaseDatabases ignores nightly versions with build metadata",
async (t) => {
+4 -3
View File
@@ -461,9 +461,10 @@ export async function getCodeQlVersionsForOverlayBaseDatabases(
);
return undefined;
}
const cacheKeyPrefix = await getCacheKeyPrefixBase(
languages.filter((l) => l !== undefined),
);
const dedupedLanguages = [
...new Set(languages.filter((l) => l !== undefined)),
];
const cacheKeyPrefix = await getCacheKeyPrefixBase(dedupedLanguages);
logger.debug(
`Searching for overlay-base databases in Actions cache with ` +