From 79939d8ca5230862a2b265ecbd0f66af2ed5a132 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Fri, 9 Jan 2026 19:08:36 +0000 Subject: [PATCH] Copy OIDs from DB cluster to individual DBs --- lib/analyze-action.js | 36 ++++++++++++++++-------- lib/autobuild-action.js | 18 ++++++------ lib/init-action-post.js | 46 +++++++++++++++++++------------ lib/init-action.js | 18 ++++++------ lib/resolve-environment-action.js | 18 ++++++------ lib/setup-codeql-action.js | 18 ++++++------ lib/start-proxy-action.js | 18 ++++++------ lib/upload-sarif-action.js | 18 ++++++------ package-lock.json | 11 ++++++++ src/util.ts | 20 ++++++++++++-- 10 files changed, 135 insertions(+), 86 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index a65204695..596e0b103 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -18841,7 +18841,7 @@ var require_io = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -18974,13 +18974,13 @@ var require_io = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -31945,7 +31945,7 @@ var require_io2 = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -32084,13 +32084,13 @@ var require_io2 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -84752,7 +84752,7 @@ var require_io3 = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -84891,13 +84891,13 @@ var require_io3 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -93094,9 +93094,21 @@ async function bundleDb(config, language, codeql, dbName) { if (fs.existsSync(databaseBundlePath)) { await fs.promises.rm(databaseBundlePath, { force: true }); } - await codeql.databaseBundle(databasePath, databaseBundlePath, dbName, [ - BASE_DATABASE_OIDS_FILE_NAME - ]); + const baseDatabaseOidsFilePath = getBaseDatabaseOidsFilePath(config); + const additionalFiles = []; + if (fs.existsSync(baseDatabaseOidsFilePath)) { + await fsPromises.copyFile( + baseDatabaseOidsFilePath, + path.join(databasePath, BASE_DATABASE_OIDS_FILE_NAME) + ); + additionalFiles.push(BASE_DATABASE_OIDS_FILE_NAME); + } + await codeql.databaseBundle( + databasePath, + databaseBundlePath, + dbName, + additionalFiles + ); return databaseBundlePath; } async function delay(milliseconds, opts) { diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index fe3355830..aa7ce76ae 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -18841,7 +18841,7 @@ var require_io = __commonJS({ if (path7.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -18974,13 +18974,13 @@ var require_io = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -31945,7 +31945,7 @@ var require_io2 = __commonJS({ if (path7.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -32084,13 +32084,13 @@ var require_io2 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -84752,7 +84752,7 @@ var require_io3 = __commonJS({ if (path7.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -84891,13 +84891,13 @@ var require_io3 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { diff --git a/lib/init-action-post.js b/lib/init-action-post.js index c518ed16b..715cc02c2 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -18841,7 +18841,7 @@ var require_io = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -18974,13 +18974,13 @@ var require_io = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -31945,7 +31945,7 @@ var require_io2 = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -32084,13 +32084,13 @@ var require_io2 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -84752,7 +84752,7 @@ var require_io3 = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -84891,13 +84891,13 @@ var require_io3 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -93484,8 +93484,8 @@ var require_graceful_fs = __commonJS({ } var fs$copyFile = fs19.copyFile; if (fs$copyFile) - fs19.copyFile = copyFile; - function copyFile(src, dest, flags, cb) { + fs19.copyFile = copyFile2; + function copyFile2(src, dest, flags, cb) { if (typeof flags === "function") { cb = flags; flags = 0; @@ -119919,7 +119919,7 @@ var require_io4 = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -120058,13 +120058,13 @@ var require_io4 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -129218,9 +129218,21 @@ async function bundleDb(config, language, codeql, dbName) { if (fs.existsSync(databaseBundlePath)) { await fs.promises.rm(databaseBundlePath, { force: true }); } - await codeql.databaseBundle(databasePath, databaseBundlePath, dbName, [ - BASE_DATABASE_OIDS_FILE_NAME - ]); + const baseDatabaseOidsFilePath = getBaseDatabaseOidsFilePath(config); + const additionalFiles = []; + if (fs.existsSync(baseDatabaseOidsFilePath)) { + await fsPromises.copyFile( + baseDatabaseOidsFilePath, + path.join(databasePath, BASE_DATABASE_OIDS_FILE_NAME) + ); + additionalFiles.push(BASE_DATABASE_OIDS_FILE_NAME); + } + await codeql.databaseBundle( + databasePath, + databaseBundlePath, + dbName, + additionalFiles + ); return databaseBundlePath; } async function delay(milliseconds, opts) { diff --git a/lib/init-action.js b/lib/init-action.js index d7d63f2d2..bc3a16c40 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -18841,7 +18841,7 @@ var require_io = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -18974,13 +18974,13 @@ var require_io = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -32096,7 +32096,7 @@ var require_io2 = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -32235,13 +32235,13 @@ var require_io2 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -84903,7 +84903,7 @@ var require_io3 = __commonJS({ if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -85042,13 +85042,13 @@ var require_io3 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 7379429ba..cb1d6b79e 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -18841,7 +18841,7 @@ var require_io = __commonJS({ if (path5.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -18974,13 +18974,13 @@ var require_io = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -31945,7 +31945,7 @@ var require_io2 = __commonJS({ if (path5.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -32084,13 +32084,13 @@ var require_io2 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -84752,7 +84752,7 @@ var require_io3 = __commonJS({ if (path5.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -84891,13 +84891,13 @@ var require_io3 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index a1a729052..f7809a9ab 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -18841,7 +18841,7 @@ var require_io = __commonJS({ if (path8.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -18974,13 +18974,13 @@ var require_io = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -30648,7 +30648,7 @@ var require_io2 = __commonJS({ if (path8.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -30787,13 +30787,13 @@ var require_io2 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -84752,7 +84752,7 @@ var require_io3 = __commonJS({ if (path8.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -84891,13 +84891,13 @@ var require_io3 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index f0b5ab0ad..78c118b06 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -18841,7 +18841,7 @@ var require_io = __commonJS({ if (path2.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -18974,13 +18974,13 @@ var require_io = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -21671,7 +21671,7 @@ var require_io2 = __commonJS({ if (path2.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -21810,13 +21810,13 @@ var require_io2 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -53307,7 +53307,7 @@ var require_io3 = __commonJS({ if (path2.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -53446,13 +53446,13 @@ var require_io3 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index ab402ebec..41f2a533c 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -18841,7 +18841,7 @@ var require_io = __commonJS({ if (path12.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -18974,13 +18974,13 @@ var require_io = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -30648,7 +30648,7 @@ var require_io2 = __commonJS({ if (path12.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -30787,13 +30787,13 @@ var require_io2 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { @@ -84752,7 +84752,7 @@ var require_io3 = __commonJS({ if (path12.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } - yield copyFile(source, newDest, force); + yield copyFile2(source, newDest, force); } }); } @@ -84891,13 +84891,13 @@ var require_io3 = __commonJS({ if (srcFileStat.isDirectory()) { yield cpDirRecursive(srcFile, destFile, currentDepth, force); } else { - yield copyFile(srcFile, destFile, force); + yield copyFile2(srcFile, destFile, force); } } yield ioUtil.chmod(destDir, (yield ioUtil.stat(sourceDir)).mode); }); } - function copyFile(srcFile, destFile, force) { + function copyFile2(srcFile, destFile, force) { return __awaiter2(this, void 0, void 0, function* () { if ((yield ioUtil.lstat(srcFile)).isSymbolicLink()) { try { diff --git a/package-lock.json b/package-lock.json index c04467f89..6ca99c3ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1730,6 +1730,7 @@ "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz", "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==", "license": "MIT", + "peer": true, "dependencies": { "@octokit/auth-token": "^4.0.0", "@octokit/graphql": "^7.1.0", @@ -2496,6 +2497,7 @@ "integrity": "sha512-iIACsx8pxRnguSYhHiMn2PvhvfpopO9FXHyn1mG5txZIsAaB6F0KwbFnUQN3KCiG3Jcuad/Cao2FAs1Wp7vAyg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.52.0", "@typescript-eslint/types": "8.52.0", @@ -3177,6 +3179,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3748,6 +3751,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001669", "electron-to-chromium": "^1.5.41", @@ -4591,6 +4595,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "dev": true, + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4645,6 +4650,7 @@ "version": "8.3.0", "dev": true, "license": "MIT", + "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -4916,6 +4922,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, + "peer": true, "dependencies": { "array-includes": "^3.1.7", "array.prototype.findlastindex": "^1.2.3", @@ -7316,6 +7323,7 @@ "integrity": "sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -8305,6 +8313,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -8517,6 +8526,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -8590,6 +8600,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.17.0.tgz", "integrity": "sha512-Drp39TXuUlD49F7ilHHCG7TTg8IkA+hxCuULdmzWYICxGXvDXmDmWEjJYZQYgf6l/TFfYNE167m7isnc3xlIEg==", "dev": true, + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.17.0", "@typescript-eslint/types": "8.17.0", diff --git a/src/util.ts b/src/util.ts index 09e98206f..fe4d2a0cb 100644 --- a/src/util.ts +++ b/src/util.ts @@ -755,9 +755,23 @@ export async function bundleDb( if (fs.existsSync(databaseBundlePath)) { await fs.promises.rm(databaseBundlePath, { force: true }); } - await codeql.databaseBundle(databasePath, databaseBundlePath, dbName, [ - BASE_DATABASE_OIDS_FILE_NAME, - ]); + // Copy the base database OIDs file into the database location if it exists + const baseDatabaseOidsFilePath = getBaseDatabaseOidsFilePath(config); + const additionalFiles: string[] = []; + if (fs.existsSync(baseDatabaseOidsFilePath)) { + await fsPromises.copyFile( + baseDatabaseOidsFilePath, + path.join(databasePath, BASE_DATABASE_OIDS_FILE_NAME), + ); + additionalFiles.push(BASE_DATABASE_OIDS_FILE_NAME); + } + // Create the bundle, including the base database OIDs file if it exists + await codeql.databaseBundle( + databasePath, + databaseBundlePath, + dbName, + additionalFiles, + ); return databaseBundlePath; }