From fa089f296df810801c2c9e95437ef99961d3325f Mon Sep 17 00:00:00 2001
From: Kieren Evans <kevans@inviqa.com>
Date: Wed, 19 Aug 2020 11:02:16 +0300
Subject: [PATCH 1/3] Fix quoting of commit message in 'ws app publish chart'

---
 src/_base/harness/config/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_base/harness/config/pipeline.yml b/src/_base/harness/config/pipeline.yml
index 0761c2cd0..b23553b92 100644
--- a/src/_base/harness/config/pipeline.yml
+++ b/src/_base/harness/config/pipeline.yml
@@ -50,7 +50,7 @@ command('app publish chart <release> <message>'):
 
     export GIT_SSH_COMMAND='ssh -i ../id_rsa -o "IdentitiesOnly yes" -F /dev/null -o StrictHostKeyChecking=no'
     run git -C ./build-artifacts-repository add .
-    run git -C ./build-artifacts-repository commit --allow-empty -m "${MESSAGE}"
+    run git -C ./build-artifacts-repository commit --allow-empty -m "'${MESSAGE}'"
     run git -C ./build-artifacts-repository push origin master
 
 command('app deploy <environment>'):

From 1638e46e3906669dfab65c37f567c9e9523463bb Mon Sep 17 00:00:00 2001
From: Kieren Evans <kevans@inviqa.com>
Date: Wed, 19 Aug 2020 11:02:44 +0300
Subject: [PATCH 2/3] Quote variables

---
 src/_base/harness/config/pipeline.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/_base/harness/config/pipeline.yml b/src/_base/harness/config/pipeline.yml
index b23553b92..5d5706b4e 100644
--- a/src/_base/harness/config/pipeline.yml
+++ b/src/_base/harness/config/pipeline.yml
@@ -5,7 +5,7 @@ command('app build'):
   exec: |
     #!bash(workspace:/)|@
     ws external-images pull
-    
+
     # dependency ordered build
     passthru docker-compose build console
     passthru docker-compose build php-fpm nginx
@@ -42,11 +42,11 @@ command('app publish chart <release> <message>'):
 
     export GIT_SSH_COMMAND='ssh -i ./id_rsa -o "IdentitiesOnly yes" -F /dev/null -o StrictHostKeyChecking=no'
 
-    run git clone $REPOSITORY ./build-artifacts-repository
+    run git clone "$REPOSITORY" ./build-artifacts-repository
     run git -C ./build-artifacts-repository config user.email "${USER_EMAIL}"
 
     run mkdir -p $ARTIFACTS_PATH
-    run rsync --exclude='*.twig' --exclude='_twig' --delete -a .my127ws/helm/app/ ${ARTIFACTS_PATH}/
+    run rsync --exclude='*.twig' --exclude='_twig' --delete -a .my127ws/helm/app/ "${ARTIFACTS_PATH}/"
 
     export GIT_SSH_COMMAND='ssh -i ../id_rsa -o "IdentitiesOnly yes" -F /dev/null -o StrictHostKeyChecking=no'
     run git -C ./build-artifacts-repository add .
@@ -63,12 +63,12 @@ command('app deploy <environment>'):
     #!bash(harness:/helm)|=
     set -o pipefail
     cd "${ENVIRONMENT}"
-    doctl -t $DO_ACCESS_TOKEN kubernetes cluster kubeconfig show $CLUSTER > kubectl.config.yaml
+    doctl -t "$DO_ACCESS_TOKEN" kubernetes cluster kubeconfig show "$CLUSTER" > kubectl.config.yaml
     if helm version --short --client | grep '^Client: v2' >/dev/null 2>&1; then
       passthru helm init --client-only
     fi
     passthru helm dependency build
-    passthru helm --kubeconfig=$PWD/kubectl.config.yaml upgrade --wait --atomic --install --timeout "${TIMEOUT}" --namespace "${NAMESPACE}" "${NAMESPACE}" ./
+    passthru helm --kubeconfig="${PWD}/kubectl.config.yaml" upgrade --wait --atomic --install --timeout "${TIMEOUT}" --namespace "${NAMESPACE}" "${NAMESPACE}" ./
 
 command('helm template <chart-path>'):
   env:

From 693b6876fa79b8d8369fabec7a562cbc7ad1a5dd Mon Sep 17 00:00:00 2001
From: Kieren Evans <kierenevans@users.noreply.github.com>
Date: Wed, 19 Aug 2020 11:44:24 +0300
Subject: [PATCH 3/3] Update src/_base/harness/config/pipeline.yml

Co-authored-by: andytson-inviqa <andytson-inviqa@users.noreply.github.com>
---
 src/_base/harness/config/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_base/harness/config/pipeline.yml b/src/_base/harness/config/pipeline.yml
index 5d5706b4e..adb57099d 100644
--- a/src/_base/harness/config/pipeline.yml
+++ b/src/_base/harness/config/pipeline.yml
@@ -50,7 +50,7 @@ command('app publish chart <release> <message>'):
 
     export GIT_SSH_COMMAND='ssh -i ../id_rsa -o "IdentitiesOnly yes" -F /dev/null -o StrictHostKeyChecking=no'
     run git -C ./build-artifacts-repository add .
-    run git -C ./build-artifacts-repository commit --allow-empty -m "'${MESSAGE}'"
+    run "git -C ./build-artifacts-repository commit --allow-empty -m '${MESSAGE}'"
     run git -C ./build-artifacts-repository push origin master
 
 command('app deploy <environment>'):