Merge pull request #3 from intersystems-community/add-custom-env-vars

Author: daimor

.github/workflows/deployment.yml

@@ -18,6 +18,8 @@ on:
     secrets:
       SERVICE_ACCOUNT_KEY:
         required: true
+      CUSTOM_VARS_LIST:
+        required: false
   workflow_dispatch:
     inputs:
       repository:
@@ -90,11 +92,16 @@ jobs:
       run: |
         docker buildx build -t ${REGION}-docker.pkg.dev/${PROJECT_ID}/community/${IMAGE_NAME}:${GITHUB_SHA} --push .
 
+    # Setting verbosity to debug leads to printing custom variables in the pipeline logs.
+    # It might be possible to replace 'set-env-vars' to 'set-secrets' but it requires additional Service Account permissions.
     - name: Deploy to Cloud Run
       run: |
         echo "[INFO] Set google project..."
         gcloud config set project ${PROJECT_ID}
 
+        echo "[INFO] Escaping custom variables..."
+        export CUSTOM_VARS_LIST_ESCAPED=$(echo "${{ secrets.CUSTOM_VARS_LIST }}" | sed -E 's/"/\\"/g')
+
         echo "[INFO] Deploy service..."
         gcloud run deploy ${SERVICE}                \
           --platform gke                            \
@@ -105,8 +112,8 @@ jobs:
           --min-instances 1                         \
           --memory ${SERVICE_MEMORY:-512Mi}         \
           --timeout 300                             \
-          --verbosity debug                         \
-          --set-env-vars GITHUB_REPO=${GITHUB_REPO} \
+          --verbosity info                          \
+          --set-env-vars GITHUB_REPO=${GITHUB_REPO}${CUSTOM_VARS_LIST_ESCAPED:+,${CUSTOM_VARS_LIST_ESCAPED}} \
           --image ${REGION}-docker.pkg.dev/${PROJECT_ID}/community/${IMAGE_NAME}:${GITHUB_SHA}
 
         echo "[INFO] Create domain mappings..."

README.md

@@ -21,6 +21,11 @@ jobs:
     uses: intersystems-community/demo-deployment/.github/workflows/deployment.yml@master
     with:
       name: <name-of-demo>
+      ## Optional
+      # memory: 1Gi
+      # port: 8081
     secrets:
       SERVICE_ACCOUNT_KEY: ${{ secrets.SERVICE_ACCOUNT_KEY }}
+      ## Optional
+      # CUSTOM_VARS_LIST: "var1=${{ secrets.CUSTOM_VAR1 }},var2=value2,..."
 ```