@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__/custom-build-job-with-tests.test.ts.snap CHANGED
@@ -373,8 +373,8 @@ www 🧪 test:
373
373
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
374
374
  - collapseable_section_end "cleanup"
375
375
  - echo 'Uploading SBOM to Dependency Track'
376
- - /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
377
- - 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
376
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
377
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
378
378
  environment:
379
379
  name: dev/www
380
380
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -422,12 +422,11 @@ www 🧪 test:
422
422
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags
423
423
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
424
424
  - echo 'Disabling component in Dependency Track'
425
- - /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
425
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
426
426
  - set -e
427
- - 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
427
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
428
428
  environment:
429
429
  name: dev/www
430
- url: $CL_GITLAB_ENVIRONMENT_URL
431
430
  action: stop
432
431
  artifacts:
433
432
  reports:
@@ -651,8 +650,8 @@ www 🧪 test:
651
650
  - set -e
652
651
  - collapseable_section_end "cleanup"
653
652
  - echo 'Uploading SBOM to Dependency Track'
654
- - /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
655
- - 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
653
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
654
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
656
655
  environment:
657
656
  name: review/$CI_COMMIT_REF_NAME/www
658
657
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -701,12 +700,11 @@ www 🧪 test:
701
700
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags
702
701
  - set -e
703
702
  - echo 'Disabling component in Dependency Track'
704
- - /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
703
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
705
704
  - set -e
706
- - 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
705
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
707
706
  environment:
708
707
  name: review/$CI_COMMIT_REF_NAME/www
709
- url: $CL_GITLAB_ENVIRONMENT_URL
710
708
  action: stop
711
709
  artifacts:
712
710
  reports:
@@ -925,8 +923,8 @@ www 🧪 test:
925
923
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
926
924
  - collapseable_section_end "cleanup"
927
925
  - echo 'Uploading SBOM to Dependency Track'
928
- - /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
929
- - 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
926
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
927
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
930
928
  environment:
931
929
  name: stage/www
932
930
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -965,12 +963,11 @@ www 🧪 test:
965
963
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags
966
964
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
967
965
  - echo 'Disabling component in Dependency Track'
968
- - /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
966
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
969
967
  - set -e
970
- - 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
968
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
971
969
  environment:
972
970
  name: stage/www
973
- url: $CL_GITLAB_ENVIRONMENT_URL
974
971
  action: stop
975
972
  artifacts:
976
973
  reports:
@@ -1189,8 +1186,8 @@ www 🧪 test:
1189
1186
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1190
1187
  - collapseable_section_end "cleanup"
1191
1188
  - echo 'Uploading SBOM to Dependency Track'
1192
- - /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
1193
- - 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
1189
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1190
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1194
1191
  environment:
1195
1192
  name: prod/www
1196
1193
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1229,12 +1226,11 @@ www 🧪 test:
1229
1226
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags
1230
1227
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1231
1228
  - echo 'Disabling component in Dependency Track'
1232
- - /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
1229
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1233
1230
  - set -e
1234
- - 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
1231
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1235
1232
  environment:
1236
1233
  name: prod/www
1237
- url: $CL_GITLAB_ENVIRONMENT_URL
1238
1234
  action: stop
1239
1235
  artifacts:
1240
1236
  reports:
package/examples/__snapshots__/custom-build-job.test.ts.snap CHANGED
@@ -286,8 +286,8 @@ before_script:
286
286
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
287
287
  - collapseable_section_end "cleanup"
288
288
  - echo 'Uploading SBOM to Dependency Track'
289
- - /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
290
- - 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
289
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
290
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
291
291
  environment:
292
292
  name: dev/www
293
293
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -329,12 +329,11 @@ before_script:
329
329
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags
330
330
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
331
331
  - echo 'Disabling component in Dependency Track'
332
- - /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
332
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
333
333
  - set -e
334
- - 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
334
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
335
335
  environment:
336
336
  name: dev/www
337
- url: $CL_GITLAB_ENVIRONMENT_URL
338
337
  action: stop
339
338
  artifacts:
340
339
  reports:
@@ -554,8 +553,8 @@ before_script:
554
553
  - set -e
555
554
  - collapseable_section_end "cleanup"
556
555
  - echo 'Uploading SBOM to Dependency Track'
557
- - /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
558
- - 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
556
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
557
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
559
558
  environment:
560
559
  name: review/$CI_COMMIT_REF_NAME/www
561
560
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -598,12 +597,11 @@ before_script:
598
597
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags
599
598
  - set -e
600
599
  - echo 'Disabling component in Dependency Track'
601
- - /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
600
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
602
601
  - set -e
603
- - 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
602
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
604
603
  environment:
605
604
  name: review/$CI_COMMIT_REF_NAME/www
606
- url: $CL_GITLAB_ENVIRONMENT_URL
607
605
  action: stop
608
606
  artifacts:
609
607
  reports:
@@ -818,8 +816,8 @@ before_script:
818
816
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
819
817
  - collapseable_section_end "cleanup"
820
818
  - echo 'Uploading SBOM to Dependency Track'
821
- - /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
822
- - 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
819
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
820
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
823
821
  environment:
824
822
  name: stage/www
825
823
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -858,12 +856,11 @@ before_script:
858
856
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags
859
857
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
860
858
  - echo 'Disabling component in Dependency Track'
861
- - /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
859
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
862
860
  - set -e
863
- - 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
861
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
864
862
  environment:
865
863
  name: stage/www
866
- url: $CL_GITLAB_ENVIRONMENT_URL
867
864
  action: stop
868
865
  artifacts:
869
866
  reports:
@@ -1078,8 +1075,8 @@ before_script:
1078
1075
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1079
1076
  - collapseable_section_end "cleanup"
1080
1077
  - echo 'Uploading SBOM to Dependency Track'
1081
- - /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
1082
- - 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
1078
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1079
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1083
1080
  environment:
1084
1081
  name: prod/www
1085
1082
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1118,12 +1115,11 @@ before_script:
1118
1115
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags
1119
1116
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/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 asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1120
1117
  - echo 'Disabling component in Dependency Track'
1121
- - /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
1118
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1122
1119
  - set -e
1123
- - 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
1120
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1124
1121
  environment:
1125
1122
  name: prod/www
1126
- url: $CL_GITLAB_ENVIRONMENT_URL
1127
1123
  action: stop
1128
1124
  artifacts:
1129
1125
  reports:
package/examples/__snapshots__/custom-deploy.test.ts.snap CHANGED
@@ -366,13 +366,11 @@ www 🧪 test:
366
366
  - cd www
367
367
  - echo 'would deploy'
368
368
  - echo 'Uploading SBOM to Dependency Track'
369
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true
370
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://unknown-host.example.com" >> gitlab_environment.env
369
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
370
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
371
371
  environment:
372
372
  name: dev/www
373
373
  url: $CL_GITLAB_ENVIRONMENT_URL
374
- on_stop: 'www 🛑 Stop ⚠️ | dev '
375
- auto_stop_in: 4 weeks
376
374
  artifacts:
377
375
  reports:
378
376
  dotenv: gitlab_environment.env
@@ -397,40 +395,6 @@ www 🧪 test:
397
395
  retry: *a1
398
396
  interruptible: true
399
397
  allow_failure: false
400
- 'www 🛑 Stop ⚠️ | dev ':
401
- stage: stop dev
402
- image: path/to/docker/jobs-default:the-version
403
- variables:
404
- KUBERNETES_CPU_REQUEST: '0.22'
405
- KUBERNETES_MEMORY_REQUEST: 200Mi
406
- KUBERNETES_MEMORY_LIMIT: 400Mi
407
- GIT_STRATEGY: none
408
- script:
409
- - collapseable_section_start "injectvars" "Injecting variables"
410
- - export DEPLOY_API_KEY="$CL_dev_www_DEPLOY_API_KEY"
411
- - collapseable_section_end "injectvars"
412
- - echo 'would stop'
413
- - echo 'Disabling component in Dependency Track'
414
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://unknown-host.example.com" || true
415
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://unknown-host.example.com" >> gitlab_environment.env
416
- environment:
417
- name: dev/www
418
- url: $CL_GITLAB_ENVIRONMENT_URL
419
- action: stop
420
- artifacts:
421
- reports:
422
- dotenv: gitlab_environment.env
423
- rules:
424
- - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
425
- when: on_success
426
- - when: never
427
- if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
428
- - when: manual
429
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
430
- needs: []
431
- retry: *a1
432
- interruptible: true
433
- allow_failure: true
434
398
  'www 🔨 app | review ':
435
399
  stage: build
436
400
  image: path/to/docker/jobs-default:the-version
@@ -607,9 +571,10 @@ www 🧪 test:
607
571
  - collapseable_section_end "injectvars"
608
572
  - cd www
609
573
  - echo 'would deploy'
574
+ - ROOT_URL="$(my deploy command)"
610
575
  - echo 'Uploading SBOM to Dependency Track'
611
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true
612
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://unknown-host.example.com" >> gitlab_environment.env
576
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
577
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
613
578
  environment:
614
579
  name: review/$CI_COMMIT_REF_NAME/www
615
580
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -651,11 +616,10 @@ www 🧪 test:
651
616
  - collapseable_section_end "injectvars"
652
617
  - echo 'would stop'
653
618
  - echo 'Disabling component in Dependency Track'
654
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://unknown-host.example.com" || true
655
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://unknown-host.example.com" >> gitlab_environment.env
619
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
620
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
656
621
  environment:
657
622
  name: review/$CI_COMMIT_REF_NAME/www
658
- url: $CL_GITLAB_ENVIRONMENT_URL
659
623
  action: stop
660
624
  artifacts:
661
625
  reports:
@@ -846,12 +810,11 @@ www 🧪 test:
846
810
  - cd www
847
811
  - echo 'would deploy'
848
812
  - echo 'Uploading SBOM to Dependency Track'
849
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true
850
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://unknown-host.example.com" >> gitlab_environment.env
813
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
814
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
851
815
  environment:
852
816
  name: stage/www
853
817
  url: $CL_GITLAB_ENVIRONMENT_URL
854
- on_stop: 'www 🛑 Stop ⚠️ | stage '
855
818
  artifacts:
856
819
  reports:
857
820
  dotenv: gitlab_environment.env
@@ -868,38 +831,6 @@ www 🧪 test:
868
831
  retry: *a1
869
832
  interruptible: true
870
833
  allow_failure: false
871
- 'www 🛑 Stop ⚠️ | stage ':
872
- stage: stop stage
873
- image: path/to/docker/jobs-default:the-version
874
- variables:
875
- KUBERNETES_CPU_REQUEST: '0.22'
876
- KUBERNETES_MEMORY_REQUEST: 200Mi
877
- KUBERNETES_MEMORY_LIMIT: 400Mi
878
- GIT_STRATEGY: none
879
- script:
880
- - collapseable_section_start "injectvars" "Injecting variables"
881
- - export DEPLOY_API_KEY="$CL_stage_www_DEPLOY_API_KEY"
882
- - collapseable_section_end "injectvars"
883
- - echo 'would stop'
884
- - echo 'Disabling component in Dependency Track'
885
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://unknown-host.example.com" || true
886
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://unknown-host.example.com" >> gitlab_environment.env
887
- environment:
888
- name: stage/www
889
- url: $CL_GITLAB_ENVIRONMENT_URL
890
- action: stop
891
- artifacts:
892
- reports:
893
- dotenv: gitlab_environment.env
894
- rules:
895
- - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
896
- when: on_success
897
- - when: manual
898
- if: $CI_COMMIT_TAG
899
- needs: []
900
- retry: *a1
901
- interruptible: true
902
- allow_failure: true
903
834
  'www 🔨 app | prod ':
904
835
  stage: build
905
836
  image: path/to/docker/jobs-default:the-version
@@ -1077,12 +1008,11 @@ www 🧪 test:
1077
1008
  - cd www
1078
1009
  - echo 'would deploy'
1079
1010
  - echo 'Uploading SBOM to Dependency Track'
1080
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true
1081
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://unknown-host.example.com" >> gitlab_environment.env
1011
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1012
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1082
1013
  environment:
1083
1014
  name: prod/www
1084
1015
  url: $CL_GITLAB_ENVIRONMENT_URL
1085
- on_stop: 'www 🛑 Stop ⚠️ | prod '
1086
1016
  artifacts:
1087
1017
  reports:
1088
1018
  dotenv: gitlab_environment.env
@@ -1099,38 +1029,6 @@ www 🧪 test:
1099
1029
  retry: *a1
1100
1030
  interruptible: true
1101
1031
  allow_failure: true
1102
- 'www 🛑 Stop ⚠️ | prod ':
1103
- stage: stop prod
1104
- image: path/to/docker/jobs-default:the-version
1105
- variables:
1106
- KUBERNETES_CPU_REQUEST: '0.22'
1107
- KUBERNETES_MEMORY_REQUEST: 200Mi
1108
- KUBERNETES_MEMORY_LIMIT: 400Mi
1109
- GIT_STRATEGY: none
1110
- script:
1111
- - collapseable_section_start "injectvars" "Injecting variables"
1112
- - export DEPLOY_API_KEY="$CL_prod_www_DEPLOY_API_KEY"
1113
- - collapseable_section_end "injectvars"
1114
- - echo 'would stop'
1115
- - echo 'Disabling component in Dependency Track'
1116
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://unknown-host.example.com" || true
1117
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://unknown-host.example.com" >> gitlab_environment.env
1118
- environment:
1119
- name: prod/www
1120
- url: $CL_GITLAB_ENVIRONMENT_URL
1121
- action: stop
1122
- artifacts:
1123
- reports:
1124
- dotenv: gitlab_environment.env
1125
- rules:
1126
- - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
1127
- when: on_success
1128
- - when: manual
1129
- if: $CI_COMMIT_TAG
1130
- needs: []
1131
- retry: *a1
1132
- interruptible: true
1133
- allow_failure: true
1134
1032
  create release:
1135
1033
  stage: release
1136
1034
  image: path/to/docker/semantic-release:the-version
package/examples/__snapshots__/custom-sbom-java.test.ts.snap CHANGED
@@ -288,8 +288,8 @@ before_script:
288
288
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app@$version --quiet --delete-tags; done
289
289
  - collapseable_section_end "cleanup"
290
290
  - echo 'Uploading SBOM to Dependency Track'
291
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://$(printf %s "pan-test-app-dev-app-$CL_dev_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
292
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-app-$CL_dev_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
291
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
292
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
293
293
  environment:
294
294
  name: dev/app
295
295
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -331,12 +331,11 @@ before_script:
331
331
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app --quiet --delete-tags
332
332
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app@$version --quiet --delete-tags; done
333
333
  - echo 'Disabling component in Dependency Track'
334
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://$(printf %s "pan-test-app-dev-app-$CL_dev_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
334
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
335
335
  - set -e
336
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-app-$CL_dev_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
336
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
337
337
  environment:
338
338
  name: dev/app
339
- url: $CL_GITLAB_ENVIRONMENT_URL
340
339
  action: stop
341
340
  artifacts:
342
341
  reports:
@@ -558,8 +557,8 @@ before_script:
558
557
  - set -e
559
558
  - collapseable_section_end "cleanup"
560
559
  - echo 'Uploading SBOM to Dependency Track'
561
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "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"; })-app-$CL_review_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
562
- - 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"; })-app-$CL_review_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
560
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
561
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
563
562
  environment:
564
563
  name: review/$CI_COMMIT_REF_NAME/app
565
564
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -602,12 +601,11 @@ before_script:
602
601
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app --quiet --delete-tags
603
602
  - set -e
604
603
  - echo 'Disabling component in Dependency Track'
605
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "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"; })-app-$CL_review_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
604
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
606
605
  - set -e
607
- - 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"; })-app-$CL_review_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
606
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
608
607
  environment:
609
608
  name: review/$CI_COMMIT_REF_NAME/app
610
- url: $CL_GITLAB_ENVIRONMENT_URL
611
609
  action: stop
612
610
  artifacts:
613
611
  reports:
@@ -824,8 +822,8 @@ before_script:
824
822
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app@$version --quiet --delete-tags; done
825
823
  - collapseable_section_end "cleanup"
826
824
  - echo 'Uploading SBOM to Dependency Track'
827
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://$(printf %s "pan-test-app-stage-app-$CL_stage_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
828
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-app-$CL_stage_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
825
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
826
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
829
827
  environment:
830
828
  name: stage/app
831
829
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -864,12 +862,11 @@ before_script:
864
862
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app --quiet --delete-tags
865
863
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app@$version --quiet --delete-tags; done
866
864
  - echo 'Disabling component in Dependency Track'
867
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://$(printf %s "pan-test-app-stage-app-$CL_stage_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
865
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
868
866
  - set -e
869
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-app-$CL_stage_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
867
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
870
868
  environment:
871
869
  name: stage/app
872
- url: $CL_GITLAB_ENVIRONMENT_URL
873
870
  action: stop
874
871
  artifacts:
875
872
  reports:
@@ -1086,8 +1083,8 @@ before_script:
1086
1083
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app@$version --quiet --delete-tags; done
1087
1084
  - collapseable_section_end "cleanup"
1088
1085
  - echo 'Uploading SBOM to Dependency Track'
1089
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://$(printf %s "pan-test-app-prod-app-$CL_prod_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1090
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-app-$CL_prod_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1086
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
1087
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1091
1088
  environment:
1092
1089
  name: prod/app
1093
1090
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1126,12 +1123,11 @@ before_script:
1126
1123
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app --quiet --delete-tags
1127
1124
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app@$version --quiet --delete-tags; done
1128
1125
  - echo 'Disabling component in Dependency Track'
1129
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://$(printf %s "pan-test-app-prod-app-$CL_prod_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1126
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
1130
1127
  - set -e
1131
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-app-$CL_prod_app_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1128
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1132
1129
  environment:
1133
1130
  name: prod/app
1134
- url: $CL_GITLAB_ENVIRONMENT_URL
1135
1131
  action: stop
1136
1132
  artifacts:
1137
1133
  reports: