Fix name of qlconfig file argument

github · Mar 7, 2023 · c310f09 · c310f09
1 parent 4366485
commit c310f09
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/codeql.test.js b/lib/codeql.test.js
diff --git a/lib/codeql.test.js.map b/lib/codeql.test.js.map
diff --git a/src/codeql.test.ts b/src/codeql.test.ts
@@ -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");
   });
@@ -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");
   });
@@ -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");
   });
@@ -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");
   });

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -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";
 
@@ -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,