@catladder/pipeline 1.91.0 → 1.91.2

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.
Files changed (14) hide show
  1. package/dist/bundles/catladder-gitlab/index.js +1 -1
  2. package/dist/constants.js +1 -1
  3. package/dist/deploy/cloudRun/deployJob.js +2 -2
  4. package/dist/tsconfig.tsbuildinfo +1 -1
  5. package/dist/utils/gitlab.js +1 -1
  6. package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +8 -0
  7. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +8 -0
  8. package/examples/__snapshots__/cloud-run-non-public.ts.snap +8 -0
  9. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +18 -2
  10. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +17 -9
  11. package/examples/__snapshots__/custom-build-job.ts.snap +8 -0
  12. package/package.json +1 -1
  13. package/src/deploy/cloudRun/deployJob.ts +2 -6
  14. package/src/utils/gitlab.ts +1 -1
package/examples/__snapshots__/cloud-run-with-sql.ts.snap CHANGED
@@ -361,15 +361,15 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
361
361
  },
362
362
  ],
363
363
  "script": [
364
+ "set +e",
364
365
  "echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
365
366
  ",
366
367
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
367
368
  "gcloud run services delete pan-test-app-dev-api --project=google-project-id --region=europe-west6",
368
- "set +e",
369
369
  "gcloud scheduler jobs delete pan-test-app-dev-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
370
- "set -e",
371
370
  "gcloud beta run jobs delete pan-test-app-dev-api-migration --project=google-project-id --region=europe-west6",
372
371
  "gcloud beta run jobs delete pan-test-app-dev-api-send-reminders --project=google-project-id --region=europe-west6",
372
+ "set -e",
373
373
  ],
374
374
  "stage": "stop dev",
375
375
  "variables": {
@@ -768,10 +768,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
768
768
  },
769
769
  ],
770
770
  "script": [
771
+ "set +e",
771
772
  "echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
772
773
  ",
773
774
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
774
775
  "gcloud run services delete pan-test-app-dev-www --project=google-project-id --region=europe-west6",
776
+ "set -e",
775
777
  ],
776
778
  "stage": "stop dev",
777
779
  "variables": {
@@ -1280,24 +1282,24 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
1280
1282
  },
1281
1283
  ],
1282
1284
  "script": [
1285
+ "set +e",
1283
1286
  "echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1284
1287
  ",
1285
1288
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1286
1289
  "gcloud run services delete pan-test-app-review-mr1234-api --project=google-project-id --region=europe-west6",
1287
- "set +e",
1288
1290
  "gcloud scheduler jobs delete pan-test-app-review-mr1234-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
1289
- "set -e",
1290
1291
  "gcloud beta run jobs delete pan-test-app-review-mr1234-api-migration --project=google-project-id --region=europe-west6",
1291
1292
  "gcloud beta run jobs delete pan-test-app-review-mr1234-api-send-reminders --project=google-project-id --region=europe-west6",
1292
1293
  "echo "deleting database pan-test-app-review-mr1234-api..."",
1293
1294
  "echo "👆 this can take multiple attemps (3-5min), because google cloud run may still have a connection to the database after the cloud run service is shut down"",
1294
1295
  "
1295
- until gcloud sql databases delete pan-test-app-review-mr1234-api --instance=instancename --project projectId &> /dev/null
1296
+ until gcloud sql databases delete pan-test-app-review-mr1234-api --instance=instancename --project projectId
1296
1297
  do
1297
1298
  echo "Trying again."
1298
1299
  sleep 10
1299
1300
  done
1300
1301
  ",
1302
+ "set -e",
1301
1303
  ],
1302
1304
  "stage": "stop review",
1303
1305
  "variables": {
@@ -1696,10 +1698,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
1696
1698
  },
1697
1699
  ],
1698
1700
  "script": [
1701
+ "set +e",
1699
1702
  "echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1700
1703
  ",
1701
1704
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1702
1705
  "gcloud run services delete pan-test-app-review-mr1234-www --project=google-project-id --region=europe-west6",
1706
+ "set -e",
1703
1707
  ],
1704
1708
  "stage": "stop review",
1705
1709
  "variables": {
@@ -2428,15 +2432,15 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
2428
2432
  },
2429
2433
  ],
2430
2434
  "script": [
2435
+ "set +e",
2431
2436
  "echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
2432
2437
  ",
2433
2438
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2434
2439
  "gcloud run services delete pan-test-app-prod-api --project=google-project-id --region=europe-west6",
2435
- "set +e",
2436
2440
  "gcloud scheduler jobs delete pan-test-app-prod-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
2437
- "set -e",
2438
2441
  "gcloud beta run jobs delete pan-test-app-prod-api-migration --project=google-project-id --region=europe-west6",
2439
2442
  "gcloud beta run jobs delete pan-test-app-prod-api-send-reminders --project=google-project-id --region=europe-west6",
2443
+ "set -e",
2440
2444
  ],
2441
2445
  "stage": "stop prod",
2442
2446
  "variables": {
@@ -2476,15 +2480,15 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
2476
2480
  },
2477
2481
  ],
2478
2482
  "script": [
2483
+ "set +e",
2479
2484
  "echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
2480
2485
  ",
2481
2486
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2482
2487
  "gcloud run services delete pan-test-app-stage-api --project=google-project-id --region=europe-west6",
2483
- "set +e",
2484
2488
  "gcloud scheduler jobs delete pan-test-app-stage-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
2485
- "set -e",
2486
2489
  "gcloud beta run jobs delete pan-test-app-stage-api-migration --project=google-project-id --region=europe-west6",
2487
2490
  "gcloud beta run jobs delete pan-test-app-stage-api-send-reminders --project=google-project-id --region=europe-west6",
2491
+ "set -e",
2488
2492
  ],
2489
2493
  "stage": "stop stage",
2490
2494
  "variables": {
@@ -2996,10 +3000,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
2996
3000
  },
2997
3001
  ],
2998
3002
  "script": [
3003
+ "set +e",
2999
3004
  "echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
3000
3005
  ",
3001
3006
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3002
3007
  "gcloud run services delete pan-test-app-prod-www --project=google-project-id --region=europe-west6",
3008
+ "set -e",
3003
3009
  ],
3004
3010
  "stage": "stop prod",
3005
3011
  "variables": {
@@ -3039,10 +3045,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
3039
3045
  },
3040
3046
  ],
3041
3047
  "script": [
3048
+ "set +e",
3042
3049
  "echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
3043
3050
  ",
3044
3051
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3045
3052
  "gcloud run services delete pan-test-app-stage-www --project=google-project-id --region=europe-west6",
3053
+ "set -e",
3046
3054
  ],
3047
3055
  "stage": "stop stage",
3048
3056
  "variables": {
package/examples/__snapshots__/custom-build-job.ts.snap CHANGED
@@ -228,10 +228,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
228
228
  },
229
229
  ],
230
230
  "script": [
231
+ "set +e",
231
232
  "echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
232
233
  ",
233
234
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
234
235
  "gcloud run services delete pan-test-app-dev-www --project=asdf --region=asia-east1",
236
+ "set -e",
235
237
  ],
236
238
  "stage": "stop dev",
237
239
  "variables": {
@@ -538,10 +540,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
538
540
  },
539
541
  ],
540
542
  "script": [
543
+ "set +e",
541
544
  "echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
542
545
  ",
543
546
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
544
547
  "gcloud run services delete pan-test-app-review-mr1234-www --project=asdf --region=asia-east1",
548
+ "set -e",
545
549
  ],
546
550
  "stage": "stop review",
547
551
  "variables": {
@@ -1043,10 +1047,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
1043
1047
  },
1044
1048
  ],
1045
1049
  "script": [
1050
+ "set +e",
1046
1051
  "echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1047
1052
  ",
1048
1053
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1049
1054
  "gcloud run services delete pan-test-app-prod-www --project=asdf --region=asia-east1",
1055
+ "set -e",
1050
1056
  ],
1051
1057
  "stage": "stop prod",
1052
1058
  "variables": {
@@ -1086,10 +1092,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
1086
1092
  },
1087
1093
  ],
1088
1094
  "script": [
1095
+ "set +e",
1089
1096
  "echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1090
1097
  ",
1091
1098
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1092
1099
  "gcloud run services delete pan-test-app-stage-www --project=asdf --region=asia-east1",
1100
+ "set -e",
1093
1101
  ],
1094
1102
  "stage": "stop stage",
1095
1103
  "variables": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@catladder/pipeline",
3
- "version": "1.91.0",
3
+ "version": "1.91.2",
4
4
  "scripts": {
5
5
  "build:tsc": "yarn tsc",
6
6
  "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",
package/src/deploy/cloudRun/deployJob.ts CHANGED
@@ -197,11 +197,7 @@ export const createGoogleCloudRunDeployJobs = (
197
197
  });
198
198
  return jobsWithSchedule
199
199
  .map(({ schedulerName }) => {
200
- return [
201
- ...allowFailureInScripts([
202
- `gcloud scheduler jobs delete ${schedulerName} ${argsString}`,
203
- ]),
204
- ];
200
+ return [`gcloud scheduler jobs delete ${schedulerName} ${argsString}`];
205
201
  })
206
202
  .flat();
207
203
  };
@@ -270,7 +266,7 @@ export const createGoogleCloudRunDeployJobs = (
270
266
  variables: {
271
267
  CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
272
268
  },
273
- script: stopScripts,
269
+ script: allowFailureInScripts(stopScripts),
274
270
  }),
275
271
  ];
276
272
  };
package/src/utils/gitlab.ts CHANGED
@@ -14,7 +14,7 @@ export const repeatOnFailure = (
14
14
  }
15
15
  ): string => {
16
16
  return `
17
- until ${command} &> /dev/null
17
+ until ${command}
18
18
  do
19
19
  echo "Trying again."
20
20
  sleep ${options.pauseInSeconds}