mirror of
https://github.com/github/codeql-action.git
synced 2026-01-06 06:30:10 +08:00
This commit adds a `packs` option to the codeql-config.yml file. Users
can specify a list of ql packs to include in the analysis.
For a single language analysis, the packs property looks like this:
```yaml
packs:
- pack-scope/pack-name1@1.2.3
- pack-scope/pack-name2 # no explicit version means download the latest
```
For multi-language analysis, you must key the packs block by lanaguage:
```yaml
packs:
cpp:
- pack-scope/pack-name1@1.2.3
- pack-scope/pack-name2
java:
- pack-scope/pack-name3@1.2.3
- pack-scope/pack-name4
```
This implementation adds a new analysis run (alongside custom and
builtin runs). The unit tests indicate that the correct commands are
being run, but I have not actually tried this with a real CLI.
Also, convert `instanceof Array` to `Array.isArray` since that is
sightly better in some situations. See:
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray#instanceof_vs_isarray
219 lines
8.9 KiB
JavaScript
Generated
219 lines
8.9 KiB
JavaScript
Generated
"use strict";
|
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
if (mod && mod.__esModule) return mod;
|
|
var result = {};
|
|
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
|
result["default"] = mod;
|
|
return result;
|
|
};
|
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
};
|
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
const fs = __importStar(require("fs"));
|
|
const path = __importStar(require("path"));
|
|
const ava_1 = __importDefault(require("ava"));
|
|
const yaml = __importStar(require("js-yaml"));
|
|
const semver_1 = require("semver");
|
|
const sinon_1 = __importDefault(require("sinon"));
|
|
const analyze_1 = require("./analyze");
|
|
const codeql_1 = require("./codeql");
|
|
const count_loc_1 = require("./count-loc");
|
|
const count = __importStar(require("./count-loc"));
|
|
const languages_1 = require("./languages");
|
|
const logging_1 = require("./logging");
|
|
const testing_utils_1 = require("./testing-utils");
|
|
const util = __importStar(require("./util"));
|
|
testing_utils_1.setupTests(ava_1.default);
|
|
// Checks that the duration fields are populated for the correct language
|
|
// and correct case of builtin or custom. Also checks the correct search
|
|
// paths are set in the database analyze invocation.
|
|
ava_1.default("status report fields and search path setting", async (t) => {
|
|
const mockLinesOfCode = Object.values(languages_1.Language).reduce((obj, lang, i) => {
|
|
// use a different line count for each language
|
|
obj[lang] = i + 1;
|
|
return obj;
|
|
}, {});
|
|
sinon_1.default.stub(count, "countLoc").resolves(mockLinesOfCode);
|
|
let searchPathsUsed = [];
|
|
return await util.withTmpDir(async (tmpDir) => {
|
|
testing_utils_1.setupActionsVars(tmpDir, tmpDir);
|
|
const memoryFlag = "";
|
|
const addSnippetsFlag = "";
|
|
const threadsFlag = "";
|
|
const packs = {
|
|
[languages_1.Language.cpp]: [
|
|
{
|
|
packName: "a/b",
|
|
version: semver_1.parse("1.0.0"),
|
|
},
|
|
],
|
|
[languages_1.Language.java]: [
|
|
{
|
|
packName: "c/d",
|
|
version: semver_1.parse("2.0.0"),
|
|
},
|
|
],
|
|
};
|
|
for (const language of Object.values(languages_1.Language)) {
|
|
codeql_1.setCodeQL({
|
|
databaseAnalyze: async (_, sarifFile, searchPath) => {
|
|
fs.writeFileSync(sarifFile, JSON.stringify({
|
|
runs: [
|
|
// variant 1 uses ruleId
|
|
{
|
|
properties: {
|
|
metricResults: [
|
|
{
|
|
ruleId: `${count_loc_1.getIdPrefix(language)}/summary/lines-of-code`,
|
|
value: 123,
|
|
},
|
|
],
|
|
},
|
|
},
|
|
// variant 2 uses rule.id
|
|
{
|
|
properties: {
|
|
metricResults: [
|
|
{
|
|
rule: {
|
|
id: `${count_loc_1.getIdPrefix(language)}/summary/lines-of-code`,
|
|
},
|
|
value: 123,
|
|
},
|
|
],
|
|
},
|
|
},
|
|
{},
|
|
],
|
|
}));
|
|
searchPathsUsed.push(searchPath);
|
|
return "";
|
|
},
|
|
});
|
|
searchPathsUsed = [];
|
|
const config = {
|
|
languages: [language],
|
|
queries: {},
|
|
pathsIgnore: [],
|
|
paths: [],
|
|
originalUserInput: {},
|
|
tempDir: tmpDir,
|
|
toolCacheDir: tmpDir,
|
|
codeQLCmd: "",
|
|
gitHubVersion: {
|
|
type: util.GitHubVariant.DOTCOM,
|
|
},
|
|
dbLocation: path.resolve(tmpDir, "codeql_databases"),
|
|
packs,
|
|
};
|
|
fs.mkdirSync(util.getCodeQLDatabasePath(config, language), {
|
|
recursive: true,
|
|
});
|
|
config.queries[language] = {
|
|
builtin: ["foo.ql"],
|
|
custom: [],
|
|
};
|
|
const builtinStatusReport = await analyze_1.runQueries(tmpDir, memoryFlag, addSnippetsFlag, threadsFlag, undefined, config, logging_1.getRunnerLogger(true));
|
|
const hasPacks = language in packs;
|
|
t.deepEqual(Object.keys(builtinStatusReport).length, hasPacks ? 2 : 1);
|
|
t.true(`analyze_builtin_queries_${language}_duration_ms` in builtinStatusReport);
|
|
config.queries[language] = {
|
|
builtin: [],
|
|
custom: [
|
|
{
|
|
queries: ["foo.ql"],
|
|
searchPath: "/1",
|
|
},
|
|
{
|
|
queries: ["bar.ql"],
|
|
searchPath: "/2",
|
|
},
|
|
],
|
|
};
|
|
const customStatusReport = await analyze_1.runQueries(tmpDir, memoryFlag, addSnippetsFlag, threadsFlag, undefined, config, logging_1.getRunnerLogger(true));
|
|
t.deepEqual(Object.keys(customStatusReport).length, 1);
|
|
t.true(`analyze_custom_queries_${language}_duration_ms` in customStatusReport);
|
|
const expectedSearchPathsUsed = hasPacks
|
|
? [undefined, undefined, "/1", "/2", undefined]
|
|
: [undefined, "/1", "/2"];
|
|
t.deepEqual(searchPathsUsed, expectedSearchPathsUsed);
|
|
}
|
|
verifyLineCounts(tmpDir);
|
|
verifyQuerySuites(tmpDir);
|
|
});
|
|
function verifyLineCounts(tmpDir) {
|
|
// eslint-disable-next-line github/array-foreach
|
|
Object.keys(languages_1.Language).forEach((lang, i) => {
|
|
verifyLineCountForFile(lang, path.join(tmpDir, `${lang}-builtin.sarif`), i + 1);
|
|
verifyLineCountForFile(lang, path.join(tmpDir, `${lang}-custom.sarif`), i + 1);
|
|
});
|
|
}
|
|
function verifyLineCountForFile(lang, filePath, lineCount) {
|
|
const idPrefix = count_loc_1.getIdPrefix(lang);
|
|
const sarif = JSON.parse(fs.readFileSync(filePath, "utf8"));
|
|
t.deepEqual(sarif.runs[0].properties.metricResults, [
|
|
{
|
|
ruleId: `${idPrefix}/summary/lines-of-code`,
|
|
value: 123,
|
|
baseline: lineCount,
|
|
},
|
|
]);
|
|
t.deepEqual(sarif.runs[1].properties.metricResults, [
|
|
{
|
|
rule: {
|
|
id: `${idPrefix}/summary/lines-of-code`,
|
|
},
|
|
value: 123,
|
|
baseline: lineCount,
|
|
},
|
|
]);
|
|
// when the rule doesn't exist, it should not be added
|
|
t.deepEqual(sarif.runs[2].properties.metricResults, []);
|
|
}
|
|
function verifyQuerySuites(tmpDir) {
|
|
const qlsContent = [
|
|
{
|
|
query: "foo.ql",
|
|
},
|
|
];
|
|
const qlsContent2 = [
|
|
{
|
|
query: "bar.ql",
|
|
},
|
|
];
|
|
const qlsPackContentCpp = [
|
|
{
|
|
qlpack: "a/b",
|
|
version: "1.0.0",
|
|
},
|
|
];
|
|
const qlsPackContentJava = [
|
|
{
|
|
qlpack: "c/d",
|
|
version: "2.0.0",
|
|
},
|
|
];
|
|
for (const lang of Object.values(languages_1.Language)) {
|
|
t.deepEqual(readContents(`${lang}-queries-builtin.qls`), qlsContent);
|
|
t.deepEqual(readContents(`${lang}-queries-custom-0.qls`), qlsContent);
|
|
t.deepEqual(readContents(`${lang}-queries-custom-1.qls`), qlsContent2);
|
|
const packSuiteName = `${lang}-queries-packs.qls`;
|
|
if (lang === languages_1.Language.cpp) {
|
|
t.deepEqual(readContents(packSuiteName), qlsPackContentCpp);
|
|
}
|
|
else if (lang === languages_1.Language.java) {
|
|
t.deepEqual(readContents(packSuiteName), qlsPackContentJava);
|
|
}
|
|
else {
|
|
t.false(fs.existsSync(path.join(tmpDir, "codeql_databases", packSuiteName)));
|
|
}
|
|
}
|
|
function readContents(name) {
|
|
const x = fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8");
|
|
console.log(x);
|
|
return yaml.safeLoad(fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8"));
|
|
}
|
|
}
|
|
});
|
|
//# sourceMappingURL=analyze.test.js.map
|