Merge pull request #1 from ebmdatalab/use-service-account-for-bq-access

Use service account to access BQ
ebmdatalab · Sep 14, 2023 · feba78d · feba78d
2 parents d4afb71 + 84cb214
commit feba78d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+bq-service-account.json
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

diff --git a/Dockerfile b/Dockerfile
@@ -3,6 +3,9 @@ FROM ebmdatalab/datalab-jupyter:python3.8.1-2328e31e7391a127fe7184dcce38d581a17b
 # Set up jupyter environment
 ENV MAIN_PATH=/home/app/notebook
 
+# Set path to BQ service account credentials
+ENV EBMDATALAB_BQ_CREDENTIALS_PATH=/tmp/bq-service-account.json
+
 # Install pip requirements
 COPY requirements.txt /tmp/
 # Hack until this is fixed https://github.com/jazzband/pip-tools/issues/823
@@ -18,3 +21,7 @@ COPY config/kernel.json /tmp/kernel_with_custom_path/kernel.json
 RUN jupyter kernelspec install /tmp/kernel_with_custom_path/ --user --name="python3"
 
 CMD cd ${MAIN_PATH} && PYTHONPATH=${MAIN_PATH} jupyter lab --config=config/jupyter_notebook_config.py
+
+# Copy BQ service account credentials into container
+# We work around the credentials not existing in CI with the glob
+COPY bq-service-account.jso[n] /tmp/
diff --git a/notebooks/bnf_code_to_dmd.ipynb b/notebooks/bnf_code_to_dmd.ipynb
diff --git a/requirements.txt b/requirements.txt
@@ -19,7 +19,7 @@ cycler==0.10.0            # via matplotlib
 decorator==4.4.1          # via ipython, traitlets
 defusedxml==0.6.0         # via nbconvert
 descartes==1.1.0          # via ebmdatalab
-ebmdatalab==0.0.21        # via -r requirements.in
+ebmdatalab==0.0.29        # via -r requirements.in
 entrypoints==0.3          # via nbconvert
 fiona==1.8.13             # via geopandas
 geopandas==0.6.3          # via ebmdatalab