@catladder/pipeline 4.6.4 → 4.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constants.js +1 -1
- package/dist/context/getEnvironmentVariables.js +6 -5
- package/dist/deploy/cloudRun/index.js +14 -2
- package/dist/deploy/cloudRun/utils/database.d.ts +6 -5
- package/dist/deploy/cloudRun/utils/database.js +22 -15
- package/dist/deploy/index.d.ts +7 -2
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/pipeline/createJobsForComponent.js +5 -4
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/config.d.ts +8 -0
- package/dist/variables/VariableValueContainingReferences.d.ts +6 -0
- package/dist/variables/VariableValueContainingReferences.js +21 -0
- package/dist/variables/resolveAllReferences.d.ts +1 -2
- package/dist/variables/resolveAllReferences.js +7 -8
- package/dist/variables/resolveAllReferencesOnce.d.ts +1 -4
- package/dist/variables/resolveAllReferencesOnce.js +3 -3
- package/dist/verify/createVerifyJobs.d.ts +4 -0
- package/dist/verify/createVerifyJobs.js +229 -0
- package/dist/verify/index.d.ts +2 -0
- package/dist/verify/index.js +26 -0
- package/dist/verify/types.d.ts +16 -0
- package/dist/verify/types.js +5 -0
- package/examples/__snapshots__/cloud-run-verify.test.ts.snap +3061 -0
- package/examples/__snapshots__/cloud-run-with-sql-multiple-dbs.test.ts.snap +35 -35
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.test.ts.snap +64 -64
- package/examples/cloud-run-verify.test.ts +12 -0
- package/examples/cloud-run-verify.ts +50 -0
- package/examples/cloud-run-with-sql-reuse-db.ts +4 -0
- package/package.json +1 -1
- package/src/context/getEnvironmentVariables.ts +19 -10
- package/src/deploy/cloudRun/index.ts +25 -1
- package/src/deploy/cloudRun/utils/database.ts +54 -22
- package/src/deploy/index.ts +7 -2
- package/src/index.ts +1 -0
- package/src/pipeline/createJobsForComponent.ts +4 -2
- package/src/types/config.ts +9 -0
- package/src/variables/VariableValueContainingReferences.ts +11 -0
- package/src/variables/__tests__/resolveAllReferences.test.ts +49 -0
- package/src/variables/resolveAllReferences.ts +18 -14
- package/src/variables/resolveAllReferencesOnce.ts +17 -12
- package/src/verify/createVerifyJobs.ts +81 -0
- package/src/verify/index.ts +2 -0
- package/src/verify/types.ts +18 -0
|
@@ -252,8 +252,8 @@ before_script:
|
|
|
252
252
|
DB_NAME=pan-test-app-dev-db1
|
|
253
253
|
DB_USER=my-user
|
|
254
254
|
DB_PASSWORD=$(printf %s "$CL_dev_db1_DB_PASSWORD" | escapeForDotEnv)
|
|
255
|
-
DATABASE_URL
|
|
256
|
-
DATABASE_JDBC_URL
|
|
255
|
+
DATABASE_URL=$(printf %s "postgresql://my-user:$CL_dev_db1_DB_PASSWORD@localhost/pan-test-app-dev-db1?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
|
|
256
|
+
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)
|
|
257
257
|
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
|
|
258
258
|
DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-dev-db1
|
|
259
259
|
DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
|
|
@@ -442,9 +442,9 @@ before_script:
|
|
|
442
442
|
DB_PASSWORD: |-
|
|
443
443
|
$(printf %s "$CL_dev_db1_DB_PASSWORD" | sed '1!s/^/ /')
|
|
444
444
|
DATABASE_URL: |-
|
|
445
|
-
postgresql://my-user:$CL_dev_db1_DB_PASSWORD@localhost/pan-test-app-dev-db1?host=/cloudsql/projectId:region:instancename
|
|
445
|
+
postgresql://my-user:$(printf %s "$CL_dev_db1_DB_PASSWORD" | sed '1!s/^/ /')@localhost/pan-test-app-dev-db1?host=/cloudsql/projectId:region:instancename
|
|
446
446
|
DATABASE_JDBC_URL: |-
|
|
447
|
-
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
|
|
447
|
+
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/^/ /')
|
|
448
448
|
CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
|
|
449
449
|
https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-db1-migrate:run
|
|
450
450
|
DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
|
|
@@ -895,9 +895,9 @@ before_script:
|
|
|
895
895
|
DB_PASSWORD: |-
|
|
896
896
|
$(printf %s "$CL_review_db1_DB_PASSWORD" | sed '1!s/^/ /')
|
|
897
897
|
DATABASE_URL: |-
|
|
898
|
-
|
|
898
|
+
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
|
|
899
899
|
DATABASE_JDBC_URL: |-
|
|
900
|
-
|
|
900
|
+
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/^/ /')
|
|
901
901
|
CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
|
|
902
902
|
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
|
|
903
903
|
DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
|
|
@@ -1052,8 +1052,8 @@ before_script:
|
|
|
1052
1052
|
DB_NAME=pan-test-app-stage-db1
|
|
1053
1053
|
DB_USER=my-user
|
|
1054
1054
|
DB_PASSWORD=$(printf %s "$CL_stage_db1_DB_PASSWORD" | escapeForDotEnv)
|
|
1055
|
-
DATABASE_URL
|
|
1056
|
-
DATABASE_JDBC_URL
|
|
1055
|
+
DATABASE_URL=$(printf %s "postgresql://my-user:$CL_stage_db1_DB_PASSWORD@localhost/pan-test-app-stage-db1?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
|
|
1056
|
+
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)
|
|
1057
1057
|
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
|
|
1058
1058
|
DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-stage-db1
|
|
1059
1059
|
DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
|
|
@@ -1242,9 +1242,9 @@ before_script:
|
|
|
1242
1242
|
DB_PASSWORD: |-
|
|
1243
1243
|
$(printf %s "$CL_stage_db1_DB_PASSWORD" | sed '1!s/^/ /')
|
|
1244
1244
|
DATABASE_URL: |-
|
|
1245
|
-
postgresql://my-user:$CL_stage_db1_DB_PASSWORD@localhost/pan-test-app-stage-db1?host=/cloudsql/projectId:region:instancename
|
|
1245
|
+
postgresql://my-user:$(printf %s "$CL_stage_db1_DB_PASSWORD" | sed '1!s/^/ /')@localhost/pan-test-app-stage-db1?host=/cloudsql/projectId:region:instancename
|
|
1246
1246
|
DATABASE_JDBC_URL: |-
|
|
1247
|
-
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
|
|
1247
|
+
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/^/ /')
|
|
1248
1248
|
CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
|
|
1249
1249
|
https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-db1-migrate:run
|
|
1250
1250
|
DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
|
|
@@ -1383,8 +1383,8 @@ before_script:
|
|
|
1383
1383
|
DB_NAME=pan-test-app-prod-db1
|
|
1384
1384
|
DB_USER=my-user
|
|
1385
1385
|
DB_PASSWORD=$(printf %s "$CL_prod_db1_DB_PASSWORD" | escapeForDotEnv)
|
|
1386
|
-
DATABASE_URL
|
|
1387
|
-
DATABASE_JDBC_URL
|
|
1386
|
+
DATABASE_URL=$(printf %s "postgresql://my-user:$CL_prod_db1_DB_PASSWORD@localhost/pan-test-app-prod-db1?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
|
|
1387
|
+
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)
|
|
1388
1388
|
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
|
|
1389
1389
|
DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-prod-db1
|
|
1390
1390
|
DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
|
|
@@ -1573,9 +1573,9 @@ before_script:
|
|
|
1573
1573
|
DB_PASSWORD: |-
|
|
1574
1574
|
$(printf %s "$CL_prod_db1_DB_PASSWORD" | sed '1!s/^/ /')
|
|
1575
1575
|
DATABASE_URL: |-
|
|
1576
|
-
postgresql://my-user:$CL_prod_db1_DB_PASSWORD@localhost/pan-test-app-prod-db1?host=/cloudsql/projectId:region:instancename
|
|
1576
|
+
postgresql://my-user:$(printf %s "$CL_prod_db1_DB_PASSWORD" | sed '1!s/^/ /')@localhost/pan-test-app-prod-db1?host=/cloudsql/projectId:region:instancename
|
|
1577
1577
|
DATABASE_JDBC_URL: |-
|
|
1578
|
-
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
|
|
1578
|
+
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/^/ /')
|
|
1579
1579
|
CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
|
|
1580
1580
|
https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-db1-migrate:run
|
|
1581
1581
|
DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
|
|
@@ -1815,8 +1815,8 @@ before_script:
|
|
|
1815
1815
|
DB_NAME=pan-test-app-dev-db2
|
|
1816
1816
|
DB_USER=my-user
|
|
1817
1817
|
DB_PASSWORD=$(printf %s "$CL_dev_db2_DB_PASSWORD" | escapeForDotEnv)
|
|
1818
|
-
DATABASE_URL
|
|
1819
|
-
DATABASE_JDBC_URL
|
|
1818
|
+
DATABASE_URL=$(printf %s "postgresql://my-user:$CL_dev_db2_DB_PASSWORD@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
|
|
1819
|
+
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)
|
|
1820
1820
|
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
|
|
1821
1821
|
DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-dev-db2
|
|
1822
1822
|
DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
|
|
@@ -2005,9 +2005,9 @@ before_script:
|
|
|
2005
2005
|
DB_PASSWORD: |-
|
|
2006
2006
|
$(printf %s "$CL_dev_db2_DB_PASSWORD" | sed '1!s/^/ /')
|
|
2007
2007
|
DATABASE_URL: |-
|
|
2008
|
-
postgresql://my-user:$CL_dev_db2_DB_PASSWORD@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
|
|
2008
|
+
postgresql://my-user:$(printf %s "$CL_dev_db2_DB_PASSWORD" | sed '1!s/^/ /')@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
|
|
2009
2009
|
DATABASE_JDBC_URL: |-
|
|
2010
|
-
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
|
|
2010
|
+
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/^/ /')
|
|
2011
2011
|
CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
|
|
2012
2012
|
https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-db2-migrate:run
|
|
2013
2013
|
DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
|
|
@@ -2458,9 +2458,9 @@ before_script:
|
|
|
2458
2458
|
DB_PASSWORD: |-
|
|
2459
2459
|
$(printf %s "$CL_review_db2_DB_PASSWORD" | sed '1!s/^/ /')
|
|
2460
2460
|
DATABASE_URL: |-
|
|
2461
|
-
|
|
2461
|
+
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
|
|
2462
2462
|
DATABASE_JDBC_URL: |-
|
|
2463
|
-
|
|
2463
|
+
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/^/ /')
|
|
2464
2464
|
CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
|
|
2465
2465
|
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
|
|
2466
2466
|
DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
|
|
@@ -2615,8 +2615,8 @@ before_script:
|
|
|
2615
2615
|
DB_NAME=pan-test-app-stage-db2
|
|
2616
2616
|
DB_USER=my-user
|
|
2617
2617
|
DB_PASSWORD=$(printf %s "$CL_stage_db2_DB_PASSWORD" | escapeForDotEnv)
|
|
2618
|
-
DATABASE_URL
|
|
2619
|
-
DATABASE_JDBC_URL
|
|
2618
|
+
DATABASE_URL=$(printf %s "postgresql://my-user:$CL_stage_db2_DB_PASSWORD@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
|
|
2619
|
+
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)
|
|
2620
2620
|
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
|
|
2621
2621
|
DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-stage-db2
|
|
2622
2622
|
DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
|
|
@@ -2805,9 +2805,9 @@ before_script:
|
|
|
2805
2805
|
DB_PASSWORD: |-
|
|
2806
2806
|
$(printf %s "$CL_stage_db2_DB_PASSWORD" | sed '1!s/^/ /')
|
|
2807
2807
|
DATABASE_URL: |-
|
|
2808
|
-
postgresql://my-user:$CL_stage_db2_DB_PASSWORD@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
|
|
2808
|
+
postgresql://my-user:$(printf %s "$CL_stage_db2_DB_PASSWORD" | sed '1!s/^/ /')@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
|
|
2809
2809
|
DATABASE_JDBC_URL: |-
|
|
2810
|
-
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
|
|
2810
|
+
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/^/ /')
|
|
2811
2811
|
CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
|
|
2812
2812
|
https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-db2-migrate:run
|
|
2813
2813
|
DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
|
|
@@ -2946,8 +2946,8 @@ before_script:
|
|
|
2946
2946
|
DB_NAME=pan-test-app-prod-db2
|
|
2947
2947
|
DB_USER=my-user
|
|
2948
2948
|
DB_PASSWORD=$(printf %s "$CL_prod_db2_DB_PASSWORD" | escapeForDotEnv)
|
|
2949
|
-
DATABASE_URL
|
|
2950
|
-
DATABASE_JDBC_URL
|
|
2949
|
+
DATABASE_URL=$(printf %s "postgresql://my-user:$CL_prod_db2_DB_PASSWORD@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename" | escapeForDotEnv)
|
|
2950
|
+
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)
|
|
2951
2951
|
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
|
|
2952
2952
|
DEPLOY_CLOUD_RUN_SERVICE_NAME=pan-test-app-prod-db2
|
|
2953
2953
|
DEPLOY_CLOUD_RUN_PROJECT_ID=google-project-id
|
|
@@ -3136,9 +3136,9 @@ before_script:
|
|
|
3136
3136
|
DB_PASSWORD: |-
|
|
3137
3137
|
$(printf %s "$CL_prod_db2_DB_PASSWORD" | sed '1!s/^/ /')
|
|
3138
3138
|
DATABASE_URL: |-
|
|
3139
|
-
postgresql://my-user:$CL_prod_db2_DB_PASSWORD@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
|
|
3139
|
+
postgresql://my-user:$(printf %s "$CL_prod_db2_DB_PASSWORD" | sed '1!s/^/ /')@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
|
|
3140
3140
|
DATABASE_JDBC_URL: |-
|
|
3141
|
-
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
|
|
3141
|
+
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/^/ /')
|
|
3142
3142
|
CLOUD_RUN_JOB_TRIGGER_URL_migrate: |-
|
|
3143
3143
|
https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-db2-migrate:run
|
|
3144
3144
|
DEPLOY_CLOUD_RUN_SERVICE_NAME: |-
|
|
@@ -3385,7 +3385,7 @@ before_script:
|
|
|
3385
3385
|
DEPLOY_CLOUD_RUN_REGION=europe-west6
|
|
3386
3386
|
GCLOUD_DEPLOY_credentialsKey=$(printf %s "$CL_dev_api_GCLOUD_DEPLOY_credentialsKey" | escapeForDotEnv)
|
|
3387
3387
|
GCLOUD_RUN_canonicalHostSuffix=$(printf %s "$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | escapeForDotEnv)
|
|
3388
|
-
DATABASE_URL_2
|
|
3388
|
+
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)
|
|
3389
3389
|
_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"]
|
|
3390
3390
|
EOF
|
|
3391
3391
|
- collapseable_section_end "write-dotenv-api"
|
|
@@ -3580,7 +3580,7 @@ before_script:
|
|
|
3580
3580
|
GCLOUD_RUN_canonicalHostSuffix: |-
|
|
3581
3581
|
$(printf %s "$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | sed '1!s/^/ /')
|
|
3582
3582
|
DATABASE_URL_2: |-
|
|
3583
|
-
postgresql://my-user:$CL_dev_db2_DB_PASSWORD@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
|
|
3583
|
+
postgresql://my-user:$(printf %s "$CL_dev_db2_DB_PASSWORD" | sed '1!s/^/ /')@localhost/pan-test-app-dev-db2?host=/cloudsql/projectId:region:instancename
|
|
3584
3584
|
_ALL_ENV_VAR_KEYS: |-
|
|
3585
3585
|
["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"]
|
|
3586
3586
|
|
|
@@ -4022,7 +4022,7 @@ before_script:
|
|
|
4022
4022
|
GCLOUD_RUN_canonicalHostSuffix: |-
|
|
4023
4023
|
$(printf %s "$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | sed '1!s/^/ /')
|
|
4024
4024
|
DATABASE_URL_2: |-
|
|
4025
|
-
|
|
4025
|
+
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
|
|
4026
4026
|
_ALL_ENV_VAR_KEYS: |-
|
|
4027
4027
|
["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"]
|
|
4028
4028
|
|
|
@@ -4163,7 +4163,7 @@ before_script:
|
|
|
4163
4163
|
DEPLOY_CLOUD_RUN_REGION=europe-west6
|
|
4164
4164
|
GCLOUD_DEPLOY_credentialsKey=$(printf %s "$CL_stage_api_GCLOUD_DEPLOY_credentialsKey" | escapeForDotEnv)
|
|
4165
4165
|
GCLOUD_RUN_canonicalHostSuffix=$(printf %s "$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | escapeForDotEnv)
|
|
4166
|
-
DATABASE_URL_2
|
|
4166
|
+
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)
|
|
4167
4167
|
_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"]
|
|
4168
4168
|
EOF
|
|
4169
4169
|
- collapseable_section_end "write-dotenv-api"
|
|
@@ -4358,7 +4358,7 @@ before_script:
|
|
|
4358
4358
|
GCLOUD_RUN_canonicalHostSuffix: |-
|
|
4359
4359
|
$(printf %s "$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | sed '1!s/^/ /')
|
|
4360
4360
|
DATABASE_URL_2: |-
|
|
4361
|
-
postgresql://my-user:$CL_stage_db2_DB_PASSWORD@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
|
|
4361
|
+
postgresql://my-user:$(printf %s "$CL_stage_db2_DB_PASSWORD" | sed '1!s/^/ /')@localhost/pan-test-app-stage-db2?host=/cloudsql/projectId:region:instancename
|
|
4362
4362
|
_ALL_ENV_VAR_KEYS: |-
|
|
4363
4363
|
["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"]
|
|
4364
4364
|
|
|
@@ -4483,7 +4483,7 @@ before_script:
|
|
|
4483
4483
|
DEPLOY_CLOUD_RUN_REGION=europe-west6
|
|
4484
4484
|
GCLOUD_DEPLOY_credentialsKey=$(printf %s "$CL_prod_api_GCLOUD_DEPLOY_credentialsKey" | escapeForDotEnv)
|
|
4485
4485
|
GCLOUD_RUN_canonicalHostSuffix=$(printf %s "$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | escapeForDotEnv)
|
|
4486
|
-
DATABASE_URL_2
|
|
4486
|
+
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)
|
|
4487
4487
|
_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"]
|
|
4488
4488
|
EOF
|
|
4489
4489
|
- collapseable_section_end "write-dotenv-api"
|
|
@@ -4678,7 +4678,7 @@ before_script:
|
|
|
4678
4678
|
GCLOUD_RUN_canonicalHostSuffix: |-
|
|
4679
4679
|
$(printf %s "$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | sed '1!s/^/ /')
|
|
4680
4680
|
DATABASE_URL_2: |-
|
|
4681
|
-
postgresql://my-user:$CL_prod_db2_DB_PASSWORD@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
|
|
4681
|
+
postgresql://my-user:$(printf %s "$CL_prod_db2_DB_PASSWORD" | sed '1!s/^/ /')@localhost/pan-test-app-prod-db2?host=/cloudsql/projectId:region:instancename
|
|
4682
4682
|
_ALL_ENV_VAR_KEYS: |-
|
|
4683
4683
|
["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"]
|
|
4684
4684
|
|