Merge pull request #22 from aktsk/use-BQNOTIFY_PROJECT-environment-va…

…riable Use BQNOTIFY_PROJECT environment variable instead of the one defined in config.yaml
aktsk · Jun 30, 2020 · 9a503b7 · 9a503b7
2 parents a5c44c1 + 6a4d4e1
commit 9a503b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/example/cloud-functions/README.md b/example/cloud-functions/README.md
@@ -10,7 +10,7 @@ $ gcloud functions deploy BqNotify \
     --runtime go113 \
     --trigger-topic bqnotify \
     --set-env-vars SLACK_WEBHOOK_URL=$SLACK_WEBHOOK_URL \
-    --set-env-vars GCP_PROJECT=mizzy-270104 # GCP_PRJOECT environment variable is not set on go1.13 runtime automatically
+    --set-env-vars BQNOTIFY_PROJECT=mizzy-270104
 
 $ gcloud scheduler jobs create pubsub bqnotify \
   --message-body {} \

diff --git a/example/cloud-functions/config.yaml b/example/cloud-functions/config.yaml
@@ -1,5 +1,5 @@
-# If project is not defined, bqnotify uses the value of GCP_PROJECT
-# environment variable
+# If project is not defined, bqnotify uses the value of BQNOTIFY_PROJECT
+# or GCP_PROJECT environment variable
 project: mizzy-270104
 queries:
 - sql: |-

diff --git a/lib/config/config.go b/lib/config/config.go
@@ -34,6 +34,10 @@ func Parse(file string) (*Config, error) {
 		return nil, err
 	}
 
+	if conf.Project == "" {
+		conf.Project = os.Getenv("BQNOTIFY_PROJECT")
+	}
+
 	if conf.Project == "" {
 		conf.Project = os.Getenv("GCP_PROJECT")
 	}