Use correct API key when fetching from Iodide

mozilla · Jul 17, 2019 · bdcac43 · bdcac43 · jezdez · Jul 30, 2019
1 parent 13d4670
commit bdcac43
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2019.7.4
+--------
+
+:date: 2019-07-17
+
+* Use the correct API key to fetch query result JSON from Iodide
+
 2019.7.3
 --------
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,7 +23,6 @@ services:
       REDASH_IODIDE_URL:
       REDASH_IODIDE_NOTEBOOK_API_URL:
       REDASH_IODIDE_AUTH_TOKEN:
-      REDASH_IODIDE_DEFAULT_API_KEY:
   worker:
     image: mozilla/redash:rc
     command: scheduler

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
     long_description=readme,
     long_description_content_type="text/x-rst",
     name="redash-stmo",
-    version="2019.7.3",
+    version="2019.7.4",
     description="Extensions to Redash by Mozilla",
     python_requires="==2.*,>=2.7.0",
     project_urls={"homepage": "https://github.com/mozilla/redash-stmo"},

diff --git a/src/redash_stmo/__init__.py b/src/redash_stmo/__init__.py
@@ -3,4 +3,4 @@
 # file, you can obtain one at http://mozilla.org/MPL/2.0/.
 """Extensions to Redash by Mozilla"""
 
-__version__ = "2019.7.3"
+__version__ = "2019.7.4"
diff --git a/src/redash_stmo/integrations/iodide/extension.py b/src/redash_stmo/integrations/iodide/extension.py
@@ -35,7 +35,7 @@ def post(self, query_id):
                 "redash_url": base_href(),
                 "query_id": query_id,
                 "title": query.name,
-                "api_key": settings.IODIDE_DEFAULT_API_KEY,
+                "api_key": query.api_key,
             }
             rendered_template = render_template_string(source, **context)
         headers = {

diff --git a/src/redash_stmo/settings.py b/src/redash_stmo/settings.py
@@ -28,6 +28,3 @@
 
 # The auth token that this extension uses to create new Iodide notebooks
 IODIDE_AUTH_TOKEN = os.environ.get("REDASH_IODIDE_AUTH_TOKEN", "")
-
-# The API key that Iodide uses to fetch data from Redash
-IODIDE_DEFAULT_API_KEY = os.environ.get("REDASH_IODIDE_DEFAULT_API_KEY", "")