Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
bbe8d37
Ensure qlconfig file is created when config parsing in cli is on
aeisenberg Feb 7, 2023
e2f72f1
Merge remote-tracking branch 'upstream/main' into aeisenberg/qlconfig…
aeisenberg Feb 9, 2023
3c81243
Apply suggestions from code review
aeisenberg Feb 9, 2023
5492b7d
Add tests for `generateRegistries` with an existing CODEQL_REGISTRIES…
aeisenberg Feb 9, 2023
736263f
Update src/codeql.ts
aeisenberg Feb 17, 2023
652709d
Update changelog and version after v2.2.5
invalid-email-address Feb 24, 2023
cf1855a
Fix workflow to update dependencies
henrymercer Feb 24, 2023
8f19113
Merge branch 'main' into aeisenberg/qlconfig-in-cli
aeisenberg Feb 27, 2023
041757f
Merge pull request #1549 from github/henrymercer/fix-update-dependencies
henrymercer Feb 27, 2023
36a249f
Merge branch 'main' into mergeback/v2.2.5-to-main-32dc4993
henrymercer Feb 27, 2023
18ff14b
Update checked-in dependencies
invalid-email-address Feb 27, 2023
903be79
Merge pull request #1548 from github/mergeback/v2.2.5-to-main-32dc4993
henrymercer Feb 27, 2023
98d24e5
Address comments from PR
aeisenberg Feb 27, 2023
a589d40
Merge pull request #1527 from github/aeisenberg/qlconfig-in-cli
aeisenberg Feb 27, 2023
e812e63
Update bundle to 2.12.4
Mar 6, 2023
5e4af3a
Update bundle to 2.12.4
Mar 6, 2023
a6d3a44
Avoid writing `user-config.yaml` file while running tests
henrymercer Mar 6, 2023
100bd7b
Avoid passing an undefined qlconfig arg
henrymercer Mar 6, 2023
6f079be
Bump `setup-swift` and re-configure dependabot (#1560)
angelapwen Mar 6, 2023
e5ade42
Merge branch 'main' into dbartol/bundle-2.12.4
henrymercer Mar 6, 2023
abf1cea
Bump glob from 8.0.1 to 9.2.1
dependabot[bot] Mar 6, 2023
7806af3
Update checked-in dependencies
invalid-email-address Mar 6, 2023
eb40427
Fix name of qlconfig file argument
henrymercer Mar 6, 2023
6ef6e50
Merge pull request #1563 from github/dependabot/npm_and_yarn/glob-9.2.1
henrymercer Mar 6, 2023
8340258
Avoid writing `user-config.yaml` file while running tests
henrymercer Mar 6, 2023
4366485
Avoid passing an undefined qlconfig arg
henrymercer Mar 6, 2023
c310f09
Fix name of qlconfig file argument
henrymercer Mar 6, 2023
e4b846c
Merge pull request #1564 from github/aeisenberg/qlconfig-file
aeisenberg Mar 7, 2023
0c27d0d
Add default values to feature flags
aeisenberg Mar 8, 2023
a3cf964
Add `security-experimental` to `codeql-config.yml` (#1566)
angelapwen Mar 8, 2023
f13b180
Merge pull request #1567 from github/aeisenberg/config-parsing-ghes
aeisenberg Mar 8, 2023
d47d4c8
Merge branch 'main' into dbartol/bundle-2.12.4
Mar 9, 2023
e12a2ec
Merge pull request #1561 from github/dbartol/bundle-2.12.4
Mar 9, 2023
74cbab4
Update changelog for v2.2.6
invalid-email-address Mar 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix name of qlconfig file argument
  • Loading branch information
henrymercer authored and aeisenberg committed Mar 7, 2023
commit c310f094ddfedccaf8af1c66463136ecc81bc720
4 changes: 2 additions & 2 deletions lib/codeql.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/codeql.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions lib/codeql.test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/codeql.test.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/codeql.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ test("does not pass a code scanning config or qlconfig file to the CLI when CLI

// should not have passed a qlconfig file
const hasQlconfigArg = args.some((arg: string) =>
arg.startsWith("--qlconfig=")
arg.startsWith("--qlconfig-file=")
);
t.false(hasQlconfigArg, "Should NOT have passed a qlconfig file");
});
Expand Down Expand Up @@ -1059,7 +1059,7 @@ test("passes a code scanning config AND qlconfig to the CLI when CLI config pass

// should have passed a qlconfig file
const hasQlconfigArg = args.some((arg: string) =>
arg.startsWith("--qlconfig=")
arg.startsWith("--qlconfig-file=")
);
t.truthy(hasQlconfigArg, "Should have injected a codescanning config");
});
Expand Down Expand Up @@ -1092,7 +1092,7 @@ test("passes a code scanning config BUT NOT a qlconfig to the CLI when CLI confi

// should not have passed a qlconfig file
const hasQlconfigArg = args.some((arg: string) =>
arg.startsWith("--qlconfig=")
arg.startsWith("--qlconfig-file=")
);
t.false(hasQlconfigArg, "should NOT have injected a qlconfig");
});
Expand All @@ -1117,7 +1117,7 @@ test("does not pass a qlconfig to the CLI when it is undefined", async (t: Execu

const args = runnerConstructorStub.firstCall.args[1] as any[];
const hasQlconfigArg = args.some((arg: string) =>
arg.startsWith("--qlconfig=")
arg.startsWith("--qlconfig-file=")
);
t.false(hasQlconfigArg, "should NOT have injected a qlconfig");
});
Expand Down
4 changes: 2 additions & 2 deletions src/codeql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export const CODEQL_VERSION_BETTER_RESOLVE_LANGUAGES = "2.10.3";
export const CODEQL_VERSION_SECURITY_EXPERIMENTAL_SUITE = "2.12.1";

/**
* Versions 2.12.4+ of the CodeQL CLI support the `--qlconfig` flag in calls to `database init`.
* Versions 2.12.4+ of the CodeQL CLI support the `--qlconfig-file` flag in calls to `database init`.
*/
export const CODEQL_VERSION_INIT_WITH_QLCONFIG = "2.12.4";

Expand Down Expand Up @@ -622,7 +622,7 @@ export async function getCodeQLForCmd(
qlconfigFile !== undefined &&
(await util.codeQlVersionAbove(this, CODEQL_VERSION_INIT_WITH_QLCONFIG))
) {
extraArgs.push(`--qlconfig=${qlconfigFile}`);
extraArgs.push(`--qlconfig-file=${qlconfigFile}`);
}
await runTool(
cmd,
Expand Down