@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__/rails-k8s-with-worker.test.ts.snap CHANGED
@@ -333,9 +333,9 @@ app 🧪 test:
333
333
  - kubernetesCreateSecret
334
334
  - kubernetesDeploy
335
335
  - echo 'Uploading SBOM to Dependency Track'
336
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://app.dev.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
336
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
337
337
  - echo deployment successful 😻
338
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
338
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
339
339
  environment:
340
340
  name: dev/app
341
341
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -404,11 +404,10 @@ app 🧪 test:
404
404
  - kubectl config use-context "kube-pan-test-app-dev-app"
405
405
  - kubernetesDelete
406
406
  - echo 'Disabling component in Dependency Track'
407
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://app.dev.test-app.pan.panter.cloud" || true
408
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
407
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
408
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
409
409
  environment:
410
410
  name: dev/app
411
- url: $CL_GITLAB_ENVIRONMENT_URL
412
411
  action: stop
413
412
  artifacts:
414
413
  reports:
@@ -464,10 +463,9 @@ app 🧪 test:
464
463
  - kubectl config set-context "kube-pan-test-app-dev-app" --cluster="kube-pan-test-app-dev-app" --user="kube-pan-test-app-dev-app" --namespace="pan-test-app-dev"
465
464
  - kubectl config use-context "kube-pan-test-app-dev-app"
466
465
  - kubernetesRollback
467
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
466
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
468
467
  environment:
469
468
  name: dev/app
470
- url: $CL_GITLAB_ENVIRONMENT_URL
471
469
  action: access
472
470
  artifacts:
473
471
  reports:
@@ -672,9 +670,9 @@ app 🧪 test:
672
670
  - kubernetesCreateSecret
673
671
  - kubernetesDeploy
674
672
  - echo 'Uploading SBOM to Dependency Track'
675
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://app.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
673
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
676
674
  - echo deployment successful 😻
677
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" >> gitlab_environment.env
675
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
678
676
  environment:
679
677
  name: review/$CI_COMMIT_REF_NAME/app
680
678
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -741,11 +739,10 @@ app 🧪 test:
741
739
  - kubectl config use-context "kube-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"
742
740
  - kubernetesDelete
743
741
  - echo 'Disabling component in Dependency Track'
744
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://app.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" || true
745
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" >> gitlab_environment.env
742
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
743
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
746
744
  environment:
747
745
  name: review/$CI_COMMIT_REF_NAME/app
748
- url: $CL_GITLAB_ENVIRONMENT_URL
749
746
  action: stop
750
747
  artifacts:
751
748
  reports:
@@ -799,10 +796,9 @@ app 🧪 test:
799
796
  - kubectl config set-context "kube-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" --cluster="kube-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" --user="kube-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" --namespace="pan-test-app-review"
800
797
  - kubectl config use-context "kube-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"
801
798
  - kubernetesRollback
802
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" >> gitlab_environment.env
799
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
803
800
  environment:
804
801
  name: review/$CI_COMMIT_REF_NAME/app
805
- url: $CL_GITLAB_ENVIRONMENT_URL
806
802
  action: access
807
803
  artifacts:
808
804
  reports:
@@ -999,9 +995,9 @@ app 🧪 test:
999
995
  - kubernetesCreateSecret
1000
996
  - kubernetesDeploy
1001
997
  - echo 'Uploading SBOM to Dependency Track'
1002
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://app.stage.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
998
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
1003
999
  - echo deployment successful 😻
1004
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
1000
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1005
1001
  environment:
1006
1002
  name: stage/app
1007
1003
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1061,11 +1057,10 @@ app 🧪 test:
1061
1057
  - kubectl config use-context "kube-pan-test-app-stage-app"
1062
1058
  - kubernetesDelete
1063
1059
  - echo 'Disabling component in Dependency Track'
1064
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://app.stage.test-app.pan.panter.cloud" || true
1065
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
1060
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
1061
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1066
1062
  environment:
1067
1063
  name: stage/app
1068
- url: $CL_GITLAB_ENVIRONMENT_URL
1069
1064
  action: stop
1070
1065
  artifacts:
1071
1066
  reports:
@@ -1119,10 +1114,9 @@ app 🧪 test:
1119
1114
  - kubectl config set-context "kube-pan-test-app-stage-app" --cluster="kube-pan-test-app-stage-app" --user="kube-pan-test-app-stage-app" --namespace="pan-test-app-stage"
1120
1115
  - kubectl config use-context "kube-pan-test-app-stage-app"
1121
1116
  - kubernetesRollback
1122
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
1117
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1123
1118
  environment:
1124
1119
  name: stage/app
1125
- url: $CL_GITLAB_ENVIRONMENT_URL
1126
1120
  action: access
1127
1121
  artifacts:
1128
1122
  reports:
@@ -1319,9 +1313,9 @@ app 🧪 test:
1319
1313
  - kubernetesCreateSecret
1320
1314
  - kubernetesDeploy
1321
1315
  - echo 'Uploading SBOM to Dependency Track'
1322
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://my-fancy-website.com" "__sbom.json" vex.json || true
1316
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
1323
1317
  - echo deployment successful 😻
1324
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env
1318
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1325
1319
  environment:
1326
1320
  name: prod/app
1327
1321
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1381,11 +1375,10 @@ app 🧪 test:
1381
1375
  - kubectl config use-context "kube-pan-test-app-prod-app"
1382
1376
  - kubernetesDelete
1383
1377
  - echo 'Disabling component in Dependency Track'
1384
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://my-fancy-website.com" || true
1385
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env
1378
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
1379
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1386
1380
  environment:
1387
1381
  name: prod/app
1388
- url: $CL_GITLAB_ENVIRONMENT_URL
1389
1382
  action: stop
1390
1383
  artifacts:
1391
1384
  reports:
@@ -1439,10 +1432,9 @@ app 🧪 test:
1439
1432
  - kubectl config set-context "kube-pan-test-app-prod-app" --cluster="kube-pan-test-app-prod-app" --user="kube-pan-test-app-prod-app" --namespace="pan-test-app-prod"
1440
1433
  - kubectl config use-context "kube-pan-test-app-prod-app"
1441
1434
  - kubernetesRollback
1442
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env
1435
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1443
1436
  environment:
1444
1437
  name: prod/app
1445
- url: $CL_GITLAB_ENVIRONMENT_URL
1446
1438
  action: access
1447
1439
  artifacts:
1448
1440
  reports:
package/examples/__snapshots__/referencing-other-vars.test.ts.snap CHANGED
@@ -447,8 +447,8 @@ app1 🧪 test:
447
447
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app1 --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/app1@$version --quiet --delete-tags; done
448
448
  - collapseable_section_end "cleanup"
449
449
  - echo 'Uploading SBOM to Dependency Track'
450
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "https://$(printf %s "pan-test-app-dev-app1-$CL_dev_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
451
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-app1-$CL_dev_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
450
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "$ROOT_URL" "__sbom.json" vex.json || true
451
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
452
452
  environment:
453
453
  name: dev/app1
454
454
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -496,12 +496,11 @@ app1 🧪 test:
496
496
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app1 --quiet --delete-tags
497
497
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app1 --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/app1@$version --quiet --delete-tags; done
498
498
  - echo 'Disabling component in Dependency Track'
499
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "https://$(printf %s "pan-test-app-dev-app1-$CL_dev_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
499
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "$CI_ENVIRONMENT_URL" || true
500
500
  - set -e
501
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-app1-$CL_dev_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
501
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
502
502
  environment:
503
503
  name: dev/app1
504
- url: $CL_GITLAB_ENVIRONMENT_URL
505
504
  action: stop
506
505
  artifacts:
507
506
  reports:
@@ -778,8 +777,8 @@ app1 🧪 test:
778
777
  - set -e
779
778
  - collapseable_section_end "cleanup"
780
779
  - echo 'Uploading SBOM to Dependency Track'
781
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "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"; })-app1-$CL_review_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
782
- - 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"; })-app1-$CL_review_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
780
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "$ROOT_URL" "__sbom.json" vex.json || true
781
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
783
782
  environment:
784
783
  name: review/$CI_COMMIT_REF_NAME/app1
785
784
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -828,12 +827,11 @@ app1 🧪 test:
828
827
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app1 --quiet --delete-tags
829
828
  - set -e
830
829
  - echo 'Disabling component in Dependency Track'
831
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "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"; })-app1-$CL_review_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
830
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "$CI_ENVIRONMENT_URL" || true
832
831
  - set -e
833
- - 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"; })-app1-$CL_review_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
832
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
834
833
  environment:
835
834
  name: review/$CI_COMMIT_REF_NAME/app1
836
- url: $CL_GITLAB_ENVIRONMENT_URL
837
835
  action: stop
838
836
  artifacts:
839
837
  reports:
@@ -1105,8 +1103,8 @@ app1 🧪 test:
1105
1103
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app1 --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/app1@$version --quiet --delete-tags; done
1106
1104
  - collapseable_section_end "cleanup"
1107
1105
  - echo 'Uploading SBOM to Dependency Track'
1108
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "https://$(printf %s "pan-test-app-stage-app1-$CL_stage_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1109
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-app1-$CL_stage_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1106
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "$ROOT_URL" "__sbom.json" vex.json || true
1107
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1110
1108
  environment:
1111
1109
  name: stage/app1
1112
1110
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1145,12 +1143,11 @@ app1 🧪 test:
1145
1143
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app1 --quiet --delete-tags
1146
1144
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app1 --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/app1@$version --quiet --delete-tags; done
1147
1145
  - echo 'Disabling component in Dependency Track'
1148
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "https://$(printf %s "pan-test-app-stage-app1-$CL_stage_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1146
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "$CI_ENVIRONMENT_URL" || true
1149
1147
  - set -e
1150
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-app1-$CL_stage_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1148
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1151
1149
  environment:
1152
1150
  name: stage/app1
1153
- url: $CL_GITLAB_ENVIRONMENT_URL
1154
1151
  action: stop
1155
1152
  artifacts:
1156
1153
  reports:
@@ -1422,8 +1419,8 @@ app1 🧪 test:
1422
1419
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app1 --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/app1@$version --quiet --delete-tags; done
1423
1420
  - collapseable_section_end "cleanup"
1424
1421
  - echo 'Uploading SBOM to Dependency Track'
1425
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "https://$(printf %s "pan-test-app-prod-app1-$CL_prod_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1426
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-app1-$CL_prod_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1422
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "$ROOT_URL" "__sbom.json" vex.json || true
1423
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1427
1424
  environment:
1428
1425
  name: prod/app1
1429
1426
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1462,12 +1459,11 @@ app1 🧪 test:
1462
1459
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app1 --quiet --delete-tags
1463
1460
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app1 --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/app1@$version --quiet --delete-tags; done
1464
1461
  - echo 'Disabling component in Dependency Track'
1465
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "https://$(printf %s "pan-test-app-prod-app1-$CL_prod_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1462
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "$CI_ENVIRONMENT_URL" || true
1466
1463
  - set -e
1467
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-app1-$CL_prod_app1_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1464
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1468
1465
  environment:
1469
1466
  name: prod/app1
1470
- url: $CL_GITLAB_ENVIRONMENT_URL
1471
1467
  action: stop
1472
1468
  artifacts:
1473
1469
  reports:
@@ -1859,8 +1855,8 @@ app2 🧪 test:
1859
1855
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app2 --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/app2@$version --quiet --delete-tags; done
1860
1856
  - collapseable_section_end "cleanup"
1861
1857
  - echo 'Uploading SBOM to Dependency Track'
1862
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "https://$(printf %s "pan-test-app-dev-app2-$CL_dev_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1863
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-app2-$CL_dev_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1858
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "$ROOT_URL" "__sbom.json" vex.json || true
1859
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1864
1860
  environment:
1865
1861
  name: dev/app2
1866
1862
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1908,12 +1904,11 @@ app2 🧪 test:
1908
1904
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app2 --quiet --delete-tags
1909
1905
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app2 --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/app2@$version --quiet --delete-tags; done
1910
1906
  - echo 'Disabling component in Dependency Track'
1911
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "https://$(printf %s "pan-test-app-dev-app2-$CL_dev_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1907
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "$CI_ENVIRONMENT_URL" || true
1912
1908
  - set -e
1913
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-app2-$CL_dev_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1909
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1914
1910
  environment:
1915
1911
  name: dev/app2
1916
- url: $CL_GITLAB_ENVIRONMENT_URL
1917
1912
  action: stop
1918
1913
  artifacts:
1919
1914
  reports:
@@ -2200,8 +2195,8 @@ app2 🧪 test:
2200
2195
  - set -e
2201
2196
  - collapseable_section_end "cleanup"
2202
2197
  - echo 'Uploading SBOM to Dependency Track'
2203
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "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"; })-app2-$CL_review_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
2204
- - 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"; })-app2-$CL_review_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2198
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "$ROOT_URL" "__sbom.json" vex.json || true
2199
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2205
2200
  environment:
2206
2201
  name: review/$CI_COMMIT_REF_NAME/app2
2207
2202
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2250,12 +2245,11 @@ app2 🧪 test:
2250
2245
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app2 --quiet --delete-tags
2251
2246
  - set -e
2252
2247
  - echo 'Disabling component in Dependency Track'
2253
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "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"; })-app2-$CL_review_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
2248
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "$CI_ENVIRONMENT_URL" || true
2254
2249
  - set -e
2255
- - 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"; })-app2-$CL_review_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2250
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2256
2251
  environment:
2257
2252
  name: review/$CI_COMMIT_REF_NAME/app2
2258
- url: $CL_GITLAB_ENVIRONMENT_URL
2259
2253
  action: stop
2260
2254
  artifacts:
2261
2255
  reports:
@@ -2537,8 +2531,8 @@ app2 🧪 test:
2537
2531
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app2 --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/app2@$version --quiet --delete-tags; done
2538
2532
  - collapseable_section_end "cleanup"
2539
2533
  - echo 'Uploading SBOM to Dependency Track'
2540
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "https://$(printf %s "pan-test-app-stage-app2-$CL_stage_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
2541
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-app2-$CL_stage_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2534
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "$ROOT_URL" "__sbom.json" vex.json || true
2535
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2542
2536
  environment:
2543
2537
  name: stage/app2
2544
2538
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2577,12 +2571,11 @@ app2 🧪 test:
2577
2571
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app2 --quiet --delete-tags
2578
2572
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app2 --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/app2@$version --quiet --delete-tags; done
2579
2573
  - echo 'Disabling component in Dependency Track'
2580
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "https://$(printf %s "pan-test-app-stage-app2-$CL_stage_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
2574
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "$CI_ENVIRONMENT_URL" || true
2581
2575
  - set -e
2582
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-app2-$CL_stage_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2576
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2583
2577
  environment:
2584
2578
  name: stage/app2
2585
- url: $CL_GITLAB_ENVIRONMENT_URL
2586
2579
  action: stop
2587
2580
  artifacts:
2588
2581
  reports:
@@ -2864,8 +2857,8 @@ app2 🧪 test:
2864
2857
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app2 --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/app2@$version --quiet --delete-tags; done
2865
2858
  - collapseable_section_end "cleanup"
2866
2859
  - echo 'Uploading SBOM to Dependency Track'
2867
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "https://$(printf %s "pan-test-app-prod-app2-$CL_prod_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
2868
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-app2-$CL_prod_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2860
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "$ROOT_URL" "__sbom.json" vex.json || true
2861
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2869
2862
  environment:
2870
2863
  name: prod/app2
2871
2864
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2904,12 +2897,11 @@ app2 🧪 test:
2904
2897
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app2 --quiet --delete-tags
2905
2898
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app2 --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/app2@$version --quiet --delete-tags; done
2906
2899
  - echo 'Disabling component in Dependency Track'
2907
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "https://$(printf %s "pan-test-app-prod-app2-$CL_prod_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
2900
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "$CI_ENVIRONMENT_URL" || true
2908
2901
  - set -e
2909
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-app2-$CL_prod_app2_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2902
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2910
2903
  environment:
2911
2904
  name: prod/app2
2912
- url: $CL_GITLAB_ENVIRONMENT_URL
2913
2905
  action: stop
2914
2906
  artifacts:
2915
2907
  reports:
@@ -3306,9 +3298,9 @@ app3 🧪 test:
3306
3298
  - kubernetesCreateSecret
3307
3299
  - kubernetesDeploy
3308
3300
  - echo 'Uploading SBOM to Dependency Track'
3309
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app3" "https://app3.dev.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
3301
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app3" "$ROOT_URL" "__sbom.json" vex.json || true
3310
3302
  - echo deployment successful 😻
3311
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
3303
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3312
3304
  environment:
3313
3305
  name: dev/app3
3314
3306
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -3380,11 +3372,10 @@ app3 🧪 test:
3380
3372
  - kubectl config use-context "kube-pan-test-app-dev-app3"
3381
3373
  - kubernetesDelete
3382
3374
  - echo 'Disabling component in Dependency Track'
3383
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app3" "https://app3.dev.test-app.pan.panter.cloud" || true
3384
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
3375
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app3" "$CI_ENVIRONMENT_URL" || true
3376
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3385
3377
  environment:
3386
3378
  name: dev/app3
3387
- url: $CL_GITLAB_ENVIRONMENT_URL
3388
3379
  action: stop
3389
3380
  artifacts:
3390
3381
  reports:
@@ -3441,10 +3432,9 @@ app3 🧪 test:
3441
3432
  - kubectl config set-context "kube-pan-test-app-dev-app3" --cluster="kube-pan-test-app-dev-app3" --user="kube-pan-test-app-dev-app3" --namespace="pan-test-app-dev"
3442
3433
  - kubectl config use-context "kube-pan-test-app-dev-app3"
3443
3434
  - kubernetesRollback
3444
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
3435
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3445
3436
  environment:
3446
3437
  name: dev/app3
3447
- url: $CL_GITLAB_ENVIRONMENT_URL
3448
3438
  action: access
3449
3439
  artifacts:
3450
3440
  reports:
@@ -3732,9 +3722,9 @@ app3 🧪 test:
3732
3722
  - kubernetesCreateSecret
3733
3723
  - kubernetesDeploy
3734
3724
  - echo 'Uploading SBOM to Dependency Track'
3735
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app3" "https://app3.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
3725
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app3" "$ROOT_URL" "__sbom.json" vex.json || true
3736
3726
  - echo deployment successful 😻
3737
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" >> gitlab_environment.env
3727
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3738
3728
  environment:
3739
3729
  name: review/$CI_COMMIT_REF_NAME/app3
3740
3730
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -3804,11 +3794,10 @@ app3 🧪 test:
3804
3794
  - kubectl config use-context "kube-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"; })-app3"
3805
3795
  - kubernetesDelete
3806
3796
  - echo 'Disabling component in Dependency Track'
3807
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app3" "https://app3.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" || true
3808
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" >> gitlab_environment.env
3797
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app3" "$CI_ENVIRONMENT_URL" || true
3798
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3809
3799
  environment:
3810
3800
  name: review/$CI_COMMIT_REF_NAME/app3
3811
- url: $CL_GITLAB_ENVIRONMENT_URL
3812
3801
  action: stop
3813
3802
  artifacts:
3814
3803
  reports:
@@ -3863,10 +3852,9 @@ app3 🧪 test:
3863
3852
  - kubectl config set-context "kube-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"; })-app3" --cluster="kube-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"; })-app3" --user="kube-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"; })-app3" --namespace="pan-test-app-review"
3864
3853
  - kubectl config use-context "kube-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"; })-app3"
3865
3854
  - kubernetesRollback
3866
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.test-app.pan.panter.cloud" >> gitlab_environment.env
3855
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3867
3856
  environment:
3868
3857
  name: review/$CI_COMMIT_REF_NAME/app3
3869
- url: $CL_GITLAB_ENVIRONMENT_URL
3870
3858
  action: access
3871
3859
  artifacts:
3872
3860
  reports:
@@ -4151,9 +4139,9 @@ app3 🧪 test:
4151
4139
  - kubernetesCreateSecret
4152
4140
  - kubernetesDeploy
4153
4141
  - echo 'Uploading SBOM to Dependency Track'
4154
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app3" "https://app3.stage.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
4142
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app3" "$ROOT_URL" "__sbom.json" vex.json || true
4155
4143
  - echo deployment successful 😻
4156
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
4144
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4157
4145
  environment:
4158
4146
  name: stage/app3
4159
4147
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -4216,11 +4204,10 @@ app3 🧪 test:
4216
4204
  - kubectl config use-context "kube-pan-test-app-stage-app3"
4217
4205
  - kubernetesDelete
4218
4206
  - echo 'Disabling component in Dependency Track'
4219
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app3" "https://app3.stage.test-app.pan.panter.cloud" || true
4220
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
4207
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app3" "$CI_ENVIRONMENT_URL" || true
4208
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4221
4209
  environment:
4222
4210
  name: stage/app3
4223
- url: $CL_GITLAB_ENVIRONMENT_URL
4224
4211
  action: stop
4225
4212
  artifacts:
4226
4213
  reports:
@@ -4275,10 +4262,9 @@ app3 🧪 test:
4275
4262
  - kubectl config set-context "kube-pan-test-app-stage-app3" --cluster="kube-pan-test-app-stage-app3" --user="kube-pan-test-app-stage-app3" --namespace="pan-test-app-stage"
4276
4263
  - kubectl config use-context "kube-pan-test-app-stage-app3"
4277
4264
  - kubernetesRollback
4278
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
4265
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4279
4266
  environment:
4280
4267
  name: stage/app3
4281
- url: $CL_GITLAB_ENVIRONMENT_URL
4282
4268
  action: access
4283
4269
  artifacts:
4284
4270
  reports:
@@ -4563,9 +4549,9 @@ app3 🧪 test:
4563
4549
  - kubernetesCreateSecret
4564
4550
  - kubernetesDeploy
4565
4551
  - echo 'Uploading SBOM to Dependency Track'
4566
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app3" "https://app3.prod.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
4552
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app3" "$ROOT_URL" "__sbom.json" vex.json || true
4567
4553
  - echo deployment successful 😻
4568
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.prod.test-app.pan.panter.cloud" >> gitlab_environment.env
4554
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4569
4555
  environment:
4570
4556
  name: prod/app3
4571
4557
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -4628,11 +4614,10 @@ app3 🧪 test:
4628
4614
  - kubectl config use-context "kube-pan-test-app-prod-app3"
4629
4615
  - kubernetesDelete
4630
4616
  - echo 'Disabling component in Dependency Track'
4631
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app3" "https://app3.prod.test-app.pan.panter.cloud" || true
4632
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.prod.test-app.pan.panter.cloud" >> gitlab_environment.env
4617
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app3" "$CI_ENVIRONMENT_URL" || true
4618
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4633
4619
  environment:
4634
4620
  name: prod/app3
4635
- url: $CL_GITLAB_ENVIRONMENT_URL
4636
4621
  action: stop
4637
4622
  artifacts:
4638
4623
  reports:
@@ -4687,10 +4672,9 @@ app3 🧪 test:
4687
4672
  - kubectl config set-context "kube-pan-test-app-prod-app3" --cluster="kube-pan-test-app-prod-app3" --user="kube-pan-test-app-prod-app3" --namespace="pan-test-app-prod"
4688
4673
  - kubectl config use-context "kube-pan-test-app-prod-app3"
4689
4674
  - kubernetesRollback
4690
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app3.prod.test-app.pan.panter.cloud" >> gitlab_environment.env
4675
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4691
4676
  environment:
4692
4677
  name: prod/app3
4693
- url: $CL_GITLAB_ENVIRONMENT_URL
4694
4678
  action: access
4695
4679
  artifacts:
4696
4680
  reports: