@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__/meteor-kubernetes.test.ts.snap CHANGED
@@ -450,9 +450,9 @@ web 🧪 test:
450
450
  - kubernetesCreateSecret
451
451
  - kubernetesDeploy
452
452
  - echo 'Uploading SBOM to Dependency Track'
453
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-my-app/web" "https://web.dev.my-app.pan.panter.cloud" "__sbom.json" vex.json || true
453
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-my-app/web" "$ROOT_URL" "__sbom.json" vex.json || true
454
454
  - echo deployment successful 😻
455
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://web.dev.my-app.pan.panter.cloud" >> gitlab_environment.env
455
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
456
456
  environment:
457
457
  name: dev/web
458
458
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -520,11 +520,10 @@ web 🧪 test:
520
520
  - kubectl config use-context "kube-pan-my-app-dev-web"
521
521
  - kubernetesDelete
522
522
  - echo 'Disabling component in Dependency Track'
523
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-my-app/web" "https://web.dev.my-app.pan.panter.cloud" || true
524
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://web.dev.my-app.pan.panter.cloud" >> gitlab_environment.env
523
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-my-app/web" "$CI_ENVIRONMENT_URL" || true
524
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
525
525
  environment:
526
526
  name: dev/web
527
- url: $CL_GITLAB_ENVIRONMENT_URL
528
527
  action: stop
529
528
  artifacts:
530
529
  reports:
@@ -577,10 +576,9 @@ web 🧪 test:
577
576
  - kubectl config set-context "kube-pan-my-app-dev-web" --cluster="kube-pan-my-app-dev-web" --user="kube-pan-my-app-dev-web" --namespace="pan-my-app-dev"
578
577
  - kubectl config use-context "kube-pan-my-app-dev-web"
579
578
  - kubernetesRollback
580
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://web.dev.my-app.pan.panter.cloud" >> gitlab_environment.env
579
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
581
580
  environment:
582
581
  name: dev/web
583
- url: $CL_GITLAB_ENVIRONMENT_URL
584
582
  action: access
585
583
  artifacts:
586
584
  reports:
@@ -856,9 +854,9 @@ web 🧪 test:
856
854
  - kubernetesCreateSecret
857
855
  - kubernetesDeploy
858
856
  - echo 'Uploading SBOM to Dependency Track'
859
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-my-app/web" "https://web.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.my-app.pan.panter.cloud" "__sbom.json" vex.json || true
857
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-my-app/web" "$ROOT_URL" "__sbom.json" vex.json || true
860
858
  - echo deployment successful 😻
861
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://web.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.my-app.pan.panter.cloud" >> gitlab_environment.env
859
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
862
860
  environment:
863
861
  name: review/$CI_COMMIT_REF_NAME/web
864
862
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -924,11 +922,10 @@ web 🧪 test:
924
922
  - kubectl config use-context "kube-pan-my-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"; })-web"
925
923
  - kubernetesDelete
926
924
  - echo 'Disabling component in Dependency Track'
927
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-my-app/web" "https://web.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.my-app.pan.panter.cloud" || true
928
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://web.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.my-app.pan.panter.cloud" >> gitlab_environment.env
925
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-my-app/web" "$CI_ENVIRONMENT_URL" || true
926
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
929
927
  environment:
930
928
  name: review/$CI_COMMIT_REF_NAME/web
931
- url: $CL_GITLAB_ENVIRONMENT_URL
932
929
  action: stop
933
930
  artifacts:
934
931
  reports:
@@ -979,10 +976,9 @@ web 🧪 test:
979
976
  - kubectl config set-context "kube-pan-my-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"; })-web" --cluster="kube-pan-my-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"; })-web" --user="kube-pan-my-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"; })-web" --namespace="pan-my-app-review"
980
977
  - kubectl config use-context "kube-pan-my-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"; })-web"
981
978
  - kubernetesRollback
982
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://web.$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }).review.my-app.pan.panter.cloud" >> gitlab_environment.env
979
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
983
980
  environment:
984
981
  name: review/$CI_COMMIT_REF_NAME/web
985
- url: $CL_GITLAB_ENVIRONMENT_URL
986
982
  action: access
987
983
  artifacts:
988
984
  reports:
@@ -1255,9 +1251,9 @@ web 🧪 test:
1255
1251
  - kubernetesCreateSecret
1256
1252
  - kubernetesDeploy
1257
1253
  - echo 'Uploading SBOM to Dependency Track'
1258
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-my-app/web" "https://web.stage.my-app.pan.panter.cloud" "__sbom.json" vex.json || true
1254
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-my-app/web" "$ROOT_URL" "__sbom.json" vex.json || true
1259
1255
  - echo deployment successful 😻
1260
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://web.stage.my-app.pan.panter.cloud" >> gitlab_environment.env
1256
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1261
1257
  environment:
1262
1258
  name: stage/web
1263
1259
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1316,11 +1312,10 @@ web 🧪 test:
1316
1312
  - kubectl config use-context "kube-pan-my-app-stage-web"
1317
1313
  - kubernetesDelete
1318
1314
  - echo 'Disabling component in Dependency Track'
1319
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-my-app/web" "https://web.stage.my-app.pan.panter.cloud" || true
1320
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://web.stage.my-app.pan.panter.cloud" >> gitlab_environment.env
1315
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-my-app/web" "$CI_ENVIRONMENT_URL" || true
1316
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1321
1317
  environment:
1322
1318
  name: stage/web
1323
- url: $CL_GITLAB_ENVIRONMENT_URL
1324
1319
  action: stop
1325
1320
  artifacts:
1326
1321
  reports:
@@ -1371,10 +1366,9 @@ web 🧪 test:
1371
1366
  - kubectl config set-context "kube-pan-my-app-stage-web" --cluster="kube-pan-my-app-stage-web" --user="kube-pan-my-app-stage-web" --namespace="pan-my-app-stage"
1372
1367
  - kubectl config use-context "kube-pan-my-app-stage-web"
1373
1368
  - kubernetesRollback
1374
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://web.stage.my-app.pan.panter.cloud" >> gitlab_environment.env
1369
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1375
1370
  environment:
1376
1371
  name: stage/web
1377
- url: $CL_GITLAB_ENVIRONMENT_URL
1378
1372
  action: access
1379
1373
  artifacts:
1380
1374
  reports:
@@ -1666,9 +1660,9 @@ web 🧪 test:
1666
1660
  - kubernetesCreateSecret
1667
1661
  - kubernetesDeploy
1668
1662
  - echo 'Uploading SBOM to Dependency Track'
1669
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-my-app/web" "https://www.example.com" "__sbom.json" vex.json || true
1663
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-my-app/web" "$ROOT_URL" "__sbom.json" vex.json || true
1670
1664
  - echo deployment successful 😻
1671
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://www.example.com" >> gitlab_environment.env
1665
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1672
1666
  environment:
1673
1667
  name: prod/web
1674
1668
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1728,11 +1722,10 @@ web 🧪 test:
1728
1722
  - kubectl config use-context "kube-pan-my-app-prod-web"
1729
1723
  - kubernetesDelete
1730
1724
  - echo 'Disabling component in Dependency Track'
1731
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-my-app/web" "https://www.example.com" || true
1732
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://www.example.com" >> gitlab_environment.env
1725
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-my-app/web" "$CI_ENVIRONMENT_URL" || true
1726
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1733
1727
  environment:
1734
1728
  name: prod/web
1735
- url: $CL_GITLAB_ENVIRONMENT_URL
1736
1729
  action: stop
1737
1730
  artifacts:
1738
1731
  reports:
@@ -1784,10 +1777,9 @@ web 🧪 test:
1784
1777
  - kubectl config set-context "kube-pan-my-app-prod-web" --cluster="kube-pan-my-app-prod-web" --user="kube-pan-my-app-prod-web" --namespace="pan-my-app-prod"
1785
1778
  - kubectl config use-context "kube-pan-my-app-prod-web"
1786
1779
  - kubernetesRollback
1787
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://www.example.com" >> gitlab_environment.env
1780
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1788
1781
  environment:
1789
1782
  name: prod/web
1790
- url: $CL_GITLAB_ENVIRONMENT_URL
1791
1783
  action: access
1792
1784
  artifacts:
1793
1785
  reports:
package/examples/__snapshots__/multiline-var.test.ts.snap CHANGED
@@ -470,8 +470,8 @@ app1 🧪 test:
470
470
  - 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
471
471
  - collapseable_section_end "cleanup"
472
472
  - echo 'Uploading SBOM to Dependency Track'
473
- - /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
474
- - 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
473
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "$ROOT_URL" "__sbom.json" vex.json || true
474
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
475
475
  environment:
476
476
  name: dev/app1
477
477
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -519,12 +519,11 @@ app1 🧪 test:
519
519
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app1 --quiet --delete-tags
520
520
  - 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
521
521
  - echo 'Disabling component in Dependency Track'
522
- - /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
522
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "$CI_ENVIRONMENT_URL" || true
523
523
  - set -e
524
- - 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
524
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
525
525
  environment:
526
526
  name: dev/app1
527
- url: $CL_GITLAB_ENVIRONMENT_URL
528
527
  action: stop
529
528
  artifacts:
530
529
  reports:
@@ -824,8 +823,8 @@ app1 🧪 test:
824
823
  - set -e
825
824
  - collapseable_section_end "cleanup"
826
825
  - echo 'Uploading SBOM to Dependency Track'
827
- - /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
828
- - 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
826
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "$ROOT_URL" "__sbom.json" vex.json || true
827
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
829
828
  environment:
830
829
  name: review/$CI_COMMIT_REF_NAME/app1
831
830
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -874,12 +873,11 @@ app1 🧪 test:
874
873
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app1 --quiet --delete-tags
875
874
  - set -e
876
875
  - echo 'Disabling component in Dependency Track'
877
- - /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
876
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "$CI_ENVIRONMENT_URL" || true
878
877
  - set -e
879
- - 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
878
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
880
879
  environment:
881
880
  name: review/$CI_COMMIT_REF_NAME/app1
882
- url: $CL_GITLAB_ENVIRONMENT_URL
883
881
  action: stop
884
882
  artifacts:
885
883
  reports:
@@ -1174,8 +1172,8 @@ app1 🧪 test:
1174
1172
  - 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
1175
1173
  - collapseable_section_end "cleanup"
1176
1174
  - echo 'Uploading SBOM to Dependency Track'
1177
- - /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
1178
- - 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
1175
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "$ROOT_URL" "__sbom.json" vex.json || true
1176
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1179
1177
  environment:
1180
1178
  name: stage/app1
1181
1179
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1214,12 +1212,11 @@ app1 🧪 test:
1214
1212
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app1 --quiet --delete-tags
1215
1213
  - 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
1216
1214
  - echo 'Disabling component in Dependency Track'
1217
- - /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
1215
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "$CI_ENVIRONMENT_URL" || true
1218
1216
  - set -e
1219
- - 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
1217
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1220
1218
  environment:
1221
1219
  name: stage/app1
1222
- url: $CL_GITLAB_ENVIRONMENT_URL
1223
1220
  action: stop
1224
1221
  artifacts:
1225
1222
  reports:
@@ -1514,8 +1511,8 @@ app1 🧪 test:
1514
1511
  - 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
1515
1512
  - collapseable_section_end "cleanup"
1516
1513
  - echo 'Uploading SBOM to Dependency Track'
1517
- - /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
1518
- - 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
1514
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app1" "$ROOT_URL" "__sbom.json" vex.json || true
1515
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1519
1516
  environment:
1520
1517
  name: prod/app1
1521
1518
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1554,12 +1551,11 @@ app1 🧪 test:
1554
1551
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app1 --quiet --delete-tags
1555
1552
  - 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
1556
1553
  - echo 'Disabling component in Dependency Track'
1557
- - /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
1554
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app1" "$CI_ENVIRONMENT_URL" || true
1558
1555
  - set -e
1559
- - 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
1556
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1560
1557
  environment:
1561
1558
  name: prod/app1
1562
- url: $CL_GITLAB_ENVIRONMENT_URL
1563
1559
  action: stop
1564
1560
  artifacts:
1565
1561
  reports:
@@ -1984,8 +1980,8 @@ app2 🧪 test:
1984
1980
  - 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
1985
1981
  - collapseable_section_end "cleanup"
1986
1982
  - echo 'Uploading SBOM to Dependency Track'
1987
- - /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
1988
- - 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
1983
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "$ROOT_URL" "__sbom.json" vex.json || true
1984
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1989
1985
  environment:
1990
1986
  name: dev/app2
1991
1987
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2033,12 +2029,11 @@ app2 🧪 test:
2033
2029
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app2 --quiet --delete-tags
2034
2030
  - 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
2035
2031
  - echo 'Disabling component in Dependency Track'
2036
- - /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
2032
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "$CI_ENVIRONMENT_URL" || true
2037
2033
  - set -e
2038
- - 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
2034
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2039
2035
  environment:
2040
2036
  name: dev/app2
2041
- url: $CL_GITLAB_ENVIRONMENT_URL
2042
2037
  action: stop
2043
2038
  artifacts:
2044
2039
  reports:
@@ -2358,8 +2353,8 @@ app2 🧪 test:
2358
2353
  - set -e
2359
2354
  - collapseable_section_end "cleanup"
2360
2355
  - echo 'Uploading SBOM to Dependency Track'
2361
- - /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
2362
- - 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
2356
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "$ROOT_URL" "__sbom.json" vex.json || true
2357
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2363
2358
  environment:
2364
2359
  name: review/$CI_COMMIT_REF_NAME/app2
2365
2360
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2408,12 +2403,11 @@ app2 🧪 test:
2408
2403
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app2 --quiet --delete-tags
2409
2404
  - set -e
2410
2405
  - echo 'Disabling component in Dependency Track'
2411
- - /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
2406
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "$CI_ENVIRONMENT_URL" || true
2412
2407
  - set -e
2413
- - 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
2408
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2414
2409
  environment:
2415
2410
  name: review/$CI_COMMIT_REF_NAME/app2
2416
- url: $CL_GITLAB_ENVIRONMENT_URL
2417
2411
  action: stop
2418
2412
  artifacts:
2419
2413
  reports:
@@ -2728,8 +2722,8 @@ app2 🧪 test:
2728
2722
  - 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
2729
2723
  - collapseable_section_end "cleanup"
2730
2724
  - echo 'Uploading SBOM to Dependency Track'
2731
- - /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
2732
- - 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
2725
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "$ROOT_URL" "__sbom.json" vex.json || true
2726
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2733
2727
  environment:
2734
2728
  name: stage/app2
2735
2729
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2768,12 +2762,11 @@ app2 🧪 test:
2768
2762
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app2 --quiet --delete-tags
2769
2763
  - 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
2770
2764
  - echo 'Disabling component in Dependency Track'
2771
- - /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
2765
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "$CI_ENVIRONMENT_URL" || true
2772
2766
  - set -e
2773
- - 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
2767
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2774
2768
  environment:
2775
2769
  name: stage/app2
2776
- url: $CL_GITLAB_ENVIRONMENT_URL
2777
2770
  action: stop
2778
2771
  artifacts:
2779
2772
  reports:
@@ -3088,8 +3081,8 @@ app2 🧪 test:
3088
3081
  - 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
3089
3082
  - collapseable_section_end "cleanup"
3090
3083
  - echo 'Uploading SBOM to Dependency Track'
3091
- - /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
3092
- - 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
3084
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app2" "$ROOT_URL" "__sbom.json" vex.json || true
3085
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3093
3086
  environment:
3094
3087
  name: prod/app2
3095
3088
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -3128,12 +3121,11 @@ app2 🧪 test:
3128
3121
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app2 --quiet --delete-tags
3129
3122
  - 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
3130
3123
  - echo 'Disabling component in Dependency Track'
3131
- - /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
3124
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app2" "$CI_ENVIRONMENT_URL" || true
3132
3125
  - set -e
3133
- - 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
3126
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3134
3127
  environment:
3135
3128
  name: prod/app2
3136
- url: $CL_GITLAB_ENVIRONMENT_URL
3137
3129
  action: stop
3138
3130
  artifacts:
3139
3131
  reports:
@@ -3647,9 +3639,9 @@ kube 🧪 test:
3647
3639
  - kubernetesCreateSecret
3648
3640
  - kubernetesDeploy
3649
3641
  - echo 'Uploading SBOM to Dependency Track'
3650
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/kube" "https://kube.dev.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
3642
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/kube" "$ROOT_URL" "__sbom.json" vex.json || true
3651
3643
  - echo deployment successful 😻
3652
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
3644
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3653
3645
  environment:
3654
3646
  name: dev/kube
3655
3647
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -3752,11 +3744,10 @@ kube 🧪 test:
3752
3744
  - kubectl config use-context "kube-pan-test-app-dev-kube"
3753
3745
  - kubernetesDelete
3754
3746
  - echo 'Disabling component in Dependency Track'
3755
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/kube" "https://kube.dev.test-app.pan.panter.cloud" || true
3756
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
3747
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/kube" "$CI_ENVIRONMENT_URL" || true
3748
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3757
3749
  environment:
3758
3750
  name: dev/kube
3759
- url: $CL_GITLAB_ENVIRONMENT_URL
3760
3751
  action: stop
3761
3752
  artifacts:
3762
3753
  reports:
@@ -3844,10 +3835,9 @@ kube 🧪 test:
3844
3835
  - kubectl config set-context "kube-pan-test-app-dev-kube" --cluster="kube-pan-test-app-dev-kube" --user="kube-pan-test-app-dev-kube" --namespace="pan-test-app-dev"
3845
3836
  - kubectl config use-context "kube-pan-test-app-dev-kube"
3846
3837
  - kubernetesRollback
3847
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
3838
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
3848
3839
  environment:
3849
3840
  name: dev/kube
3850
- url: $CL_GITLAB_ENVIRONMENT_URL
3851
3841
  action: access
3852
3842
  artifacts:
3853
3843
  reports:
@@ -4252,9 +4242,9 @@ kube 🧪 test:
4252
4242
  - kubernetesCreateSecret
4253
4243
  - kubernetesDeploy
4254
4244
  - echo 'Uploading SBOM to Dependency Track'
4255
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/kube" "https://kube.$([ -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
4245
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/kube" "$ROOT_URL" "__sbom.json" vex.json || true
4256
4246
  - echo deployment successful 😻
4257
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.$([ -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
4247
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4258
4248
  environment:
4259
4249
  name: review/$CI_COMMIT_REF_NAME/kube
4260
4250
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -4355,11 +4345,10 @@ kube 🧪 test:
4355
4345
  - 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"; })-kube"
4356
4346
  - kubernetesDelete
4357
4347
  - echo 'Disabling component in Dependency Track'
4358
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/kube" "https://kube.$([ -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
4359
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.$([ -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
4348
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/kube" "$CI_ENVIRONMENT_URL" || true
4349
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4360
4350
  environment:
4361
4351
  name: review/$CI_COMMIT_REF_NAME/kube
4362
- url: $CL_GITLAB_ENVIRONMENT_URL
4363
4352
  action: stop
4364
4353
  artifacts:
4365
4354
  reports:
@@ -4445,10 +4434,9 @@ kube 🧪 test:
4445
4434
  - 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"; })-kube" --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"; })-kube" --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"; })-kube" --namespace="pan-test-app-review"
4446
4435
  - 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"; })-kube"
4447
4436
  - kubernetesRollback
4448
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.$([ -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
4437
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4449
4438
  environment:
4450
4439
  name: review/$CI_COMMIT_REF_NAME/kube
4451
- url: $CL_GITLAB_ENVIRONMENT_URL
4452
4440
  action: access
4453
4441
  artifacts:
4454
4442
  reports:
@@ -4850,9 +4838,9 @@ kube 🧪 test:
4850
4838
  - kubernetesCreateSecret
4851
4839
  - kubernetesDeploy
4852
4840
  - echo 'Uploading SBOM to Dependency Track'
4853
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/kube" "https://kube.stage.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
4841
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/kube" "$ROOT_URL" "__sbom.json" vex.json || true
4854
4842
  - echo deployment successful 😻
4855
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
4843
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4856
4844
  environment:
4857
4845
  name: stage/kube
4858
4846
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -4946,11 +4934,10 @@ kube 🧪 test:
4946
4934
  - kubectl config use-context "kube-pan-test-app-stage-kube"
4947
4935
  - kubernetesDelete
4948
4936
  - echo 'Disabling component in Dependency Track'
4949
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/kube" "https://kube.stage.test-app.pan.panter.cloud" || true
4950
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
4937
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/kube" "$CI_ENVIRONMENT_URL" || true
4938
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
4951
4939
  environment:
4952
4940
  name: stage/kube
4953
- url: $CL_GITLAB_ENVIRONMENT_URL
4954
4941
  action: stop
4955
4942
  artifacts:
4956
4943
  reports:
@@ -5036,10 +5023,9 @@ kube 🧪 test:
5036
5023
  - kubectl config set-context "kube-pan-test-app-stage-kube" --cluster="kube-pan-test-app-stage-kube" --user="kube-pan-test-app-stage-kube" --namespace="pan-test-app-stage"
5037
5024
  - kubectl config use-context "kube-pan-test-app-stage-kube"
5038
5025
  - kubernetesRollback
5039
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
5026
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
5040
5027
  environment:
5041
5028
  name: stage/kube
5042
- url: $CL_GITLAB_ENVIRONMENT_URL
5043
5029
  action: access
5044
5030
  artifacts:
5045
5031
  reports:
@@ -5441,9 +5427,9 @@ kube 🧪 test:
5441
5427
  - kubernetesCreateSecret
5442
5428
  - kubernetesDeploy
5443
5429
  - echo 'Uploading SBOM to Dependency Track'
5444
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/kube" "https://kube.prod.test-app.pan.panter.cloud" "__sbom.json" vex.json || true
5430
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/kube" "$ROOT_URL" "__sbom.json" vex.json || true
5445
5431
  - echo deployment successful 😻
5446
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.prod.test-app.pan.panter.cloud" >> gitlab_environment.env
5432
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
5447
5433
  environment:
5448
5434
  name: prod/kube
5449
5435
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -5537,11 +5523,10 @@ kube 🧪 test:
5537
5523
  - kubectl config use-context "kube-pan-test-app-prod-kube"
5538
5524
  - kubernetesDelete
5539
5525
  - echo 'Disabling component in Dependency Track'
5540
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/kube" "https://kube.prod.test-app.pan.panter.cloud" || true
5541
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.prod.test-app.pan.panter.cloud" >> gitlab_environment.env
5526
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/kube" "$CI_ENVIRONMENT_URL" || true
5527
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
5542
5528
  environment:
5543
5529
  name: prod/kube
5544
- url: $CL_GITLAB_ENVIRONMENT_URL
5545
5530
  action: stop
5546
5531
  artifacts:
5547
5532
  reports:
@@ -5627,10 +5612,9 @@ kube 🧪 test:
5627
5612
  - kubectl config set-context "kube-pan-test-app-prod-kube" --cluster="kube-pan-test-app-prod-kube" --user="kube-pan-test-app-prod-kube" --namespace="pan-test-app-prod"
5628
5613
  - kubectl config use-context "kube-pan-test-app-prod-kube"
5629
5614
  - kubernetesRollback
5630
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://kube.prod.test-app.pan.panter.cloud" >> gitlab_environment.env
5615
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
5631
5616
  environment:
5632
5617
  name: prod/kube
5633
- url: $CL_GITLAB_ENVIRONMENT_URL
5634
5618
  action: access
5635
5619
  artifacts:
5636
5620
  reports: