@catladder/pipeline 2.2.4 → 2.4.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 (57) hide show
  1. package/dist/constants.js +1 -1
  2. package/dist/deploy/base/deploy.js +1 -1
  3. package/dist/deploy/cloudRun/createJobs/cloudRunJobs.js +7 -4
  4. package/dist/deploy/sbom.js +3 -2
  5. package/dist/deploy/types/googleCloudRun.d.ts +6 -0
  6. package/dist/pipeline/gitlab/createGitlabJobs.js +6 -4
  7. package/dist/tsconfig.tsbuildinfo +1 -1
  8. package/examples/__snapshots__/cloud-run-http2.test.ts.snap +16 -20
  9. package/examples/__snapshots__/cloud-run-memory-limit.test.ts.snap +16 -20
  10. package/examples/__snapshots__/cloud-run-meteor-with-worker.test.ts.snap +16 -20
  11. package/examples/__snapshots__/cloud-run-nextjs.test.ts.snap +16 -20
  12. package/examples/__snapshots__/cloud-run-no-cpu-throttling.test.ts.snap +16 -20
  13. package/examples/__snapshots__/cloud-run-no-service.test.ts.snap +16 -20
  14. package/examples/__snapshots__/cloud-run-non-public.test.ts.snap +16 -20
  15. package/examples/__snapshots__/cloud-run-post-stop-job.test.ts.snap +16 -20
  16. package/examples/__snapshots__/cloud-run-service-custom-vpc-connector.test.ts.snap +16 -20
  17. package/examples/__snapshots__/cloud-run-service-custom-vpc.test.ts.snap +16 -20
  18. package/examples/__snapshots__/cloud-run-service-gen2.test.ts.snap +16 -20
  19. package/examples/__snapshots__/cloud-run-service-increase-timout.test.ts.snap +16 -20
  20. package/examples/__snapshots__/cloud-run-service-with-volumes.test.ts.snap +16 -20
  21. package/examples/__snapshots__/cloud-run-storybook.test.ts.snap +16 -20
  22. package/examples/__snapshots__/cloud-run-with-ngnix.test.ts.snap +16 -20
  23. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.test.ts.snap +32 -40
  24. package/examples/__snapshots__/cloud-run-with-sql.test.ts.snap +20 -24
  25. package/examples/__snapshots__/cloud-run-with-worker.test.ts.snap +16 -20
  26. package/examples/__snapshots__/custom-build-job-with-tests.test.ts.snap +16 -20
  27. package/examples/__snapshots__/custom-build-job.test.ts.snap +16 -20
  28. package/examples/__snapshots__/custom-deploy.test.ts.snap +11 -113
  29. package/examples/__snapshots__/custom-sbom-java.test.ts.snap +16 -20
  30. package/examples/__snapshots__/custom-verify-job.test.ts.snap +1632 -0
  31. package/examples/__snapshots__/git-submodule.test.ts.snap +16 -20
  32. package/examples/__snapshots__/kubernetes-application-customization.test.ts.snap +20 -28
  33. package/examples/__snapshots__/kubernetes-with-cloud-sql.test.ts.snap +20 -28
  34. package/examples/__snapshots__/kubernetes-with-jobs.test.ts.snap +40 -56
  35. package/examples/__snapshots__/kubernetes-with-mongodb.test.ts.snap +20 -28
  36. package/examples/__snapshots__/local-dot-env.test.ts.snap +16 -20
  37. package/examples/__snapshots__/meteor-kubernetes.test.ts.snap +20 -28
  38. package/examples/__snapshots__/multiline-var.test.ts.snap +52 -68
  39. package/examples/__snapshots__/native-app.test.ts.snap +48 -24
  40. package/examples/__snapshots__/node-build-with-custom-image.test.ts.snap +16 -20
  41. package/examples/__snapshots__/node-build-with-docker-additions.test.ts.snap +16 -20
  42. package/examples/__snapshots__/rails-k8s-with-worker-dockerfile.test.ts.snap +20 -28
  43. package/examples/__snapshots__/rails-k8s-with-worker.test.ts.snap +20 -28
  44. package/examples/__snapshots__/referencing-other-vars.test.ts.snap +52 -68
  45. package/examples/__snapshots__/wait-for-other-deploy.test.ts.snap +64 -8
  46. package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap +32 -40
  47. package/examples/__snapshots__/workspace-api-www.test.ts.snap +32 -40
  48. package/examples/cloud-run-with-sql.ts +2 -1
  49. package/examples/custom-deploy.ts +8 -1
  50. package/examples/custom-verify-job.test.ts +11 -0
  51. package/examples/custom-verify-job.ts +64 -0
  52. package/package.json +1 -1
  53. package/src/deploy/base/deploy.ts +1 -1
  54. package/src/deploy/cloudRun/createJobs/cloudRunJobs.ts +11 -8
  55. package/src/deploy/sbom.ts +3 -2
  56. package/src/deploy/types/googleCloudRun.ts +6 -0
  57. package/src/pipeline/gitlab/createGitlabJobs.ts +6 -2
package/examples/__snapshots__/wait-for-other-deploy.test.ts.snap CHANGED
@@ -300,7 +300,14 @@ api 🧪 test:
300
300
  - cd api
301
301
  - yarn deploy
302
302
  - echo 'Uploading SBOM to Dependency Track'
303
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://unknown-host.example.com" "__sbom.json" vex.json || true
303
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
304
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
305
+ environment:
306
+ name: dev/api
307
+ url: $CL_GITLAB_ENVIRONMENT_URL
308
+ artifacts:
309
+ reports:
310
+ dotenv: gitlab_environment.env
304
311
  rules:
305
312
  - when: never
306
313
  if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
@@ -433,7 +440,14 @@ api 🧪 test:
433
440
  - cd api
434
441
  - yarn deploy
435
442
  - echo 'Uploading SBOM to Dependency Track'
436
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://unknown-host.example.com" "__sbom.json" vex.json || true
443
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
444
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
445
+ environment:
446
+ name: review/$CI_COMMIT_REF_NAME/api
447
+ url: $CL_GITLAB_ENVIRONMENT_URL
448
+ artifacts:
449
+ reports:
450
+ dotenv: gitlab_environment.env
437
451
  rules:
438
452
  - when: on_success
439
453
  if: $CI_MERGE_REQUEST_ID
@@ -564,7 +578,14 @@ api 🧪 test:
564
578
  - cd api
565
579
  - yarn deploy
566
580
  - echo 'Uploading SBOM to Dependency Track'
567
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://unknown-host.example.com" "__sbom.json" vex.json || true
581
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
582
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
583
+ environment:
584
+ name: stage/api
585
+ url: $CL_GITLAB_ENVIRONMENT_URL
586
+ artifacts:
587
+ reports:
588
+ dotenv: gitlab_environment.env
568
589
  rules:
569
590
  - when: on_success
570
591
  if: $CI_COMMIT_TAG
@@ -689,7 +710,14 @@ api 🧪 test:
689
710
  - cd api
690
711
  - yarn deploy
691
712
  - echo 'Uploading SBOM to Dependency Track'
692
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://unknown-host.example.com" "__sbom.json" vex.json || true
713
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
714
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
715
+ environment:
716
+ name: prod/api
717
+ url: $CL_GITLAB_ENVIRONMENT_URL
718
+ artifacts:
719
+ reports:
720
+ dotenv: gitlab_environment.env
693
721
  rules:
694
722
  - when: manual
695
723
  if: $CI_COMMIT_TAG
@@ -922,7 +950,14 @@ www 🧪 test:
922
950
  - cd www
923
951
  - yarn deploy
924
952
  - echo 'Uploading SBOM to Dependency Track'
925
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true
953
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
954
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
955
+ environment:
956
+ name: dev/www
957
+ url: $CL_GITLAB_ENVIRONMENT_URL
958
+ artifacts:
959
+ reports:
960
+ dotenv: gitlab_environment.env
926
961
  rules:
927
962
  - when: never
928
963
  if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
@@ -1057,7 +1092,14 @@ www 🧪 test:
1057
1092
  - cd www
1058
1093
  - yarn deploy
1059
1094
  - echo 'Uploading SBOM to Dependency Track'
1060
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true
1095
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1096
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1097
+ environment:
1098
+ name: review/$CI_COMMIT_REF_NAME/www
1099
+ url: $CL_GITLAB_ENVIRONMENT_URL
1100
+ artifacts:
1101
+ reports:
1102
+ dotenv: gitlab_environment.env
1061
1103
  rules:
1062
1104
  - when: on_success
1063
1105
  if: $CI_MERGE_REQUEST_ID
@@ -1190,7 +1232,14 @@ www 🧪 test:
1190
1232
  - cd www
1191
1233
  - yarn deploy
1192
1234
  - echo 'Uploading SBOM to Dependency Track'
1193
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true
1235
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1236
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1237
+ environment:
1238
+ name: stage/www
1239
+ url: $CL_GITLAB_ENVIRONMENT_URL
1240
+ artifacts:
1241
+ reports:
1242
+ dotenv: gitlab_environment.env
1194
1243
  rules:
1195
1244
  - when: on_success
1196
1245
  if: $CI_COMMIT_TAG
@@ -1317,7 +1366,14 @@ www 🧪 test:
1317
1366
  - cd www
1318
1367
  - yarn deploy
1319
1368
  - echo 'Uploading SBOM to Dependency Track'
1320
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true
1369
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1370
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1371
+ environment:
1372
+ name: prod/www
1373
+ url: $CL_GITLAB_ENVIRONMENT_URL
1374
+ artifacts:
1375
+ reports:
1376
+ dotenv: gitlab_environment.env
1321
1377
  rules:
1322
1378
  - when: manual
1323
1379
  if: $CI_COMMIT_TAG
package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap CHANGED
@@ -703,8 +703,8 @@ before_script:
703
703
  - 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
704
704
  - collapseable_section_end "cleanup"
705
705
  - echo 'Uploading SBOM to Dependency Track'
706
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
707
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
706
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
707
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
708
708
  environment:
709
709
  name: dev/api
710
710
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -750,12 +750,11 @@ before_script:
750
750
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags
751
751
  - 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
752
752
  - echo 'Disabling component in Dependency Track'
753
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
753
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
754
754
  - set -e
755
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
755
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
756
756
  environment:
757
757
  name: dev/api
758
- url: $CL_GITLAB_ENVIRONMENT_URL
759
758
  action: stop
760
759
  artifacts:
761
760
  reports:
@@ -928,8 +927,8 @@ before_script:
928
927
  - set -e
929
928
  - collapseable_section_end "cleanup"
930
929
  - echo 'Uploading SBOM to Dependency Track'
931
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(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"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
932
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(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"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
930
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
931
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
933
932
  environment:
934
933
  name: review/$CI_COMMIT_REF_NAME/api
935
934
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -976,12 +975,11 @@ before_script:
976
975
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags
977
976
  - set -e
978
977
  - echo 'Disabling component in Dependency Track'
979
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(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"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
978
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
980
979
  - set -e
981
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(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"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
980
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
982
981
  environment:
983
982
  name: review/$CI_COMMIT_REF_NAME/api
984
- url: $CL_GITLAB_ENVIRONMENT_URL
985
983
  action: stop
986
984
  artifacts:
987
985
  reports:
@@ -1149,8 +1147,8 @@ before_script:
1149
1147
  - 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
1150
1148
  - collapseable_section_end "cleanup"
1151
1149
  - echo 'Uploading SBOM to Dependency Track'
1152
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1153
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1150
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
1151
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1154
1152
  environment:
1155
1153
  name: stage/api
1156
1154
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1187,12 +1185,11 @@ before_script:
1187
1185
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags
1188
1186
  - 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
1189
1187
  - echo 'Disabling component in Dependency Track'
1190
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1188
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
1191
1189
  - set -e
1192
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1190
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1193
1191
  environment:
1194
1192
  name: stage/api
1195
- url: $CL_GITLAB_ENVIRONMENT_URL
1196
1193
  action: stop
1197
1194
  artifacts:
1198
1195
  reports:
@@ -1360,8 +1357,8 @@ before_script:
1360
1357
  - 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
1361
1358
  - collapseable_section_end "cleanup"
1362
1359
  - echo 'Uploading SBOM to Dependency Track'
1363
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1364
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1360
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
1361
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1365
1362
  environment:
1366
1363
  name: prod/api
1367
1364
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1398,12 +1395,11 @@ before_script:
1398
1395
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags
1399
1396
  - 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
1400
1397
  - echo 'Disabling component in Dependency Track'
1401
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1398
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
1402
1399
  - set -e
1403
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1400
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1404
1401
  environment:
1405
1402
  name: prod/api
1406
- url: $CL_GITLAB_ENVIRONMENT_URL
1407
1403
  action: stop
1408
1404
  artifacts:
1409
1405
  reports:
@@ -1578,8 +1574,8 @@ before_script:
1578
1574
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
1579
1575
  - collapseable_section_end "cleanup"
1580
1576
  - echo 'Uploading SBOM to Dependency Track'
1581
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1582
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1577
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1578
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1583
1579
  environment:
1584
1580
  name: dev/www
1585
1581
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1625,12 +1621,11 @@ before_script:
1625
1621
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags
1626
1622
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
1627
1623
  - echo 'Disabling component in Dependency Track'
1628
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1624
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1629
1625
  - set -e
1630
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1626
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1631
1627
  environment:
1632
1628
  name: dev/www
1633
- url: $CL_GITLAB_ENVIRONMENT_URL
1634
1629
  action: stop
1635
1630
  artifacts:
1636
1631
  reports:
@@ -1806,8 +1801,8 @@ before_script:
1806
1801
  - set -e
1807
1802
  - collapseable_section_end "cleanup"
1808
1803
  - echo 'Uploading SBOM to Dependency Track'
1809
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(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"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1810
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(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"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1804
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1805
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1811
1806
  environment:
1812
1807
  name: review/$CI_COMMIT_REF_NAME/www
1813
1808
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1854,12 +1849,11 @@ before_script:
1854
1849
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www --quiet --delete-tags
1855
1850
  - set -e
1856
1851
  - echo 'Disabling component in Dependency Track'
1857
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(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"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1852
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1858
1853
  - set -e
1859
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(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"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1854
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1860
1855
  environment:
1861
1856
  name: review/$CI_COMMIT_REF_NAME/www
1862
- url: $CL_GITLAB_ENVIRONMENT_URL
1863
1857
  action: stop
1864
1858
  artifacts:
1865
1859
  reports:
@@ -2030,8 +2024,8 @@ before_script:
2030
2024
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
2031
2025
  - collapseable_section_end "cleanup"
2032
2026
  - echo 'Uploading SBOM to Dependency Track'
2033
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
2034
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2027
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
2028
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2035
2029
  environment:
2036
2030
  name: stage/www
2037
2031
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2068,12 +2062,11 @@ before_script:
2068
2062
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags
2069
2063
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
2070
2064
  - echo 'Disabling component in Dependency Track'
2071
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
2065
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
2072
2066
  - set -e
2073
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2067
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2074
2068
  environment:
2075
2069
  name: stage/www
2076
- url: $CL_GITLAB_ENVIRONMENT_URL
2077
2070
  action: stop
2078
2071
  artifacts:
2079
2072
  reports:
@@ -2244,8 +2237,8 @@ before_script:
2244
2237
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
2245
2238
  - collapseable_section_end "cleanup"
2246
2239
  - echo 'Uploading SBOM to Dependency Track'
2247
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
2248
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2240
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
2241
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2249
2242
  environment:
2250
2243
  name: prod/www
2251
2244
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2282,12 +2275,11 @@ before_script:
2282
2275
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags
2283
2276
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
2284
2277
  - echo 'Disabling component in Dependency Track'
2285
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
2278
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
2286
2279
  - set -e
2287
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2280
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2288
2281
  environment:
2289
2282
  name: prod/www
2290
- url: $CL_GITLAB_ENVIRONMENT_URL
2291
2283
  action: stop
2292
2284
  artifacts:
2293
2285
  reports:
package/examples/__snapshots__/workspace-api-www.test.ts.snap CHANGED
@@ -695,8 +695,8 @@ before_script:
695
695
  - 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
696
696
  - collapseable_section_end "cleanup"
697
697
  - echo 'Uploading SBOM to Dependency Track'
698
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
699
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
698
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
699
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
700
700
  environment:
701
701
  name: dev/api
702
702
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -742,12 +742,11 @@ before_script:
742
742
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags
743
743
  - 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
744
744
  - echo 'Disabling component in Dependency Track'
745
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
745
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
746
746
  - set -e
747
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
747
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
748
748
  environment:
749
749
  name: dev/api
750
- url: $CL_GITLAB_ENVIRONMENT_URL
751
750
  action: stop
752
751
  artifacts:
753
752
  reports:
@@ -920,8 +919,8 @@ before_script:
920
919
  - set -e
921
920
  - collapseable_section_end "cleanup"
922
921
  - echo 'Uploading SBOM to Dependency Track'
923
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(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"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
924
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(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"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
922
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
923
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
925
924
  environment:
926
925
  name: review/$CI_COMMIT_REF_NAME/api
927
926
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -968,12 +967,11 @@ before_script:
968
967
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api --quiet --delete-tags
969
968
  - set -e
970
969
  - echo 'Disabling component in Dependency Track'
971
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(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"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
970
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
972
971
  - set -e
973
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(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"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
972
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
974
973
  environment:
975
974
  name: review/$CI_COMMIT_REF_NAME/api
976
- url: $CL_GITLAB_ENVIRONMENT_URL
977
975
  action: stop
978
976
  artifacts:
979
977
  reports:
@@ -1141,8 +1139,8 @@ before_script:
1141
1139
  - 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
1142
1140
  - collapseable_section_end "cleanup"
1143
1141
  - echo 'Uploading SBOM to Dependency Track'
1144
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1145
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1142
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
1143
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1146
1144
  environment:
1147
1145
  name: stage/api
1148
1146
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1179,12 +1177,11 @@ before_script:
1179
1177
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags
1180
1178
  - 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
1181
1179
  - echo 'Disabling component in Dependency Track'
1182
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1180
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
1183
1181
  - set -e
1184
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1182
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1185
1183
  environment:
1186
1184
  name: stage/api
1187
- url: $CL_GITLAB_ENVIRONMENT_URL
1188
1185
  action: stop
1189
1186
  artifacts:
1190
1187
  reports:
@@ -1352,8 +1349,8 @@ before_script:
1352
1349
  - 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
1353
1350
  - collapseable_section_end "cleanup"
1354
1351
  - echo 'Uploading SBOM to Dependency Track'
1355
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1356
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1352
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
1353
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1357
1354
  environment:
1358
1355
  name: prod/api
1359
1356
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1390,12 +1387,11 @@ before_script:
1390
1387
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags
1391
1388
  - 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
1392
1389
  - echo 'Disabling component in Dependency Track'
1393
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1390
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
1394
1391
  - set -e
1395
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1392
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1396
1393
  environment:
1397
1394
  name: prod/api
1398
- url: $CL_GITLAB_ENVIRONMENT_URL
1399
1395
  action: stop
1400
1396
  artifacts:
1401
1397
  reports:
@@ -1570,8 +1566,8 @@ before_script:
1570
1566
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
1571
1567
  - collapseable_section_end "cleanup"
1572
1568
  - echo 'Uploading SBOM to Dependency Track'
1573
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1574
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1569
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1570
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1575
1571
  environment:
1576
1572
  name: dev/www
1577
1573
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1617,12 +1613,11 @@ before_script:
1617
1613
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags
1618
1614
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
1619
1615
  - echo 'Disabling component in Dependency Track'
1620
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1616
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1621
1617
  - set -e
1622
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1618
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1623
1619
  environment:
1624
1620
  name: dev/www
1625
- url: $CL_GITLAB_ENVIRONMENT_URL
1626
1621
  action: stop
1627
1622
  artifacts:
1628
1623
  reports:
@@ -1798,8 +1793,8 @@ before_script:
1798
1793
  - set -e
1799
1794
  - collapseable_section_end "cleanup"
1800
1795
  - echo 'Uploading SBOM to Dependency Track'
1801
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(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"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1802
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(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"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1796
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1797
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1803
1798
  environment:
1804
1799
  name: review/$CI_COMMIT_REF_NAME/www
1805
1800
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1846,12 +1841,11 @@ before_script:
1846
1841
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/www --quiet --delete-tags
1847
1842
  - set -e
1848
1843
  - echo 'Disabling component in Dependency Track'
1849
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(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"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1844
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1850
1845
  - set -e
1851
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(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"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1846
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1852
1847
  environment:
1853
1848
  name: review/$CI_COMMIT_REF_NAME/www
1854
- url: $CL_GITLAB_ENVIRONMENT_URL
1855
1849
  action: stop
1856
1850
  artifacts:
1857
1851
  reports:
@@ -2022,8 +2016,8 @@ before_script:
2022
2016
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
2023
2017
  - collapseable_section_end "cleanup"
2024
2018
  - echo 'Uploading SBOM to Dependency Track'
2025
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
2026
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2019
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
2020
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2027
2021
  environment:
2028
2022
  name: stage/www
2029
2023
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2060,12 +2054,11 @@ before_script:
2060
2054
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags
2061
2055
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
2062
2056
  - echo 'Disabling component in Dependency Track'
2063
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
2057
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
2064
2058
  - set -e
2065
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2059
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2066
2060
  environment:
2067
2061
  name: stage/www
2068
- url: $CL_GITLAB_ENVIRONMENT_URL
2069
2062
  action: stop
2070
2063
  artifacts:
2071
2064
  reports:
@@ -2236,8 +2229,8 @@ before_script:
2236
2229
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
2237
2230
  - collapseable_section_end "cleanup"
2238
2231
  - echo 'Uploading SBOM to Dependency Track'
2239
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
2240
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2232
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
2233
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2241
2234
  environment:
2242
2235
  name: prod/www
2243
2236
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2274,12 +2267,11 @@ before_script:
2274
2267
  - gcloud artifacts docker images delete europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags
2275
2268
  - gcloud artifacts docker images list europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/caches/www --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/www@$version --quiet --delete-tags; done
2276
2269
  - echo 'Disabling component in Dependency Track'
2277
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
2270
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
2278
2271
  - set -e
2279
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2272
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2280
2273
  environment:
2281
2274
  name: prod/www
2282
- url: $CL_GITLAB_ENVIRONMENT_URL
2283
2275
  action: stop
2284
2276
  artifacts:
2285
2277
  reports:
package/examples/cloud-run-with-sql.ts CHANGED
@@ -26,8 +26,9 @@ const config: Config = {
26
26
  },
27
27
  jobs: {
28
28
  migration: {
29
- when: "postDeploy",
29
+ when: "preDeploy",
30
30
  command: "yarn migrate",
31
+ waitForCompletion: true,
31
32
  },
32
33
  ["send-reminders"]: {
33
34
  when: "schedule",
package/examples/custom-deploy.ts CHANGED
@@ -23,7 +23,14 @@ const config: Config = {
23
23
  KUBERNETES_MEMORY_LIMIT: "2048Mi",
24
24
  },
25
25
  script: ["echo 'would deploy'"],
26
- stopScript: ["echo 'would stop'"],
26
+ },
27
+ env: {
28
+ review: {
29
+ deploy: {
30
+ script: ['ROOT_URL="$(my deploy command)"'],
31
+ stopScript: ["echo 'would stop'"],
32
+ },
33
+ },
27
34
  },
28
35
  },
29
36
  },
package/examples/custom-verify-job.test.ts ADDED
@@ -0,0 +1,11 @@
1
+ import { createYamlLocalPipeline } from "./__utils__/helpers";
2
+ import config from "./custom-verify-job";
3
+
4
+ /**
5
+ * This test is auto-generated.
6
+ * Modifications will be overwritten on every `yarn test` run!
7
+ */
8
+
9
+ it("matches snapshot for custom-verify-job local pipeline YAML", async () => {
10
+ expect(await createYamlLocalPipeline(config)).toMatchSnapshot();
11
+ });