@catladder/pipeline 4.7.0 → 4.7.1

package/dist/variables/VariableValueContainingReferences.d.ts

@@ -16,6 +16,12 @@ type MaybeArray<T> = T | T[];
 export declare class VariableValueContainingReferences {
   parts: VariableValuePart[];
   constructor(parts: MaybeArray<VariableValuePart | VariableValueContainingReferences>);
+  /**
+   * concats values to this one and returns a new VariableValueContainingReferences.
+   * mirrors String.prototype.concat / BashExpression.concat so a VariableValue
+   * can be extended regardless of its concrete type
+   */
+  concat(...values: Array<VariableValuePart | VariableValueContainingReferences>): VariableValueContainingReferences;
   toString(options?: EscapeOptions): string;
 }
 export declare const createVariableValueContainingReferencesFromString: (value: string, options: {

package/dist/variables/VariableValueContainingReferences.js

@@ -22,6 +22,15 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -55,6 +64,18 @@ var VariableValueContainingReferences = /** @class */function () {
       return part instanceof VariableValueContainingReferences ? part.parts : part === "" ? [] : [part];
     });
   }
+  /**
+   * concats values to this one and returns a new VariableValueContainingReferences.
+   * mirrors String.prototype.concat / BashExpression.concat so a VariableValue
+   * can be extended regardless of its concrete type
+   */
+  VariableValueContainingReferences.prototype.concat = function () {
+    var values = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+      values[_i] = arguments[_i];
+    }
+    return new VariableValueContainingReferences(__spreadArray(__spreadArray([], __read(this.parts), false), __read(values), false));
+  };
   VariableValueContainingReferences.prototype.toString = function (options) {
     if (options === void 0) {
       options = {

package/dist/variables/resolveAllReferences.d.ts

@@ -1,3 +1,2 @@
 import type { VariableValue } from "./VariableValue";
-import type { VariableValueContainingReferences } from "./VariableValueContainingReferences";
-export declare const resolveAllReferences: (values: Record<string, VariableValueContainingReferences>, getEnvVars: (componentName: string) => Promise<Record<string, VariableValue | null | undefined>>) => Promise<Record<string, VariableValueContainingReferences>>;
+export declare const resolveAllReferences: <T extends Record<string, VariableValue | null | undefined>>(values: T, getEnvVars: (componentName: string) => Promise<Record<string, VariableValue | null | undefined>>) => Promise<T>;

package/dist/variables/resolveAllReferences.js

@@ -143,6 +143,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.resolveAllReferences = void 0;
 var VariableValueContainingReferences_1 = require("./VariableValueContainingReferences");
 var resolveAllReferencesOnce_1 = require("./resolveAllReferencesOnce");
+var hasUnresolvedReferences = function (value) {
+  return value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences && value.parts.some(function (part) {
+    return part instanceof VariableValueContainingReferences_1.VariableReference;
+  });
+};
 var resolveAllReferences = function (values, getEnvVars) {
   return __awaiter(void 0, void 0, void 0, function () {
     var result, i, replaced, unresolved;
@@ -153,11 +158,7 @@ var resolveAllReferences = function (values, getEnvVars) {
           i = 0;
           _a.label = 1;
         case 1:
-          if (!Object.values(result).some(function (value) {
-            return value.parts.some(function (part) {
-              return part instanceof VariableValueContainingReferences_1.VariableReference;
-            });
-          })) return [3 /*break*/, 3];
+          if (!Object.values(result).some(hasUnresolvedReferences)) return [3 /*break*/, 3];
           return [4 /*yield*/, (0, resolveAllReferencesOnce_1.resolveAllReferencesOnce)(result, getEnvVars)];
         case 2:
           replaced = _a.sent();
@@ -168,9 +169,7 @@ var resolveAllReferences = function (values, getEnvVars) {
               var _b = __read(_a, 2),
                 key = _b[0],
                 value = _b[1];
-              return value.parts.some(function (part) {
-                return part instanceof VariableValueContainingReferences_1.VariableReference;
-              });
+              return hasUnresolvedReferences(value);
             });
             throw new Error("Infinite loop detected in these variables: " + unresolved.map(function (_a) {
               var _b = __read(_a, 2),

package/dist/variables/resolveAllReferencesOnce.d.ts

@@ -1,5 +1,2 @@
 import type { VariableValue } from "./VariableValue";
-import type { VariableValueContainingReferences } from "./VariableValueContainingReferences";
-export declare const resolveAllReferencesOnce: (values: Record<string, VariableValueContainingReferences>, getEnvVars: (componentName: string) => Promise<Record<string, VariableValue | undefined | null>>) => Promise<{
-  [k: string]: VariableValueContainingReferences;
-}>;
+export declare const resolveAllReferencesOnce: <T extends Record<string, VariableValue | null | undefined>>(values: T, getEnvVars: (componentName: string) => Promise<Record<string, VariableValue | undefined | null>>) => Promise<T>;

package/dist/variables/resolveAllReferencesOnce.js

@@ -150,9 +150,9 @@ var resolveAllReferencesOnce = function (values, getEnvVars) {
       switch (_c.label) {
         case 0:
           allReferences = Object.values(values).flatMap(function (value) {
-            return value === null || value === void 0 ? void 0 : value.parts.filter(function (part) {
+            return value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences ? value.parts.filter(function (part) {
               return part instanceof VariableValueContainingReferences_1.VariableReference;
-            });
+            }) : [];
           });
           allComponentsUnique = Array.from(new Set(allReferences.map(function (reference) {
             return reference.componentName;
@@ -178,7 +178,7 @@ var resolveAllReferencesOnce = function (values, getEnvVars) {
             var _b = __read(_a, 2),
               key = _b[0],
               value = _b[1];
-            return [key, value !== null && value !== undefined ? (0, resolveReferencesOnce_1.resolveReferencesOnce)(value, function (_a) {
+            return [key, value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences ? (0, resolveReferencesOnce_1.resolveReferencesOnce)(value, function (_a) {
               var componentName = _a.componentName,
                 variableName = _a.variableName;
               return allEnvVarsInComponents[componentName][variableName];

package/examples/__snapshots__/cloud-run-with-sql-multiple-dbs.test.ts.snap

@@ -252,8 +252,8 @@ before_script:
       DB_NAME=pan-test-app-dev-db1
       DB_USER=my-user
       DB_PASSWORD=$(printf %s "$CL_dev_db1_DB_PASSWORD" | escapeForDotEnv)
-      DATABASE_URL=postgresql://my-user:$CL_dev_db1_DB_PASSWORD@localhost/pan-test-app-dev-db1?host=/cloudsql/projectId:region:instancename
-      DATABASE_JDBC_URL=jdbc:postgresql:///pan-test-app-dev-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_dev_db1_DB_PASSWORD
+      DATABASE_URL=$(printf %s "postgresql://my-user:$CL_dev_db1_DB_PASSWORD@localhost/pan-test-app-dev-db1?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
+      DATABASE_JDBC_URL=$(printf %s "jdbc:postgresql:///pan-test-app-dev-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_dev_db1_DB_PASSWORD" | escapeForDotEnv)
       CLOUD_RUN_JOB_TRIGGER_URL_migrate=https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-db1-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-dev-db1
       DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
@@ -442,9 +442,9 @@ before_script:
       DB_PASSWORD: |-
         $(printf %s "$CL_dev_db1_DB_PASSWORD" | sed '1!s/^/  /')
       DATABASE_URL: |-
-        postgresql://my-user:$CL_dev_db1_DB_PASSWORD@localhost/pan-test-app-dev-db1?host=/cloudsql/projectId:region:instancename
+        postgresql://my-user:$(printf %s "$CL_dev_db1_DB_PASSWORD" | sed '1!s/^/  /')@localhost/pan-test-app-dev-db1?host=/cloudsql/projectId:region:instancename
       DATABASE_JDBC_URL: |-
-        jdbc:postgresql:///pan-test-app-dev-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_dev_db1_DB_PASSWORD
+        jdbc:postgresql:///pan-test-app-dev-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$(printf %s "$CL_dev_db1_DB_PASSWORD" | sed '1!s/^/  /')
       CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
         https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-db1-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
@@ -895,9 +895,9 @@ before_script:
       DB_PASSWORD: |-
         $(printf %s "$CL_review_db1_DB_PASSWORD" | sed '1!s/^/  /')
       DATABASE_URL: |-
-        $(printf %s "postgresql://my-user:$CL_review_db1_DB_PASSWORD@localhost/pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db1?host=/cloudsql/projectId:region:instancename" | sed '1!s/^/  /')
+        postgresql://my-user:$(printf %s "$CL_review_db1_DB_PASSWORD" | sed '1!s/^/  /')@localhost/$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db1" | sed '1!s/^/  /')?host=/cloudsql/projectId:region:instancename
       DATABASE_JDBC_URL: |-
-        $(printf %s "jdbc:postgresql:///pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_review_db1_DB_PASSWORD" | sed '1!s/^/  /')
+        jdbc:postgresql:///$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db1" | sed '1!s/^/  /')?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$(printf %s "$CL_review_db1_DB_PASSWORD" | sed '1!s/^/  /')
       CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
         https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db1" | awk '{print tolower($0)}')-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
@@ -1052,8 +1052,8 @@ before_script:
       DB_NAME=pan-test-app-stage-db1
       DB_USER=my-user
       DB_PASSWORD=$(printf %s "$CL_stage_db1_DB_PASSWORD" | escapeForDotEnv)
-      DATABASE_URL=postgresql://my-user:$CL_stage_db1_DB_PASSWORD@localhost/pan-test-app-stage-db1?host=/cloudsql/projectId:region:instancename
-      DATABASE_JDBC_URL=jdbc:postgresql:///pan-test-app-stage-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_stage_db1_DB_PASSWORD
+      DATABASE_URL=$(printf %s "postgresql://my-user:$CL_stage_db1_DB_PASSWORD@localhost/pan-test-app-stage-db1?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
+      DATABASE_JDBC_URL=$(printf %s "jdbc:postgresql:///pan-test-app-stage-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_stage_db1_DB_PASSWORD" | escapeForDotEnv)
       CLOUD_RUN_JOB_TRIGGER_URL_migrate=https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-db1-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-stage-db1
       DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
@@ -1242,9 +1242,9 @@ before_script:
       DB_PASSWORD: |-
         $(printf %s "$CL_stage_db1_DB_PASSWORD" | sed '1!s/^/  /')
       DATABASE_URL: |-
-        postgresql://my-user:$CL_stage_db1_DB_PASSWORD@localhost/pan-test-app-stage-db1?host=/cloudsql/projectId:region:instancename
+        postgresql://my-user:$(printf %s "$CL_stage_db1_DB_PASSWORD" | sed '1!s/^/  /')@localhost/pan-test-app-stage-db1?host=/cloudsql/projectId:region:instancename
       DATABASE_JDBC_URL: |-
-        jdbc:postgresql:///pan-test-app-stage-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_stage_db1_DB_PASSWORD
+        jdbc:postgresql:///pan-test-app-stage-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$(printf %s "$CL_stage_db1_DB_PASSWORD" | sed '1!s/^/  /')
       CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
         https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-db1-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
@@ -1383,8 +1383,8 @@ before_script:
       DB_NAME=pan-test-app-prod-db1
       DB_USER=my-user
       DB_PASSWORD=$(printf %s "$CL_prod_db1_DB_PASSWORD" | escapeForDotEnv)
-      DATABASE_URL=postgresql://my-user:$CL_prod_db1_DB_PASSWORD@localhost/pan-test-app-prod-db1?host=/cloudsql/projectId:region:instancename
-      DATABASE_JDBC_URL=jdbc:postgresql:///pan-test-app-prod-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_prod_db1_DB_PASSWORD
+      DATABASE_URL=$(printf %s "postgresql://my-user:$CL_prod_db1_DB_PASSWORD@localhost/pan-test-app-prod-db1?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
+      DATABASE_JDBC_URL=$(printf %s "jdbc:postgresql:///pan-test-app-prod-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_prod_db1_DB_PASSWORD" | escapeForDotEnv)
       CLOUD_RUN_JOB_TRIGGER_URL_migrate=https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-db1-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-prod-db1
       DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
@@ -1573,9 +1573,9 @@ before_script:
       DB_PASSWORD: |-
         $(printf %s "$CL_prod_db1_DB_PASSWORD" | sed '1!s/^/  /')
       DATABASE_URL: |-
-        postgresql://my-user:$CL_prod_db1_DB_PASSWORD@localhost/pan-test-app-prod-db1?host=/cloudsql/projectId:region:instancename
+        postgresql://my-user:$(printf %s "$CL_prod_db1_DB_PASSWORD" | sed '1!s/^/  /')@localhost/pan-test-app-prod-db1?host=/cloudsql/projectId:region:instancename
       DATABASE_JDBC_URL: |-
-        jdbc:postgresql:///pan-test-app-prod-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_prod_db1_DB_PASSWORD
+        jdbc:postgresql:///pan-test-app-prod-db1?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$(printf %s "$CL_prod_db1_DB_PASSWORD" | sed '1!s/^/  /')
       CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
         https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-db1-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
@@ -1815,8 +1815,8 @@ before_script:
       DB_NAME=pan-test-app-dev-db2
       DB_USER=my-user
       DB_PASSWORD=$(printf %s "$CL_dev_db2_DB_PASSWORD" | escapeForDotEnv)
-      DATABASE_URL=postgresql://my-user:$CL_dev_db2_DB_PASSWORD@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
-      DATABASE_JDBC_URL=jdbc:postgresql:///pan-test-app-dev-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_dev_db2_DB_PASSWORD
+      DATABASE_URL=$(printf %s "postgresql://my-user:$CL_dev_db2_DB_PASSWORD@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
+      DATABASE_JDBC_URL=$(printf %s "jdbc:postgresql:///pan-test-app-dev-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_dev_db2_DB_PASSWORD" | escapeForDotEnv)
       CLOUD_RUN_JOB_TRIGGER_URL_migrate=https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-db2-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-dev-db2
       DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
@@ -2005,9 +2005,9 @@ before_script:
       DB_PASSWORD: |-
         $(printf %s "$CL_dev_db2_DB_PASSWORD" | sed '1!s/^/  /')
       DATABASE_URL: |-
-        postgresql://my-user:$CL_dev_db2_DB_PASSWORD@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
+        postgresql://my-user:$(printf %s "$CL_dev_db2_DB_PASSWORD" | sed '1!s/^/  /')@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
       DATABASE_JDBC_URL: |-
-        jdbc:postgresql:///pan-test-app-dev-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_dev_db2_DB_PASSWORD
+        jdbc:postgresql:///pan-test-app-dev-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$(printf %s "$CL_dev_db2_DB_PASSWORD" | sed '1!s/^/  /')
       CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
         https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-db2-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
@@ -2458,9 +2458,9 @@ before_script:
       DB_PASSWORD: |-
         $(printf %s "$CL_review_db2_DB_PASSWORD" | sed '1!s/^/  /')
       DATABASE_URL: |-
-        $(printf %s "postgresql://my-user:$CL_review_db2_DB_PASSWORD@localhost/pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db2?host=/cloudsql/projectId:region:instancename" | sed '1!s/^/  /')
+        postgresql://my-user:$(printf %s "$CL_review_db2_DB_PASSWORD" | sed '1!s/^/  /')@localhost/$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db2" | sed '1!s/^/  /')?host=/cloudsql/projectId:region:instancename
       DATABASE_JDBC_URL: |-
-        $(printf %s "jdbc:postgresql:///pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_review_db2_DB_PASSWORD" | sed '1!s/^/  /')
+        jdbc:postgresql:///$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db2" | sed '1!s/^/  /')?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$(printf %s "$CL_review_db2_DB_PASSWORD" | sed '1!s/^/  /')
       CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
         https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db2" | awk '{print tolower($0)}')-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
@@ -2615,8 +2615,8 @@ before_script:
       DB_NAME=pan-test-app-stage-db2
       DB_USER=my-user
       DB_PASSWORD=$(printf %s "$CL_stage_db2_DB_PASSWORD" | escapeForDotEnv)
-      DATABASE_URL=postgresql://my-user:$CL_stage_db2_DB_PASSWORD@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
-      DATABASE_JDBC_URL=jdbc:postgresql:///pan-test-app-stage-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_stage_db2_DB_PASSWORD
+      DATABASE_URL=$(printf %s "postgresql://my-user:$CL_stage_db2_DB_PASSWORD@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
+      DATABASE_JDBC_URL=$(printf %s "jdbc:postgresql:///pan-test-app-stage-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_stage_db2_DB_PASSWORD" | escapeForDotEnv)
       CLOUD_RUN_JOB_TRIGGER_URL_migrate=https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-db2-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-stage-db2
       DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
@@ -2805,9 +2805,9 @@ before_script:
       DB_PASSWORD: |-
         $(printf %s "$CL_stage_db2_DB_PASSWORD" | sed '1!s/^/  /')
       DATABASE_URL: |-
-        postgresql://my-user:$CL_stage_db2_DB_PASSWORD@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
+        postgresql://my-user:$(printf %s "$CL_stage_db2_DB_PASSWORD" | sed '1!s/^/  /')@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
       DATABASE_JDBC_URL: |-
-        jdbc:postgresql:///pan-test-app-stage-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_stage_db2_DB_PASSWORD
+        jdbc:postgresql:///pan-test-app-stage-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$(printf %s "$CL_stage_db2_DB_PASSWORD" | sed '1!s/^/  /')
       CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
         https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-db2-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
@@ -2946,8 +2946,8 @@ before_script:
       DB_NAME=pan-test-app-prod-db2
       DB_USER=my-user
       DB_PASSWORD=$(printf %s "$CL_prod_db2_DB_PASSWORD" | escapeForDotEnv)
-      DATABASE_URL=postgresql://my-user:$CL_prod_db2_DB_PASSWORD@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
-      DATABASE_JDBC_URL=jdbc:postgresql:///pan-test-app-prod-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_prod_db2_DB_PASSWORD
+      DATABASE_URL=$(printf %s "postgresql://my-user:$CL_prod_db2_DB_PASSWORD@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
+      DATABASE_JDBC_URL=$(printf %s "jdbc:postgresql:///pan-test-app-prod-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_prod_db2_DB_PASSWORD" | escapeForDotEnv)
       CLOUD_RUN_JOB_TRIGGER_URL_migrate=https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-db2-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-prod-db2
       DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
@@ -3136,9 +3136,9 @@ before_script:
       DB_PASSWORD: |-
         $(printf %s "$CL_prod_db2_DB_PASSWORD" | sed '1!s/^/  /')
       DATABASE_URL: |-
-        postgresql://my-user:$CL_prod_db2_DB_PASSWORD@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
+        postgresql://my-user:$(printf %s "$CL_prod_db2_DB_PASSWORD" | sed '1!s/^/  /')@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
       DATABASE_JDBC_URL: |-
-        jdbc:postgresql:///pan-test-app-prod-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$CL_prod_db2_DB_PASSWORD
+        jdbc:postgresql:///pan-test-app-prod-db2?cloudSqlInstance=projectId:region:instancename&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=my-user&password=$(printf %s "$CL_prod_db2_DB_PASSWORD" | sed '1!s/^/  /')
       CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
         https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-db2-migrate:run
       DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
@@ -3385,7 +3385,7 @@ before_script:
       DEPLOY_CLOUD_RUN_REGION=europe-west6
       GCLOUD_DEPLOY_credentialsKey=$(printf %s "$CL_dev_api_GCLOUD_DEPLOY_credentialsKey" | escapeForDotEnv)
       GCLOUD_RUN_canonicalHostSuffix=$(printf %s "$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | escapeForDotEnv)
-      DATABASE_URL_2=postgresql://my-user:$CL_dev_db2_DB_PASSWORD@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
+      DATABASE_URL_2=$(printf %s "postgresql://my-user:$CL_dev_db2_DB_PASSWORD@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
       _ALL_ENV_VAR_KEYS=["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_BUILD_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOSTNAME","ROOT_URL","HOSTNAME_INTERNAL","ROOT_URL_INTERNAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","DEPLOY_CLOUD_RUN_SERVICE_NAME","DEPLOY_CLOUD_RUN_PROJECT_ID","DEPLOY_CLOUD_RUN_REGION","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","DATABASE_URL_2"]
       EOF
     - collapseable_section_end "write-dotenv-api"
@@ -3580,7 +3580,7 @@ before_script:
       GCLOUD_RUN_canonicalHostSuffix: |-
         $(printf %s "$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | sed '1!s/^/  /')
       DATABASE_URL_2: |-
-        postgresql://my-user:$CL_dev_db2_DB_PASSWORD@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
+        postgresql://my-user:$(printf %s "$CL_dev_db2_DB_PASSWORD" | sed '1!s/^/  /')@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
       _ALL_ENV_VAR_KEYS: |-
         ["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_BUILD_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOSTNAME","ROOT_URL","HOSTNAME_INTERNAL","ROOT_URL_INTERNAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","DEPLOY_CLOUD_RUN_SERVICE_NAME","DEPLOY_CLOUD_RUN_PROJECT_ID","DEPLOY_CLOUD_RUN_REGION","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","DATABASE_URL_2"]
 
@@ -4022,7 +4022,7 @@ before_script:
       GCLOUD_RUN_canonicalHostSuffix: |-
         $(printf %s "$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | sed '1!s/^/  /')
       DATABASE_URL_2: |-
-        $(printf %s "postgresql://my-user:$CL_review_db2_DB_PASSWORD@localhost/pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db2?host=/cloudsql/projectId:region:instancename" | sed '1!s/^/  /')
+        postgresql://my-user:$(printf %s "$CL_review_db2_DB_PASSWORD" | sed '1!s/^/  /')@localhost/$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-db2" | sed '1!s/^/  /')?host=/cloudsql/projectId:region:instancename
       _ALL_ENV_VAR_KEYS: |-
         ["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_BUILD_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOSTNAME","ROOT_URL","HOSTNAME_INTERNAL","ROOT_URL_INTERNAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","DEPLOY_CLOUD_RUN_SERVICE_NAME","DEPLOY_CLOUD_RUN_PROJECT_ID","DEPLOY_CLOUD_RUN_REGION","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","DATABASE_URL_2"]
 
@@ -4163,7 +4163,7 @@ before_script:
       DEPLOY_CLOUD_RUN_REGION=europe-west6
       GCLOUD_DEPLOY_credentialsKey=$(printf %s "$CL_stage_api_GCLOUD_DEPLOY_credentialsKey" | escapeForDotEnv)
       GCLOUD_RUN_canonicalHostSuffix=$(printf %s "$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | escapeForDotEnv)
-      DATABASE_URL_2=postgresql://my-user:$CL_stage_db2_DB_PASSWORD@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
+      DATABASE_URL_2=$(printf %s "postgresql://my-user:$CL_stage_db2_DB_PASSWORD@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
       _ALL_ENV_VAR_KEYS=["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_BUILD_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOSTNAME","ROOT_URL","HOSTNAME_INTERNAL","ROOT_URL_INTERNAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","DEPLOY_CLOUD_RUN_SERVICE_NAME","DEPLOY_CLOUD_RUN_PROJECT_ID","DEPLOY_CLOUD_RUN_REGION","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","DATABASE_URL_2"]
       EOF
     - collapseable_section_end "write-dotenv-api"
@@ -4358,7 +4358,7 @@ before_script:
       GCLOUD_RUN_canonicalHostSuffix: |-
         $(printf %s "$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | sed '1!s/^/  /')
       DATABASE_URL_2: |-
-        postgresql://my-user:$CL_stage_db2_DB_PASSWORD@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
+        postgresql://my-user:$(printf %s "$CL_stage_db2_DB_PASSWORD" | sed '1!s/^/  /')@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
       _ALL_ENV_VAR_KEYS: |-
         ["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_BUILD_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOSTNAME","ROOT_URL","HOSTNAME_INTERNAL","ROOT_URL_INTERNAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","DEPLOY_CLOUD_RUN_SERVICE_NAME","DEPLOY_CLOUD_RUN_PROJECT_ID","DEPLOY_CLOUD_RUN_REGION","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","DATABASE_URL_2"]
 
@@ -4483,7 +4483,7 @@ before_script:
       DEPLOY_CLOUD_RUN_REGION=europe-west6
       GCLOUD_DEPLOY_credentialsKey=$(printf %s "$CL_prod_api_GCLOUD_DEPLOY_credentialsKey" | escapeForDotEnv)
       GCLOUD_RUN_canonicalHostSuffix=$(printf %s "$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | escapeForDotEnv)
-      DATABASE_URL_2=postgresql://my-user:$CL_prod_db2_DB_PASSWORD@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
+      DATABASE_URL_2=$(printf %s "postgresql://my-user:$CL_prod_db2_DB_PASSWORD@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
       _ALL_ENV_VAR_KEYS=["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_BUILD_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOSTNAME","ROOT_URL","HOSTNAME_INTERNAL","ROOT_URL_INTERNAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","DEPLOY_CLOUD_RUN_SERVICE_NAME","DEPLOY_CLOUD_RUN_PROJECT_ID","DEPLOY_CLOUD_RUN_REGION","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","DATABASE_URL_2"]
       EOF
     - collapseable_section_end "write-dotenv-api"
@@ -4678,7 +4678,7 @@ before_script:
       GCLOUD_RUN_canonicalHostSuffix: |-
         $(printf %s "$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | sed '1!s/^/  /')
       DATABASE_URL_2: |-
-        postgresql://my-user:$CL_prod_db2_DB_PASSWORD@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
+        postgresql://my-user:$(printf %s "$CL_prod_db2_DB_PASSWORD" | sed '1!s/^/  /')@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
       _ALL_ENV_VAR_KEYS: |-
         ["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_BUILD_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOSTNAME","ROOT_URL","HOSTNAME_INTERNAL","ROOT_URL_INTERNAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","DEPLOY_CLOUD_RUN_SERVICE_NAME","DEPLOY_CLOUD_RUN_PROJECT_ID","DEPLOY_CLOUD_RUN_REGION","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","DATABASE_URL_2"]