Skip to content

Fix --qlconfig-file option #1564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aeisenberg merged 3 commits into from
Mar 7, 2023
Merged

Fix --qlconfig-file option #1564

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
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
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
Fix name of qlconfig file argument
  • Loading branch information
@henrymercer @aeisenberg
henrymercer authored and aeisenberg committed Mar 7, 2023
commit c310f094ddfedccaf8af1c66463136ecc81bc720
4 changes: 2 additions & 2 deletions lib/codeql.js
View file
Open in desktop

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
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions lib/codeql.test.js
View file
Open in desktop

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
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/codeql.test.ts
View file
Open in desktop
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
View file
Open in desktop
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