Don't fail if query path doesn't exist

github · sampart · Jun 18, 2020 · Jun 16, 2020 · Jun 16, 2020 · Jun 17, 2020
commit 24096a1cb3963c979a986e6dba0680bc6b0adc71
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/src/config-utils.ts b/src/config-utils.ts
@@ -52,13 +52,16 @@ export class Config {
             // Resolve the local path against the workspace so that when this is
             // passed to codeql it resolves to exactly the path we expect it to resolve to.
             const workspacePath = fs.realpathSync(util.getRequiredEnvParam('GITHUB_WORKSPACE'));
-            const absoluteQueryPath = fs.realpathSync(path.join(workspacePath, localQueryPath));
+            let absoluteQueryPath = path.join(workspacePath, localQueryPath);
 
             // Check the file exists
             if (!fs.existsSync(absoluteQueryPath)) {
                 throw new Error(getLocalPathDoesNotExist(configFile, localQueryPath));
             }
 
+            // Call this after checking file exists, because it'll fail if file doesn't exist
+            absoluteQueryPath = fs.realpathSync(absoluteQueryPath);
+
             // Check the local path doesn't jump outside the repo using '..' or symlinks
             if (!(absoluteQueryPath + path.sep).startsWith(workspacePath + path.sep)) {
                 throw new Error(getLocalPathOutsideOfRepository(configFile, localQueryPath));