Log git commit in GAE config (#304)

.gitignore

@@ -6,6 +6,7 @@ dataset_config/1000_genomes/deploy.json
 dataset_config/1000_genomes/private-key.json
 
 api/app.yaml
+ui/app.yaml
 
 # For some reason these are created when deploying to GKE on Mac
 *.yaml-e

api/app.yaml.templ

@@ -7,3 +7,4 @@ env_variables:
   PATH_PREFIX: /api
   ELASTICSEARCH_URL: http://MY_ELASTICSEARCH_URL:9200/
   DATASET_CONFIG_DIR: dataset_config/MY_DATASET
+  GIT_COMMIT: MY_GIT_COMMIT

deploy/README.md

@@ -18,11 +18,11 @@
 
 ### Deploy the UI Server
 
-- Deploy:
-  ```
-  gcloud config set project PROJECT_ID
-  cd ui && gcloud app deploy --quiet
-  ```
+- From project root run `deploy/deploy-ui.sh MY_DATASET`, where `MY_DATASET` is
+  the name of the config directory in `dataset_config`.
+  Note: App Engine deployment is
+  slow and can take up 10 minutes. When `deploy/deploy-ui.sh` returns, that means
+  deployment has completed.
 
 ### Enable Access Control
 

deploy/deploy-api.sh

@@ -46,8 +46,10 @@ gcloud container clusters get-credentials elasticsearch-cluster --zone ${gke_clu
 
 # Create api/app.yml from api/app.yml.templ
 elasticsearch_url=$(kubectl get svc elasticsearch | grep elasticsearch | awk '{print $4}')
+git_commit=$(git rev-parse HEAD)
 sed -e "s/MY_DATASET/${dataset}/" api/app.yaml.templ > api/app.yaml
 sed -i -e "s/MY_ELASTICSEARCH_URL/${elasticsearch_url}/" api/app.yaml
+sed -i -e "s/MY_GIT_COMMIT/${git_commit}/" api/app.yaml
 
 # Temporarily copy api/Dockerfile, api/app.yaml to project root.
 # Unlike docker-compose, App Engine Flexible requires that docker build context

deploy/deploy-ui.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Deploy UI Server on GCP.
+#
+# gcloud must be installed before running this script.
+
+set -o errexit
+set -o nounset
+
+if (( $# != 1 ))
+then
+  echo "Usage: deploy/deploy-ui.sh <dataset>"
+  echo "  where <dataset> is the name of a directory in dataset_config/"
+  echo "Run this script from project root"
+  exit 1
+fi
+
+dataset=$1
+project_id=$(jq --raw-output '.project_id' dataset_config/${dataset}/deploy.json)
+
+bold=$(tput bold)
+normal=$(tput sgr0)
+echo "Deploying UI server for ${bold}dataset ${dataset}${normal} to ${bold}project ${project_id}${normal}"
+echo
+
+# Initialize gcloud command
+gcloud config set project ${project_id}
+
+# Create ui/app.yml from ui/app.yml.templ
+git_commit=$(git rev-parse HEAD)
+sed -e "s/MY_GIT_COMMIT/${git_commit}/" ui/app.yaml.templ > ui/app.yaml
+
+# Deploy App Engine api service
+cd ui
+gcloud app deploy --quiet

ui/app.yaml.templ

@@ -0,0 +1,5 @@
+runtime: custom
+env: flex
+
+env_variables:
+  GIT_COMMIT: MY_GIT_COMMIT