From 8f94d11c8155a3c7a7243dd96e2393eaf222c053 Mon Sep 17 00:00:00 2001
From: Erik van Egmond <e.vanegmond@vwt.digital>
Date: Wed, 11 Nov 2020 15:57:09 +0100
Subject: [PATCH] DAN-726 Use python version 3.7

---
 cloudbuild.yaml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 4197b6f..f540d2f 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -46,20 +46,24 @@ steps:
         source "$$VENV"/bin/activate
         twine check dist/*
 
-  # Publish package when tagged
+  - name: gcr.io/cloud-builders/gcloud
+    entrypoint: bash
+    args:
+      - -c
+      - |
+        echo "user=$(gcloud secrets versions access latest --secret="$PROJECT_ID"-username)" >> pypi.txt
+        echo "password=$(gcloud secrets versions access latest --secret="$PROJECT_ID"-password)" >> pypi.txt
+        echo "repo=$(gcloud secrets versions access latest --secret="$PROJECT_ID"-repo)" >> pypi.txt
+
+# Publish package when tagged
   - name: python:3.7.5-slim
     entrypoint: bash
     args:
       - -c
       - |
+        source pypi.txt
         if [[ -n "$TAG_NAME" ]]
         then
-
-            USERNAME=$(gcloud secrets versions access latest --secret="$PROJECT_ID"-username)
-            PASSWORD=$(gcloud secrets versions access latest --secret="$PROJECT_ID"-password)
-            REPO=$(gcloud secrets versions access latest --secret="$PROJECT_ID"-repo)
-
             source "$$VENV"/bin/activate
-            twine upload -r "$$REPO" dist/* -u "$$USERNAME" -p "$$PASSWORD"
-
+            twine upload -r "$${url}" dist/* -u "$${user}" -p "$${password}"
         fi