functions/slack: use env vars + consistent var naming (GoogleCloudPlatform#3564)

Ace Nassri · web-flow · commit 8a5bd203d4b7 · 2020-04-28T16:52:06.000-07:00
diff --git a/functions/slack/main.py b/functions/slack/main.py
@@ -14,21 +14,16 @@
 # [START functions_slack_setup]
 import hashlib
 import hmac
-import json
 import os
 
-import googleapiclient
+import googleapiclient.discovery
 from flask import jsonify
 
-with open('config.json', 'r') as f:
-    data = f.read()
-config = json.loads(data)
-
 
 kgsearch = googleapiclient.discovery.build(
     'kgsearch',
     'v1',
-    developerKey=os.environ.get('API_KEY') or config.get('KG_API_KEY'),
+    developerKey=os.environ['KG_API_KEY'],
     cache_discovery=False)
 # [END functions_slack_setup]
 
@@ -41,7 +36,7 @@ def verify_signature(request):
 
     req = str.encode('v0:{}:'.format(timestamp)) + request.get_data()
     request_digest = hmac.new(
-        str.encode(config['SLACK_SECRET']),
+        str.encode(os.environ['SLACK_SECRET']),
         req, hashlib.sha256
     ).hexdigest()
     request_hash = 'v0={}'.format(request_digest)
diff --git a/functions/slack/main_test.py b/functions/slack/main_test.py
@@ -13,20 +13,17 @@
 
 import json
 
-import googleapiclient
+import googleapiclient.discovery
 import mock
 import os
 import pytest
 
 import main
 
-with open('config.json', 'r') as f:
-    data = f.read()
-config = json.loads(data)
 
-
-kg_search = googleapiclient.discovery.build('kgsearch', 'v1',
-                                      developerKey=os.environ['API_KEY'])
+kg_search = googleapiclient.discovery.build(
+    'kgsearch', 'v1',
+    developerKey=os.environ['KG_API_KEY'])
 example_response = kg_search.entities().search(query='lion', limit=1).execute()
 
 
@@ -53,7 +50,9 @@ def test_verify_signature_token_incorrect(self):
 
     def test_verify_web_hook_valid_request(self):
         request = Request()
-        request.headers = {'X-Slack-Signature': os.environ['SLACK_TEST_SIGNATURE']}
+        request.headers = {
+            'X-Slack-Signature': os.environ['SLACK_TEST_SIGNATURE']
+        }
         main.verify_signature(request)
 
     def test_format_slack_message(self):
diff --git a/testing/secrets.tar.enc b/testing/secrets.tar.enc
