@catladder/pipeline 1.134.1 → 1.136.0
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/bundles/catladder-gitlab/index.js +1 -1
- package/dist/constants.js +1 -1
- package/dist/deploy/cloudRun/createJobs/cloudRunJobs.js +5 -5
- package/dist/deploy/cloudRun/createJobs/cloudRunServices.js +4 -3
- package/dist/deploy/cloudRun/createJobs/common.d.ts +3 -0
- package/dist/deploy/cloudRun/createJobs/common.js +14 -2
- package/dist/deploy/types/googleCloudRun.d.ts +9 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/cloud-run-post-stop-job.ts.snap +5 -5
- package/examples/__snapshots__/cloud-run-service-gen2.ts.snap +1839 -0
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +36 -36
- package/examples/cloud-run-service-gen2.ts +27 -0
- package/package.json +1 -1
- package/src/deploy/cloudRun/createJobs/cloudRunJobs.ts +12 -8
- package/src/deploy/cloudRun/createJobs/cloudRunServices.ts +6 -2
- package/src/deploy/cloudRun/createJobs/common.ts +14 -1
- package/src/deploy/types/googleCloudRun.ts +11 -1
|
@@ -287,15 +287,15 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
287
287
|
"set -e",
|
|
288
288
|
"gcloud scheduler jobs update http pan-test-app-dev-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --max-retry-attempts=0 --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
289
289
|
"set +e",
|
|
290
|
-
"gcloud
|
|
290
|
+
"gcloud run jobs create pan-test-app-dev-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=pan-test-app-dev-api-migration --memory=512Mi --task-timeout=10m",
|
|
291
291
|
"set -e",
|
|
292
|
-
"gcloud
|
|
292
|
+
"gcloud run jobs update pan-test-app-dev-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=pan-test-app-dev-api-migration --memory=512Mi --task-timeout=10m --env-vars-file=____envvars.yaml",
|
|
293
293
|
"set +e",
|
|
294
|
-
"gcloud
|
|
294
|
+
"gcloud run jobs create pan-test-app-dev-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=pan-test-app-dev-api-send-reminders --memory=512Mi --task-timeout=15m",
|
|
295
295
|
"set -e",
|
|
296
|
-
"gcloud
|
|
296
|
+
"gcloud run jobs update pan-test-app-dev-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=pan-test-app-dev-api-send-reminders --memory=512Mi --task-timeout=15m --env-vars-file=____envvars.yaml",
|
|
297
297
|
"gcloud run deploy pan-test-app-dev-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-service-name=pan-test-app-dev-api --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=5 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
|
|
298
|
-
"gcloud
|
|
298
|
+
"gcloud run jobs execute pan-test-app-dev-api-migration --project=google-project-id --region=europe-west6",
|
|
299
299
|
"echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
|
|
300
300
|
"echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
|
|
301
301
|
"gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-dev-api --limit=unlimited --sort-by=metadata.creationTimestamp --format="value(name)" --filter='(status.conditions.status=False OR status.conditions.status=Unknown)' | while read -r revisionname; do gcloud run revisions delete --project=google-project-id --region=europe-west6 --quiet $revisionname ; done",
|
|
@@ -405,10 +405,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
405
405
|
"gcloud auth activate-service-account --key-file=<(echo "$CL_dev_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
406
406
|
"gcloud run services delete pan-test-app-dev-api --project=google-project-id --region=europe-west6",
|
|
407
407
|
"gcloud scheduler jobs delete pan-test-app-dev-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
|
|
408
|
-
"gcloud
|
|
409
|
-
"gcloud
|
|
410
|
-
"gcloud
|
|
411
|
-
"gcloud
|
|
408
|
+
"gcloud run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-dev-api-migration --format="value(name)" | xargs -I {} gcloud run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
|
|
409
|
+
"gcloud run jobs delete pan-test-app-dev-api-migration --project=google-project-id --region=europe-west6",
|
|
410
|
+
"gcloud run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-dev-api-send-reminders --format="value(name)" | xargs -I {} gcloud run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
|
|
411
|
+
"gcloud run jobs delete pan-test-app-dev-api-send-reminders --project=google-project-id --region=europe-west6",
|
|
412
412
|
"gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags",
|
|
413
413
|
"gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
|
|
414
414
|
"echo Disabling component in Dependency Track",
|
|
@@ -1349,15 +1349,15 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1349
1349
|
"set -e",
|
|
1350
1350
|
"gcloud scheduler jobs update http pan-test-app-review-mr1234-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --max-retry-attempts=0 --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-review-mr1234-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
1351
1351
|
"set +e",
|
|
1352
|
-
"gcloud
|
|
1352
|
+
"gcloud run jobs create pan-test-app-review-mr1234-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=pan-test-app-review-mr1234-api-migration --memory=512Mi --task-timeout=10m",
|
|
1353
1353
|
"set -e",
|
|
1354
|
-
"gcloud
|
|
1354
|
+
"gcloud run jobs update pan-test-app-review-mr1234-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=pan-test-app-review-mr1234-api-migration --memory=512Mi --task-timeout=10m --env-vars-file=____envvars.yaml",
|
|
1355
1355
|
"set +e",
|
|
1356
|
-
"gcloud
|
|
1356
|
+
"gcloud run jobs create pan-test-app-review-mr1234-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=pan-test-app-review-mr1234-api-send-reminders --memory=512Mi --task-timeout=15m",
|
|
1357
1357
|
"set -e",
|
|
1358
|
-
"gcloud
|
|
1358
|
+
"gcloud run jobs update pan-test-app-review-mr1234-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=pan-test-app-review-mr1234-api-send-reminders --memory=512Mi --task-timeout=15m --env-vars-file=____envvars.yaml",
|
|
1359
1359
|
"gcloud run deploy pan-test-app-review-mr1234-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-service-name=pan-test-app-review-mr1234-api --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=5 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
|
|
1360
|
-
"gcloud
|
|
1360
|
+
"gcloud run jobs execute pan-test-app-review-mr1234-api-migration --project=google-project-id --region=europe-west6",
|
|
1361
1361
|
"echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
|
|
1362
1362
|
"echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
|
|
1363
1363
|
"gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-review-mr1234-api --limit=unlimited --sort-by=metadata.creationTimestamp --format="value(name)" --filter='(status.conditions.status=False OR status.conditions.status=Unknown)' | while read -r revisionname; do gcloud run revisions delete --project=google-project-id --region=europe-west6 --quiet $revisionname ; done",
|
|
@@ -1470,10 +1470,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
1470
1470
|
"gcloud auth activate-service-account --key-file=<(echo "$CL_review_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
1471
1471
|
"gcloud run services delete pan-test-app-review-mr1234-api --project=google-project-id --region=europe-west6",
|
|
1472
1472
|
"gcloud scheduler jobs delete pan-test-app-review-mr1234-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
|
|
1473
|
-
"gcloud
|
|
1474
|
-
"gcloud
|
|
1475
|
-
"gcloud
|
|
1476
|
-
"gcloud
|
|
1473
|
+
"gcloud run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-review-mr1234-api-migration --format="value(name)" | xargs -I {} gcloud run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
|
|
1474
|
+
"gcloud run jobs delete pan-test-app-review-mr1234-api-migration --project=google-project-id --region=europe-west6",
|
|
1475
|
+
"gcloud run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-review-mr1234-api-send-reminders --format="value(name)" | xargs -I {} gcloud run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
|
|
1476
|
+
"gcloud run jobs delete pan-test-app-review-mr1234-api-send-reminders --project=google-project-id --region=europe-west6",
|
|
1477
1477
|
"echo "deleting database pan-test-app-review-mr1234-api..."",
|
|
1478
1478
|
"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"",
|
|
1479
1479
|
"
|
|
@@ -2532,15 +2532,15 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
2532
2532
|
"set -e",
|
|
2533
2533
|
"gcloud scheduler jobs update http pan-test-app-prod-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --max-retry-attempts=0 --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
2534
2534
|
"set +e",
|
|
2535
|
-
"gcloud
|
|
2535
|
+
"gcloud run jobs create pan-test-app-prod-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node,cloud-run-job-name=pan-test-app-prod-api-migration --memory=512Mi --task-timeout=10m",
|
|
2536
2536
|
"set -e",
|
|
2537
|
-
"gcloud
|
|
2537
|
+
"gcloud run jobs update pan-test-app-prod-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node,cloud-run-job-name=pan-test-app-prod-api-migration --memory=512Mi --task-timeout=10m --env-vars-file=____envvars.yaml",
|
|
2538
2538
|
"set +e",
|
|
2539
|
-
"gcloud
|
|
2539
|
+
"gcloud run jobs create pan-test-app-prod-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node,cloud-run-job-name=pan-test-app-prod-api-send-reminders --memory=512Mi --task-timeout=15m",
|
|
2540
2540
|
"set -e",
|
|
2541
|
-
"gcloud
|
|
2541
|
+
"gcloud run jobs update pan-test-app-prod-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node,cloud-run-job-name=pan-test-app-prod-api-send-reminders --memory=512Mi --task-timeout=15m --env-vars-file=____envvars.yaml",
|
|
2542
2542
|
"gcloud run deploy pan-test-app-prod-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node,cloud-run-service-name=pan-test-app-prod-api --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=5 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
|
|
2543
|
-
"gcloud
|
|
2543
|
+
"gcloud run jobs execute pan-test-app-prod-api-migration --project=google-project-id --region=europe-west6",
|
|
2544
2544
|
"echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
|
|
2545
2545
|
"echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
|
|
2546
2546
|
"gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-prod-api --limit=unlimited --sort-by=metadata.creationTimestamp --format="value(name)" --filter='(status.conditions.status=False OR status.conditions.status=Unknown)' | tail -n +6 | while read -r revisionname; do gcloud run revisions delete --project=google-project-id --region=europe-west6 --quiet $revisionname ; done",
|
|
@@ -2676,15 +2676,15 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
2676
2676
|
"set -e",
|
|
2677
2677
|
"gcloud scheduler jobs update http pan-test-app-stage-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --max-retry-attempts=0 --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
2678
2678
|
"set +e",
|
|
2679
|
-
"gcloud
|
|
2679
|
+
"gcloud run jobs create pan-test-app-stage-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=pan-test-app-stage-api-migration --memory=512Mi --task-timeout=10m",
|
|
2680
2680
|
"set -e",
|
|
2681
|
-
"gcloud
|
|
2681
|
+
"gcloud run jobs update pan-test-app-stage-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=pan-test-app-stage-api-migration --memory=512Mi --task-timeout=10m --env-vars-file=____envvars.yaml",
|
|
2682
2682
|
"set +e",
|
|
2683
|
-
"gcloud
|
|
2683
|
+
"gcloud run jobs create pan-test-app-stage-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=pan-test-app-stage-api-send-reminders --memory=512Mi --task-timeout=15m",
|
|
2684
2684
|
"set -e",
|
|
2685
|
-
"gcloud
|
|
2685
|
+
"gcloud run jobs update pan-test-app-stage-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=pan-test-app-stage-api-send-reminders --memory=512Mi --task-timeout=15m --env-vars-file=____envvars.yaml",
|
|
2686
2686
|
"gcloud run deploy pan-test-app-stage-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-service-name=pan-test-app-stage-api --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=5 --cpu-throttling --allow-unauthenticated --ingress=all --cpu-boost",
|
|
2687
|
-
"gcloud
|
|
2687
|
+
"gcloud run jobs execute pan-test-app-stage-api-migration --project=google-project-id --region=europe-west6",
|
|
2688
2688
|
"echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
|
|
2689
2689
|
"echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
|
|
2690
2690
|
"gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-stage-api --limit=unlimited --sort-by=metadata.creationTimestamp --format="value(name)" --filter='(status.conditions.status=False OR status.conditions.status=Unknown)' | while read -r revisionname; do gcloud run revisions delete --project=google-project-id --region=europe-west6 --quiet $revisionname ; done",
|
|
@@ -2794,10 +2794,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
2794
2794
|
"gcloud auth activate-service-account --key-file=<(echo "$CL_prod_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
2795
2795
|
"gcloud run services delete pan-test-app-prod-api --project=google-project-id --region=europe-west6",
|
|
2796
2796
|
"gcloud scheduler jobs delete pan-test-app-prod-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
|
|
2797
|
-
"gcloud
|
|
2798
|
-
"gcloud
|
|
2799
|
-
"gcloud
|
|
2800
|
-
"gcloud
|
|
2797
|
+
"gcloud run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-prod-api-migration --format="value(name)" | xargs -I {} gcloud run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
|
|
2798
|
+
"gcloud run jobs delete pan-test-app-prod-api-migration --project=google-project-id --region=europe-west6",
|
|
2799
|
+
"gcloud run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-prod-api-send-reminders --format="value(name)" | xargs -I {} gcloud run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
|
|
2800
|
+
"gcloud run jobs delete pan-test-app-prod-api-send-reminders --project=google-project-id --region=europe-west6",
|
|
2801
2801
|
"gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags",
|
|
2802
2802
|
"gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
|
|
2803
2803
|
"echo Disabling component in Dependency Track",
|
|
@@ -2845,10 +2845,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
2845
2845
|
"gcloud auth activate-service-account --key-file=<(echo "$CL_stage_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
2846
2846
|
"gcloud run services delete pan-test-app-stage-api --project=google-project-id --region=europe-west6",
|
|
2847
2847
|
"gcloud scheduler jobs delete pan-test-app-stage-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
|
|
2848
|
-
"gcloud
|
|
2849
|
-
"gcloud
|
|
2850
|
-
"gcloud
|
|
2851
|
-
"gcloud
|
|
2848
|
+
"gcloud run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-stage-api-migration --format="value(name)" | xargs -I {} gcloud run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
|
|
2849
|
+
"gcloud run jobs delete pan-test-app-stage-api-migration --project=google-project-id --region=europe-west6",
|
|
2850
|
+
"gcloud run jobs executions list --project=google-project-id --region=europe-west6 --job pan-test-app-stage-api-send-reminders --format="value(name)" | xargs -I {} gcloud run jobs executions delete {} --quiet --project=google-project-id --region=europe-west6",
|
|
2851
|
+
"gcloud run jobs delete pan-test-app-stage-api-send-reminders --project=google-project-id --region=europe-west6",
|
|
2852
2852
|
"gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags",
|
|
2853
2853
|
"gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
|
|
2854
2854
|
"echo Disabling component in Dependency Track",
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { Config } from "../src";
|
|
2
|
+
import { createAllPipelines } from "./__utils__/helpers";
|
|
3
|
+
const config: Config = {
|
|
4
|
+
appName: "test-app",
|
|
5
|
+
customerName: "pan",
|
|
6
|
+
components: {
|
|
7
|
+
api: {
|
|
8
|
+
dir: "api",
|
|
9
|
+
build: {
|
|
10
|
+
type: "node",
|
|
11
|
+
},
|
|
12
|
+
deploy: {
|
|
13
|
+
type: "google-cloudrun",
|
|
14
|
+
projectId: "google-project-id",
|
|
15
|
+
region: "europe-west6",
|
|
16
|
+
|
|
17
|
+
service: {
|
|
18
|
+
executionEnvironment: "gen2",
|
|
19
|
+
},
|
|
20
|
+
},
|
|
21
|
+
},
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
it("matches snapshot", async () => {
|
|
26
|
+
expect(await createAllPipelines(config)).toMatchSnapshot();
|
|
27
|
+
});
|
package/package.json
CHANGED
|
@@ -8,6 +8,8 @@ import type {
|
|
|
8
8
|
import { createArgsString } from "../utils/createArgsString";
|
|
9
9
|
import { getCloudRunJobName } from "../utils/jobName";
|
|
10
10
|
import {
|
|
11
|
+
gcloudRunCmd,
|
|
12
|
+
gcloudSchedulerCmd,
|
|
11
13
|
getCloudRunDeployConfig,
|
|
12
14
|
getCommonCloudRunArgs,
|
|
13
15
|
getCommonDeployArgs,
|
|
@@ -23,7 +25,7 @@ const getJobRunScriptForJob = (
|
|
|
23
25
|
const commonArgs = getCommonCloudRunArgs(context);
|
|
24
26
|
|
|
25
27
|
const commonArgsString = createArgsString(commonArgs);
|
|
26
|
-
return
|
|
28
|
+
return `${gcloudRunCmd()} jobs execute ${jobName} ${commonArgsString}${
|
|
27
29
|
wait ? " --wait" : ""
|
|
28
30
|
}`;
|
|
29
31
|
};
|
|
@@ -37,7 +39,9 @@ export const getDeleteSchedulesScripts = (context: Context) => {
|
|
|
37
39
|
});
|
|
38
40
|
return jobsWithSchedule
|
|
39
41
|
.map(({ schedulerName }) => {
|
|
40
|
-
return [
|
|
42
|
+
return [
|
|
43
|
+
`${gcloudSchedulerCmd()} jobs delete ${schedulerName} ${argsString}`,
|
|
44
|
+
];
|
|
41
45
|
})
|
|
42
46
|
.flat();
|
|
43
47
|
};
|
|
@@ -49,8 +53,8 @@ export const getDeleteJobsScripts = (context: Context) => {
|
|
|
49
53
|
|
|
50
54
|
return jobsWithNames.flatMap(({ jobName }) => [
|
|
51
55
|
// first delete all job executions. Otherwise delete might fail if one of those is still running
|
|
52
|
-
|
|
53
|
-
|
|
56
|
+
`${gcloudRunCmd()} jobs executions list ${commonArgsString} --job ${jobName} --format="value(name)" | xargs -I {} ${gcloudRunCmd()} jobs executions delete {} --quiet ${commonArgsString}`,
|
|
57
|
+
`${gcloudRunCmd()} jobs delete ${jobName} ${commonArgsString}`,
|
|
54
58
|
]);
|
|
55
59
|
};
|
|
56
60
|
|
|
@@ -107,8 +111,8 @@ const getJobCreateScriptsForJob = (
|
|
|
107
111
|
|
|
108
112
|
const argsString = `${jobName} ${commonDeployArgsString}`;
|
|
109
113
|
return [
|
|
110
|
-
...allowFailureInScripts([
|
|
111
|
-
|
|
114
|
+
...allowFailureInScripts([`${gcloudRunCmd()} jobs create ${argsString}`]),
|
|
115
|
+
`${gcloudRunCmd()} jobs update ${argsString} --env-vars-file=____envvars.yaml`,
|
|
112
116
|
];
|
|
113
117
|
};
|
|
114
118
|
|
|
@@ -132,9 +136,9 @@ export const getCreateScheduleScripts = (context: Context) => {
|
|
|
132
136
|
const commonArgs = `http ${schedulerName} ${argsString}`;
|
|
133
137
|
return [
|
|
134
138
|
...allowFailureInScripts([
|
|
135
|
-
|
|
139
|
+
`${gcloudSchedulerCmd()} jobs create ${commonArgs}`,
|
|
136
140
|
]),
|
|
137
|
-
|
|
141
|
+
`${gcloudSchedulerCmd()} jobs update ${commonArgs}`,
|
|
138
142
|
];
|
|
139
143
|
})
|
|
140
144
|
.flat();
|
|
@@ -5,6 +5,7 @@ import type { DeployConfigCloudRunService } from "../../types/googleCloudRun";
|
|
|
5
5
|
import { createArgsString } from "../utils/createArgsString";
|
|
6
6
|
import { getServiceName } from "../utils/getServiceName";
|
|
7
7
|
import {
|
|
8
|
+
gcloudRunCmd,
|
|
8
9
|
getCommonCloudRunArgs,
|
|
9
10
|
getCommonDeployArgs,
|
|
10
11
|
makeLabelString,
|
|
@@ -47,9 +48,10 @@ export const getServiceDeployScript = (
|
|
|
47
48
|
"allow-unauthenticated": customConfig?.allowUnauthenticated ?? true,
|
|
48
49
|
ingress: customConfig?.ingress ?? "all",
|
|
49
50
|
"cpu-boost": true,
|
|
51
|
+
"execution-environment": customConfig?.executionEnvironment,
|
|
50
52
|
});
|
|
51
53
|
|
|
52
|
-
return
|
|
54
|
+
return `${gcloudRunCmd()} deploy ${fullServiceName} ${argsString}`;
|
|
53
55
|
};
|
|
54
56
|
|
|
55
57
|
export const getServiceDeleteScript = (
|
|
@@ -66,5 +68,7 @@ export const getServiceDeleteScript = (
|
|
|
66
68
|
? `${serviceName}-${serviceSuffix}`
|
|
67
69
|
: serviceName;
|
|
68
70
|
|
|
69
|
-
return [
|
|
71
|
+
return [
|
|
72
|
+
`${gcloudRunCmd()} services delete ${fullServiceName} ${commonArgsString}`,
|
|
73
|
+
];
|
|
70
74
|
};
|
|
@@ -4,10 +4,23 @@ import { isOfDeployType } from "../../types";
|
|
|
4
4
|
import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
|
|
5
5
|
import { getArtifactsRegistryImage } from "../artifactsRegistry";
|
|
6
6
|
|
|
7
|
+
export const gcloudCmd = (version?: "beta") => {
|
|
8
|
+
return version ? `gcloud ${version}` : "gcloud";
|
|
9
|
+
};
|
|
10
|
+
export const gcloudRunCmd = (version?: "beta") => {
|
|
11
|
+
return `${gcloudCmd(version)} run`;
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export const gcloudSchedulerCmd = (version?: "beta") => {
|
|
15
|
+
return `${gcloudCmd(version)} scheduler`;
|
|
16
|
+
};
|
|
17
|
+
|
|
7
18
|
export const setGoogleProjectNumberScript = (
|
|
8
19
|
deployConfig: DeployConfigCloudRun
|
|
9
20
|
) => [
|
|
10
|
-
`export GCLOUD_PROJECT_NUMBER=$(
|
|
21
|
+
`export GCLOUD_PROJECT_NUMBER=$(${gcloudCmd()} projects describe ${
|
|
22
|
+
deployConfig.projectId
|
|
23
|
+
} --format="value(projectNumber)")`,
|
|
11
24
|
`echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"`,
|
|
12
25
|
];
|
|
13
26
|
|
|
@@ -117,6 +117,16 @@ export type DeployConfigCloudRunService = {
|
|
|
117
117
|
* memory limit. Defaults to 512MB
|
|
118
118
|
*/
|
|
119
119
|
memory?: Memory;
|
|
120
|
+
|
|
121
|
+
/**
|
|
122
|
+
*
|
|
123
|
+
* set the execution environment.
|
|
124
|
+
*
|
|
125
|
+
* see https://cloud.google.com/run/docs/about-execution-environments
|
|
126
|
+
*
|
|
127
|
+
* defaults to gen1 according to gcloud
|
|
128
|
+
*/
|
|
129
|
+
executionEnvironment?: "gen2" | "gen1";
|
|
120
130
|
};
|
|
121
131
|
|
|
122
132
|
export type DeployConfigCloudRunJobBase = {
|
|
@@ -187,7 +197,7 @@ export type DeployConfigCloudRun = {
|
|
|
187
197
|
service?: boolean | DeployConfigCloudRunService;
|
|
188
198
|
|
|
189
199
|
/**
|
|
190
|
-
* deploy additional services with different entry points.
|
|
200
|
+
* deploy additional services with different entry points.
|
|
191
201
|
*/
|
|
192
202
|
additionalServices?: {
|
|
193
203
|
[name: string]: DeployConfigCloudRunService;
|