@catladder/pipeline 1.115.0 → 1.117.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.
Files changed (31) hide show
  1. package/dist/bundles/catladder-gitlab/index.js +1 -1
  2. package/dist/constants.js +1 -1
  3. package/dist/deploy/cloudRun/artifactsRegistry.d.ts +19 -0
  4. package/dist/deploy/cloudRun/artifactsRegistry.js +117 -0
  5. package/dist/deploy/cloudRun/cleanup.d.ts +2 -0
  6. package/dist/deploy/cloudRun/cleanup.js +51 -0
  7. package/dist/deploy/cloudRun/cloudRunRevisions.d.ts +2 -0
  8. package/dist/deploy/cloudRun/cloudRunRevisions.js +61 -0
  9. package/dist/deploy/cloudRun/deployJob.js +13 -14
  10. package/dist/deploy/cloudRun/utils/getServiceName.d.ts +2 -0
  11. package/dist/deploy/cloudRun/utils/getServiceName.js +8 -0
  12. package/dist/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.d.ts +9 -0
  13. package/dist/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.js +16 -0
  14. package/dist/tsconfig.tsbuildinfo +1 -1
  15. package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +46 -8
  16. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +46 -8
  17. package/examples/__snapshots__/cloud-run-non-public.ts.snap +46 -8
  18. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +92 -16
  19. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +92 -16
  20. package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +46 -8
  21. package/examples/__snapshots__/custom-build-job.ts.snap +46 -8
  22. package/examples/__snapshots__/custom-sbom-java.ts.snap +46 -8
  23. package/examples/__snapshots__/native-app.ts.snap +46 -8
  24. package/examples/__snapshots__/node-build-with-custom-image.ts.snap +46 -8
  25. package/package.json +1 -1
  26. package/src/deploy/cloudRun/artifactsRegistry.ts +119 -0
  27. package/src/deploy/cloudRun/cleanup.ts +30 -0
  28. package/src/deploy/cloudRun/cloudRunRevisions.ts +67 -0
  29. package/src/deploy/cloudRun/deployJob.ts +46 -44
  30. package/src/deploy/cloudRun/utils/getServiceName.ts +3 -0
  31. package/src/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.ts +12 -0
package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap CHANGED
@@ -251,25 +251,32 @@ COPY --chown=node:node .yarn /app/.yarn",
251
251
  },
252
252
  ],
253
253
  "script": [
254
+ "echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
254
255
  "echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
255
256
  ",
256
257
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
257
258
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
258
259
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
259
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0Kpushing image to artifacts registry"",
260
+ "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
261
+ "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
260
262
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
261
263
  "gcloud auth configure-docker europe-west6-docker.pkg.dev",
262
264
  "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
263
265
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
264
266
  "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
265
267
  "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
268
+ "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
266
269
  "echo "$ENV_VARS" > ____envvars.yaml",
267
270
  "set +e",
268
271
  "echo "ensuring Database..."",
269
272
  "gcloud sql databases create pan-test-app-dev-api --instance=instancename --project projectId",
270
273
  "set -e",
271
274
  "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 --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --cpu-boost",
272
- "docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG",
275
+ "echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
276
+ "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
277
+ "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",
278
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/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/dev/api@$version --quiet --delete-tags; done",
279
+ "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
273
280
  "echo Uploading SBOM to Dependency Track",
274
281
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-dev-api-unknown-host.example.com" "__sbom.json" vex.json || true",
275
282
  ],
@@ -369,6 +376,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
369
376
  ",
370
377
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
371
378
  "gcloud run services delete pan-test-app-dev-api --project=google-project-id --region=europe-west6",
379
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags",
372
380
  "echo Disabling component in Dependency Track",
373
381
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-dev-api-unknown-host.example.com" || true",
374
382
  "set -e",
@@ -720,25 +728,32 @@ COPY --chown=node:node .yarn /app/.yarn",
720
728
  },
721
729
  ],
722
730
  "script": [
731
+ "echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
723
732
  "echo $CL_dev_worker_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
724
733
  ",
725
734
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
726
735
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
727
736
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
728
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0Kpushing image to artifacts registry"",
737
+ "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
738
+ "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
729
739
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
730
740
  "gcloud auth configure-docker europe-west6-docker.pkg.dev",
731
741
  "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
732
742
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker:$DOCKER_IMAGE_TAG",
733
743
  "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker:$DOCKER_IMAGE_TAG",
734
744
  "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
745
+ "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
735
746
  "echo "$ENV_VARS" > ____envvars.yaml",
736
747
  "set +e",
737
748
  "echo "ensuring Database..."",
738
749
  "gcloud sql databases create pan-test-app-dev-api --instance=instancename --project projectId",
739
750
  "set -e",
740
751
  "gcloud run deploy pan-test-app-dev-worker --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=worker,app-name=test-app,env-type=dev,env-name=dev,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --cpu-boost",
741
- "docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker:$DOCKER_IMAGE_TAG",
752
+ "echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
753
+ "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
754
+ "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-dev-worker --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",
755
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker --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/dev/worker@$version --quiet --delete-tags; done",
756
+ "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
742
757
  "echo Uploading SBOM to Dependency Track",
743
758
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/worker" "https://pan-test-app-dev-worker-unknown-host.example.com" "__sbom.json" vex.json || true",
744
759
  ],
@@ -838,6 +853,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
838
853
  ",
839
854
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
840
855
  "gcloud run services delete pan-test-app-dev-worker --project=google-project-id --region=europe-west6",
856
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/worker --quiet --delete-tags",
841
857
  "echo Disabling component in Dependency Track",
842
858
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/worker" "https://pan-test-app-dev-worker-unknown-host.example.com" || true",
843
859
  "set -e",
@@ -1261,25 +1277,35 @@ COPY --chown=node:node .yarn /app/.yarn",
1261
1277
  },
1262
1278
  ],
1263
1279
  "script": [
1280
+ "echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
1264
1281
  "echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1265
1282
  ",
1266
1283
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1267
1284
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1268
1285
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1269
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0Kpushing image to artifacts registry"",
1286
+ "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1287
+ "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1270
1288
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1271
1289
  "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1272
1290
  "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1273
1291
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1274
1292
  "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1275
1293
  "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1294
+ "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1276
1295
  "echo "$ENV_VARS" > ____envvars.yaml",
1277
1296
  "set +e",
1278
1297
  "echo "ensuring Database..."",
1279
1298
  "gcloud sql databases create pan-test-app-review-mr1234-api --instance=instancename --project projectId",
1280
1299
  "set -e",
1281
1300
  "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 --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --cpu-boost",
1282
- "docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234:$DOCKER_IMAGE_TAG",
1301
+ "echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
1302
+ "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1303
+ "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",
1304
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234 --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/review/api/mr1234@$version --quiet --delete-tags; done",
1305
+ "set +e",
1306
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1307
+ "set -e",
1308
+ "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1283
1309
  "echo Uploading SBOM to Dependency Track",
1284
1310
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-review-mr1234-api-unknown-host.example.com" "__sbom.json" vex.json || true",
1285
1311
  ],
@@ -1388,6 +1414,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1388
1414
  sleep 10
1389
1415
  done
1390
1416
  ",
1417
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/mr1234 --quiet --delete-tags",
1418
+ "set +e",
1419
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
1420
+ "set -e",
1391
1421
  "echo Disabling component in Dependency Track",
1392
1422
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-review-mr1234-api-unknown-host.example.com" || true",
1393
1423
  "set -e",
@@ -1739,25 +1769,35 @@ COPY --chown=node:node .yarn /app/.yarn",
1739
1769
  },
1740
1770
  ],
1741
1771
  "script": [
1772
+ "echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
1742
1773
  "echo $CL_review_worker_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
1743
1774
  ",
1744
1775
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
1745
1776
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
1746
1777
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
1747
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0Kpushing image to artifacts registry"",
1778
+ "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
1779
+ "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
1748
1780
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1749
1781
  "gcloud auth configure-docker europe-west6-docker.pkg.dev",
1750
1782
  "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1751
1783
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234:$DOCKER_IMAGE_TAG",
1752
1784
  "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234:$DOCKER_IMAGE_TAG",
1753
1785
  "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
1786
+ "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
1754
1787
  "echo "$ENV_VARS" > ____envvars.yaml",
1755
1788
  "set +e",
1756
1789
  "echo "ensuring Database..."",
1757
1790
  "gcloud sql databases create pan-test-app-review-mr1234-api --instance=instancename --project projectId",
1758
1791
  "set -e",
1759
1792
  "gcloud run deploy pan-test-app-review-mr1234-worker --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=worker,app-name=test-app,env-type=review,env-name=review,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --cpu-boost",
1760
- "docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234:$DOCKER_IMAGE_TAG",
1793
+ "echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
1794
+ "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
1795
+ "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-review-mr1234-worker --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",
1796
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234 --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/review/worker/mr1234@$version --quiet --delete-tags; done",
1797
+ "set +e",
1798
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker --quiet --delete-tags",
1799
+ "set -e",
1800
+ "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
1761
1801
  "echo Uploading SBOM to Dependency Track",
1762
1802
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/worker" "https://pan-test-app-review-mr1234-worker-unknown-host.example.com" "__sbom.json" vex.json || true",
1763
1803
  ],
@@ -1866,6 +1906,10 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1866
1906
  sleep 10
1867
1907
  done
1868
1908
  ",
1909
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker/mr1234 --quiet --delete-tags",
1910
+ "set +e",
1911
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/worker --quiet --delete-tags",
1912
+ "set -e",
1869
1913
  "echo Disabling component in Dependency Track",
1870
1914
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/worker" "https://pan-test-app-review-mr1234-worker-unknown-host.example.com" || true",
1871
1915
  "set -e",
@@ -2383,25 +2427,32 @@ COPY --chown=node:node .yarn /app/.yarn",
2383
2427
  },
2384
2428
  ],
2385
2429
  "script": [
2430
+ "echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
2386
2431
  "echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
2387
2432
  ",
2388
2433
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2389
2434
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2390
2435
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2391
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0Kpushing image to artifacts registry"",
2436
+ "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2437
+ "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2392
2438
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2393
2439
  "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2394
2440
  "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2395
2441
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2396
2442
  "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2397
2443
  "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2444
+ "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2398
2445
  "echo "$ENV_VARS" > ____envvars.yaml",
2399
2446
  "set +e",
2400
2447
  "echo "ensuring Database..."",
2401
2448
  "gcloud sql databases create pan-test-app-prod-api --instance=instancename --project projectId",
2402
2449
  "set -e",
2403
2450
  "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 --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --cpu-boost",
2404
- "docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG",
2451
+ "echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
2452
+ "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2453
+ "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",
2454
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +7 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api@$version --quiet --delete-tags; done",
2455
+ "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2405
2456
  "echo Uploading SBOM to Dependency Track",
2406
2457
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-prod-api-unknown-host.example.com" "__sbom.json" vex.json || true",
2407
2458
  ],
@@ -2510,25 +2561,32 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2510
2561
  },
2511
2562
  ],
2512
2563
  "script": [
2564
+ "echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
2513
2565
  "echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
2514
2566
  ",
2515
2567
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2516
2568
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
2517
2569
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
2518
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0Kpushing image to artifacts registry"",
2570
+ "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
2571
+ "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
2519
2572
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2520
2573
  "gcloud auth configure-docker europe-west6-docker.pkg.dev",
2521
2574
  "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2522
2575
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2523
2576
  "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2524
2577
  "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
2578
+ "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
2525
2579
  "echo "$ENV_VARS" > ____envvars.yaml",
2526
2580
  "set +e",
2527
2581
  "echo "ensuring Database..."",
2528
2582
  "gcloud sql databases create pan-test-app-stage-api --instance=instancename --project projectId",
2529
2583
  "set -e",
2530
2584
  "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 --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --cpu-boost",
2531
- "docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG",
2585
+ "echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
2586
+ "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
2587
+ "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",
2588
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/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/stage/api@$version --quiet --delete-tags; done",
2589
+ "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
2532
2590
  "echo Uploading SBOM to Dependency Track",
2533
2591
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://pan-test-app-stage-api-unknown-host.example.com" "__sbom.json" vex.json || true",
2534
2592
  ],
@@ -2628,6 +2686,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2628
2686
  ",
2629
2687
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2630
2688
  "gcloud run services delete pan-test-app-prod-api --project=google-project-id --region=europe-west6",
2689
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags",
2631
2690
  "echo Disabling component in Dependency Track",
2632
2691
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-prod-api-unknown-host.example.com" || true",
2633
2692
  "set -e",
@@ -2675,6 +2734,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
2675
2734
  ",
2676
2735
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
2677
2736
  "gcloud run services delete pan-test-app-stage-api --project=google-project-id --region=europe-west6",
2737
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags",
2678
2738
  "echo Disabling component in Dependency Track",
2679
2739
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://pan-test-app-stage-api-unknown-host.example.com" || true",
2680
2740
  "set -e",
@@ -3075,25 +3135,32 @@ COPY --chown=node:node .yarn /app/.yarn",
3075
3135
  },
3076
3136
  ],
3077
3137
  "script": [
3138
+ "echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
3078
3139
  "echo $CL_prod_worker_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
3079
3140
  ",
3080
3141
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3081
3142
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3082
3143
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3083
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0Kpushing image to artifacts registry"",
3144
+ "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3145
+ "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3084
3146
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3085
3147
  "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3086
3148
  "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3087
3149
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker:$DOCKER_IMAGE_TAG",
3088
3150
  "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker:$DOCKER_IMAGE_TAG",
3089
3151
  "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3152
+ "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3090
3153
  "echo "$ENV_VARS" > ____envvars.yaml",
3091
3154
  "set +e",
3092
3155
  "echo "ensuring Database..."",
3093
3156
  "gcloud sql databases create pan-test-app-prod-api --instance=instancename --project projectId",
3094
3157
  "set -e",
3095
3158
  "gcloud run deploy pan-test-app-prod-worker --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=worker,app-name=test-app,env-type=prod,env-name=prod,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --cpu-boost",
3096
- "docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker:$DOCKER_IMAGE_TAG",
3159
+ "echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
3160
+ "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3161
+ "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-prod-worker --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",
3162
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker --sort-by=~CREATE_TIME --format="value(version)" | tail -n +7 | while read -r version; do gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker@$version --quiet --delete-tags; done",
3163
+ "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3097
3164
  "echo Uploading SBOM to Dependency Track",
3098
3165
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/worker" "https://pan-test-app-prod-worker-unknown-host.example.com" "__sbom.json" vex.json || true",
3099
3166
  ],
@@ -3202,25 +3269,32 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3202
3269
  },
3203
3270
  ],
3204
3271
  "script": [
3272
+ "echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
3205
3273
  "echo $CL_stage_worker_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
3206
3274
  ",
3207
3275
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3208
3276
  "export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe google-project-id --format="value(projectNumber)")",
3209
3277
  "echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
3210
- "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0Kpushing image to artifacts registry"",
3278
+ "echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
3279
+ "echo -e "\\e[0Ksection_start:$(date +%s):pushToArtifactRegistry[collapsed=true]\\r\\e[0KPushing image to artifacts registry"",
3211
3280
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3212
3281
  "gcloud auth configure-docker europe-west6-docker.pkg.dev",
3213
3282
  "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3214
3283
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker:$DOCKER_IMAGE_TAG",
3215
3284
  "docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker:$DOCKER_IMAGE_TAG",
3216
3285
  "echo -e "\\e[0Ksection_end:$(date +%s):pushToArtifactRegistry\\r\\e[0K"",
3286
+ "echo -e "\\e[0Ksection_start:$(date +%s):deploy[collapsed=true]\\r\\e[0KDeploy to cloud run"",
3217
3287
  "echo "$ENV_VARS" > ____envvars.yaml",
3218
3288
  "set +e",
3219
3289
  "echo "ensuring Database..."",
3220
3290
  "gcloud sql databases create pan-test-app-stage-api --instance=instancename --project projectId",
3221
3291
  "set -e",
3222
3292
  "gcloud run deploy pan-test-app-stage-worker --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,component-name=worker,app-name=test-app,env-type=stage,env-name=stage,build-type=node --env-vars-file=____envvars.yaml --min-instances=0 --max-instances=100 --cpu-throttling --allow-unauthenticated --cpu-boost",
3223
- "docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker:$DOCKER_IMAGE_TAG",
3293
+ "echo -e "\\e[0Ksection_end:$(date +%s):deploy\\r\\e[0K"",
3294
+ "echo -e "\\e[0Ksection_start:$(date +%s):cleanup[collapsed=true]\\r\\e[0KCleanup"",
3295
+ "gcloud run revisions list --project=google-project-id --region=europe-west6 --service=pan-test-app-stage-worker --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",
3296
+ "gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker --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/stage/worker@$version --quiet --delete-tags; done",
3297
+ "echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
3224
3298
  "echo Uploading SBOM to Dependency Track",
3225
3299
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/worker" "https://pan-test-app-stage-worker-unknown-host.example.com" "__sbom.json" vex.json || true",
3226
3300
  ],
@@ -3320,6 +3394,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3320
3394
  ",
3321
3395
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3322
3396
  "gcloud run services delete pan-test-app-prod-worker --project=google-project-id --region=europe-west6",
3397
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/worker --quiet --delete-tags",
3323
3398
  "echo Disabling component in Dependency Track",
3324
3399
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/worker" "https://pan-test-app-prod-worker-unknown-host.example.com" || true",
3325
3400
  "set -e",
@@ -3367,6 +3442,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
3367
3442
  ",
3368
3443
  "gcloud auth activate-service-account --key-file="./____keyfile.json"",
3369
3444
  "gcloud run services delete pan-test-app-stage-worker --project=google-project-id --region=europe-west6",
3445
+ "gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/worker --quiet --delete-tags",
3370
3446
  "echo Disabling component in Dependency Track",
3371
3447
  "/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/worker" "https://pan-test-app-stage-worker-unknown-host.example.com" || true",
3372
3448
  "set -e",