s/instance/conn

builders/cloud-sql-exec

@@ -18,8 +18,8 @@ set -eEuo pipefail
 
 DB_PORT=${DB_PORT:-5432}
 
-if [ -z "${DB_INSTANCE:-}" ]; then
-  echo "missing DB_INSTANCE"
+if [ -z "${DB_CONN:-}" ]; then
+  echo "missing DB_CONN"
   exit 1
 fi
 
@@ -31,7 +31,7 @@ function cleanup {
 }
 
 echo "==> Staring Cloud SQL Proxy"
-/cloud_sql_proxy -instances=${DB_INSTANCE}=tcp:${DB_PORT} &
+/cloud_sql_proxy -instances=${DB_CONN}=tcp:${DB_PORT} &
 CLOUD_SQL_PID=$!
 trap cleanup EXIT
 

builders/migrate.yaml

@@ -22,7 +22,7 @@ substitutions:
   _DB_DEBUG:
   _DB_ENCRYPTION_KEY:
   _DB_HOST:
-  _DB_INSTANCE:
+  _DB_CONN:
   _DB_NAME:
   _DB_PASSWORD:
   _DB_PORT:
@@ -43,7 +43,7 @@ steps:
   - 'DB_DEBUG=${_DB_DEBUG}'
   - 'DB_ENCRYPTION_KEY=${_DB_ENCRYPTION_KEY}'
   - 'DB_HOST=${_DB_HOST}'
-  - 'DB_INSTANCE=${_DB_INSTANCE}'
+  - 'DB_CONN=${_DB_CONN}'
   - 'DB_NAME=${_DB_NAME}'
   - 'DB_PASSWORD=${_DB_PASSWORD}'
   - 'DB_PORT=${_DB_PORT}'

scripts/migrate

@@ -26,10 +26,10 @@ fi
 SUBS="_TAG=${TAG}"
 SUBS="${SUBS},_DB_APIKEY_DATABASE_KEY=${DB_APIKEY_DATABASE_KEY}"
 SUBS="${SUBS},_DB_APIKEY_SIGNATURE_KEY=${DB_APIKEY_SIGNATURE_KEY}"
+SUBS="${SUBS},_DB_CONN=${DB_CONN}"
 SUBS="${SUBS},_DB_DEBUG=${DB_DEBUG:-"true"}"
 SUBS="${SUBS},_DB_ENCRYPTION_KEY=${DB_ENCRYPTION_KEY}"
 SUBS="${SUBS},_DB_HOST=${DB_HOST:-"127.0.0.1"}"
-SUBS="${SUBS},_DB_INSTANCE=${DB_INSTANCE}"
 SUBS="${SUBS},_DB_NAME=${DB_NAME:-"verification"}"
 SUBS="${SUBS},_DB_PASSWORD=${DB_PASSWORD}"
 SUBS="${SUBS},_DB_PORT=${DB_PORT:-"5432"}"