Fix failing test and address PR comments

github · Aug 11, 2022 · a09a029 · a09a029
1 parent 2314063
commit a09a029
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 15 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/config-utils.js b/lib/config-utils.js
diff --git a/lib/config-utils.js.map b/lib/config-utils.js.map
diff --git a/lib/config-utils.test.js b/lib/config-utils.test.js
diff --git a/lib/config-utils.test.js.map b/lib/config-utils.test.js.map
diff --git a/lib/util.js b/lib/util.js
diff --git a/lib/util.js.map b/lib/util.js.map
diff --git a/src/codeql.ts b/src/codeql.ts
@@ -1234,13 +1234,16 @@ async function runTool(cmd: string, args: string[] = []) {
  * @param config The configuration to use.
  * @returns the path to the generated user configuration file.
  */
-async function generateCodescanningConfig(codeql: CodeQL, config: Config) {
+async function generateCodescanningConfig(
+  codeql: CodeQL,
+  config: Config
+): Promise<string | undefined> {
   if (!(await util.useCodeScanningConfigInCli(codeql))) {
     return;
   }
   const configLocation = path.resolve(config.tempDir, "user-config.yaml");
   // make a copy so we can modify it
-  const augmentedConfig = JSON.parse(JSON.stringify(config.originalUserInput));
+  const augmentedConfig = cloneObject(config.originalUserInput);
 
   // Inject the queries from the input
   if (config.augmentationProperties.queriesInput) {
@@ -1299,3 +1302,7 @@ async function generateCodescanningConfig(codeql: CodeQL, config: Config) {
   fs.writeFileSync(configLocation, yaml.dump(augmentedConfig));
   return configLocation;
 }
+
+function cloneObject(obj: any) {
+  return JSON.parse(JSON.stringify(obj));
+}
diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts
@@ -1623,7 +1623,7 @@ function parseInputAndConfigMacro(
     configUtils.parsePacks(
       packsFromConfig,
       packsFromInput,
-      !!packsFromInput?.trim().startsWith("+"),
+      !!packsFromInput?.trim().startsWith("+"), // coerce to boolean
       languages,
       "/a/b",
       mockLogger

diff --git a/src/config-utils.ts b/src/config-utils.ts
@@ -198,6 +198,8 @@ export const defaultAugmentationProperties: AugmentationProperties = {
   queriesInputCombines: false,
   packsInputCombines: false,
   injectedMlQueries: false,
+  packsInput: undefined,
+  queriesInput: undefined,
 };
 
 export type Packs = Partial<Record<Language, string[]>>;

diff --git a/src/util.ts b/src/util.ts
@@ -776,8 +776,7 @@ export async function useCodeScanningConfigInCli(
   codeql: CodeQL
 ): Promise<boolean> {
   return (
-    (process.env[EnvVar.CODEQL_PASS_CONFIG_TO_CLI] === "true" &&
-      (await codeQlVersionAbove(codeql, CODEQL_VERSION_CONFIG_FILES))) ||
-    false
+    process.env[EnvVar.CODEQL_PASS_CONFIG_TO_CLI] === "true" &&
+    (await codeQlVersionAbove(codeql, CODEQL_VERSION_CONFIG_FILES))
   );
 }