From 1ad90b6739f9e9fc06804364d98576590c5cf2b1 Mon Sep 17 00:00:00 2001
From: Max Schaefer <max@semmle.com>
Date: Wed, 15 Jan 2020 14:01:30 +0000
Subject: [PATCH] Teach extractor about CodeQL environment variables.

---
 codeql-extractor.yml               | 3 ---
 extractor/srcarchive/srcarchive.go | 7 +++++--
 extractor/trap/trapwriter.go       | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/codeql-extractor.yml b/codeql-extractor.yml
index 3c81755de5c..b258b193f56 100644
--- a/codeql-extractor.yml
+++ b/codeql-extractor.yml
@@ -6,9 +6,6 @@ pull_request_triggers:
   - "**/glide.yaml"
   - "**/Gopkg.toml"
 column_kind: "utf8"
-extra_env_vars:
-  SOURCE_ARCHIVE: ${env.CODEQL_EXTRACTOR_GO_SOURCE_ARCHIVE_DIR}
-  TRAP_FOLDER: ${env.CODEQL_EXTRACTOR_GO_TRAP_DIR}
 file_types:
   - name: go
     display_name: Go
diff --git a/extractor/srcarchive/srcarchive.go b/extractor/srcarchive/srcarchive.go
index 84eef29d29e..ee9aea43064 100644
--- a/extractor/srcarchive/srcarchive.go
+++ b/extractor/srcarchive/srcarchive.go
@@ -55,9 +55,12 @@ func Add(path string) error {
 }
 
 func srcArchive() (string, error) {
-	srcArchive := os.Getenv("SOURCE_ARCHIVE")
+	srcArchive := os.Getenv("CODEQL_EXTRACTOR_GO_SOURCE_ARCHIVE_DIR")
 	if srcArchive == "" {
-		return "", errors.New("environment variable SOURCE_ARCHIVE not set")
+		srcArchive = os.Getenv("SOURCE_ARCHIVE")
+	}
+	if srcArchive == "" {
+		return "", errors.New("environment variable CODEQL_EXTRACTOR_GO_SOURCE_ARCHIVE_DIR not set")
 	}
 	err := os.MkdirAll(srcArchive, 0755)
 	if err != nil {
diff --git a/extractor/trap/trapwriter.go b/extractor/trap/trapwriter.go
index 6df789f02c2..fbf37f897ee 100644
--- a/extractor/trap/trapwriter.go
+++ b/extractor/trap/trapwriter.go
@@ -51,9 +51,12 @@ func NewWriter(path string, pkg *packages.Package) (*Writer, error) {
 }
 
 func trapFolder() (string, error) {
-	trapFolder := os.Getenv("TRAP_FOLDER")
+	trapFolder := os.Getenv("CODEQL_EXTRACTOR_GO_TRAP_DIR")
 	if trapFolder == "" {
-		return "", errors.New("environment variable TRAP_FOLDER not set")
+		trapFolder = os.Getenv("TRAP_FOLDER")
+	}
+	if trapFolder == "" {
+		return "", errors.New("environment variable CODEQL_EXTRACTOR_GO_TRAP_DIR not set")
 	}
 	err := os.MkdirAll(trapFolder, 0755)
 	if err != nil {