remove CODEQL_ACTION_DATABASE_DIR

github · Aug 7, 2020 · 5b35de6 · 5b35de6
1 parent 8608105
commit 5b35de6
Showing 13 changed files with 23 additions and 16 deletions.
diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml
@@ -22,7 +22,7 @@ jobs:
       env:
         TEST_MODE: true
     - run: |
-        cd "$CODEQL_ACTION_DATABASE_DIR"
+        cd "$RUNNER_TEMP/codeql_databases"
         # List all directories as there will be precisely one directory per database
         # but there may be other files in this directory such as query suites.
         if [ "$(ls -d */ | wc -l)" != 6 ] || \

diff --git a/lib/finalize-db.js b/lib/finalize-db.js
diff --git a/lib/finalize-db.js.map b/lib/finalize-db.js.map
diff --git a/lib/setup-tracer.js b/lib/setup-tracer.js
diff --git a/lib/setup-tracer.js.map b/lib/setup-tracer.js.map
diff --git a/lib/shared-environment.js b/lib/shared-environment.js
diff --git a/lib/shared-environment.js.map b/lib/shared-environment.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/finalize-db.ts b/src/finalize-db.ts
@@ -135,7 +135,7 @@ async function run() {
     core.exportVariable(sharedEnv.ODASA_TRACER_CONFIGURATION, '');
     delete process.env[sharedEnv.ODASA_TRACER_CONFIGURATION];
 
-    const databaseFolder = util.getRequiredEnvParam(sharedEnv.CODEQL_ACTION_DATABASE_DIR);
+    const databaseFolder = util.getCodeQLDatabasesDir();
 
     const sarifFolder = core.getInput('output');
     await io.mkdirP(sarifFolder);

diff --git a/src/setup-tracer.ts b/src/setup-tracer.ts
@@ -215,7 +215,7 @@ async function run() {
     const codeqlRam = process.env['CODEQL_RAM'] || '6500';
     core.exportVariable('CODEQL_RAM', codeqlRam);
 
-    const databaseFolder = path.resolve(util.getRequiredEnvParam('RUNNER_TEMP'), 'codeql_databases');
+    const databaseFolder = util.getCodeQLDatabasesDir();
     await io.mkdirP(databaseFolder);
 
     let tracedLanguages: { [key: string]: TracerConfig } = {};
@@ -264,9 +264,6 @@ async function run() {
     core.exportVariable(sharedEnv.CODEQL_ACTION_SCANNED_LANGUAGES, scannedLanguages.join(','));
     core.exportVariable(sharedEnv.CODEQL_ACTION_TRACED_LANGUAGES, tracedLanguageKeys.join(','));
 
-    // TODO: make this a "private" environment variable of the action
-    core.exportVariable(sharedEnv.CODEQL_ACTION_DATABASE_DIR, databaseFolder);
-
   } catch (error) {
     core.setFailed(error.message);
     console.log(error);

diff --git a/src/shared-environment.ts b/src/shared-environment.ts
@@ -1,4 +1,3 @@
-export const CODEQL_ACTION_DATABASE_DIR = 'CODEQL_ACTION_DATABASE_DIR';
 export const CODEQL_ACTION_ANALYSIS_KEY = 'CODEQL_ACTION_ANALYSIS_KEY';
 export const ODASA_TRACER_CONFIGURATION = 'ODASA_TRACER_CONFIGURATION';
 export const CODEQL_ACTION_SCANNED_LANGUAGES = 'CODEQL_ACTION_SCANNED_LANGUAGES';

diff --git a/src/util.ts b/src/util.ts
@@ -413,3 +413,10 @@ export function getThreadsFlag(): string {
   }
   return `--threads=${numThreads}`;
 }
+
+/**
+ * Get the directory where CodeQL databases should be placed.
+ */
+export function getCodeQLDatabasesDir() {
+  return path.resolve(getRequiredEnvParam('RUNNER_TEMP'), 'codeql_databases');
+}