@catladder/pipeline 2.2.3 → 2.3.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 (52) hide show
  1. package/dist/constants.js +1 -1
  2. package/dist/deploy/base/deploy.js +1 -1
  3. package/dist/deploy/sbom.js +3 -2
  4. package/dist/pipeline/gitlab/createGitlabJobs.js +6 -4
  5. package/dist/tsconfig.tsbuildinfo +1 -1
  6. package/examples/__snapshots__/cloud-run-http2.test.ts.snap +16 -20
  7. package/examples/__snapshots__/cloud-run-memory-limit.test.ts.snap +16 -20
  8. package/examples/__snapshots__/cloud-run-meteor-with-worker.test.ts.snap +16 -20
  9. package/examples/__snapshots__/cloud-run-nextjs.test.ts.snap +16 -20
  10. package/examples/__snapshots__/cloud-run-no-cpu-throttling.test.ts.snap +16 -20
  11. package/examples/__snapshots__/cloud-run-no-service.test.ts.snap +16 -20
  12. package/examples/__snapshots__/cloud-run-non-public.test.ts.snap +16 -20
  13. package/examples/__snapshots__/cloud-run-post-stop-job.test.ts.snap +16 -20
  14. package/examples/__snapshots__/cloud-run-service-custom-vpc-connector.test.ts.snap +16 -20
  15. package/examples/__snapshots__/cloud-run-service-custom-vpc.test.ts.snap +16 -20
  16. package/examples/__snapshots__/cloud-run-service-gen2.test.ts.snap +16 -20
  17. package/examples/__snapshots__/cloud-run-service-increase-timout.test.ts.snap +16 -20
  18. package/examples/__snapshots__/cloud-run-service-with-volumes.test.ts.snap +16 -20
  19. package/examples/__snapshots__/cloud-run-storybook.test.ts.snap +16 -20
  20. package/examples/__snapshots__/cloud-run-with-ngnix.test.ts.snap +16 -20
  21. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.test.ts.snap +32 -40
  22. package/examples/__snapshots__/cloud-run-with-sql.test.ts.snap +16 -20
  23. package/examples/__snapshots__/cloud-run-with-worker.test.ts.snap +16 -20
  24. package/examples/__snapshots__/custom-build-job-with-tests.test.ts.snap +16 -20
  25. package/examples/__snapshots__/custom-build-job.test.ts.snap +16 -20
  26. package/examples/__snapshots__/custom-deploy.test.ts.snap +11 -113
  27. package/examples/__snapshots__/custom-sbom-java.test.ts.snap +16 -20
  28. package/examples/__snapshots__/custom-verify-job.test.ts.snap +1632 -0
  29. package/examples/__snapshots__/git-submodule.test.ts.snap +16 -20
  30. package/examples/__snapshots__/kubernetes-application-customization.test.ts.snap +20 -28
  31. package/examples/__snapshots__/kubernetes-with-cloud-sql.test.ts.snap +20 -28
  32. package/examples/__snapshots__/kubernetes-with-jobs.test.ts.snap +40 -56
  33. package/examples/__snapshots__/kubernetes-with-mongodb.test.ts.snap +20 -28
  34. package/examples/__snapshots__/local-dot-env.test.ts.snap +16 -20
  35. package/examples/__snapshots__/meteor-kubernetes.test.ts.snap +20 -28
  36. package/examples/__snapshots__/multiline-var.test.ts.snap +52 -68
  37. package/examples/__snapshots__/native-app.test.ts.snap +48 -24
  38. package/examples/__snapshots__/node-build-with-custom-image.test.ts.snap +16 -20
  39. package/examples/__snapshots__/node-build-with-docker-additions.test.ts.snap +16 -20
  40. package/examples/__snapshots__/rails-k8s-with-worker-dockerfile.test.ts.snap +20 -28
  41. package/examples/__snapshots__/rails-k8s-with-worker.test.ts.snap +20 -28
  42. package/examples/__snapshots__/referencing-other-vars.test.ts.snap +52 -68
  43. package/examples/__snapshots__/wait-for-other-deploy.test.ts.snap +64 -8
  44. package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap +32 -40
  45. package/examples/__snapshots__/workspace-api-www.test.ts.snap +32 -40
  46. package/examples/custom-deploy.ts +8 -1
  47. package/examples/custom-verify-job.test.ts +11 -0
  48. package/examples/custom-verify-job.ts +64 -0
  49. package/package.json +1 -1
  50. package/src/deploy/base/deploy.ts +1 -1
  51. package/src/deploy/sbom.ts +3 -2
  52. package/src/pipeline/gitlab/createGitlabJobs.ts +6 -2
package/examples/__snapshots__/native-app.test.ts.snap CHANGED
@@ -339,7 +339,8 @@ app 🧪 test:
339
339
  - bundle install
340
340
  - bundle exec fastlane deploy_test
341
341
  - echo 'Uploading SBOM to Dependency Track'
342
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://unknown-host.example.com" "__sbom.json" vex.json || true
342
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
343
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
343
344
  cache:
344
345
  - key:
345
346
  files:
@@ -347,6 +348,12 @@ app 🧪 test:
347
348
  policy: pull-push
348
349
  paths:
349
350
  - app/vendor
351
+ environment:
352
+ name: dev/app
353
+ url: $CL_GITLAB_ENVIRONMENT_URL
354
+ artifacts:
355
+ reports:
356
+ dotenv: gitlab_environment.env
350
357
  rules:
351
358
  - when: never
352
359
  if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
@@ -512,7 +519,8 @@ app 🧪 test:
512
519
  - bundle install
513
520
  - bundle exec fastlane deploy_test
514
521
  - echo 'Uploading SBOM to Dependency Track'
515
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://unknown-host.example.com" "__sbom.json" vex.json || true
522
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
523
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
516
524
  cache:
517
525
  - key:
518
526
  files:
@@ -520,6 +528,12 @@ app 🧪 test:
520
528
  policy: pull-push
521
529
  paths:
522
530
  - app/vendor
531
+ environment:
532
+ name: review/$CI_COMMIT_REF_NAME/app
533
+ url: $CL_GITLAB_ENVIRONMENT_URL
534
+ artifacts:
535
+ reports:
536
+ dotenv: gitlab_environment.env
523
537
  rules:
524
538
  - when: on_success
525
539
  if: $CI_MERGE_REQUEST_ID
@@ -683,7 +697,8 @@ app 🧪 test:
683
697
  - bundle install
684
698
  - bundle exec fastlane deploy_test
685
699
  - echo 'Uploading SBOM to Dependency Track'
686
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://unknown-host.example.com" "__sbom.json" vex.json || true
700
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
701
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
687
702
  cache:
688
703
  - key:
689
704
  files:
@@ -691,6 +706,12 @@ app 🧪 test:
691
706
  policy: pull-push
692
707
  paths:
693
708
  - app/vendor
709
+ environment:
710
+ name: stage/app
711
+ url: $CL_GITLAB_ENVIRONMENT_URL
712
+ artifacts:
713
+ reports:
714
+ dotenv: gitlab_environment.env
694
715
  rules:
695
716
  - when: on_success
696
717
  if: $CI_COMMIT_TAG
@@ -848,7 +869,8 @@ app 🧪 test:
848
869
  - bundle install
849
870
  - bundle exec fastlane deploy_test
850
871
  - echo 'Uploading SBOM to Dependency Track'
851
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://unknown-host.example.com" "__sbom.json" vex.json || true
872
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
873
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
852
874
  cache:
853
875
  - key:
854
876
  files:
@@ -856,6 +878,12 @@ app 🧪 test:
856
878
  policy: pull-push
857
879
  paths:
858
880
  - app/vendor
881
+ environment:
882
+ name: prod/app
883
+ url: $CL_GITLAB_ENVIRONMENT_URL
884
+ artifacts:
885
+ reports:
886
+ dotenv: gitlab_environment.env
859
887
  rules:
860
888
  - when: manual
861
889
  if: $CI_COMMIT_TAG
@@ -1210,8 +1238,8 @@ api 🧪 test:
1210
1238
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done
1211
1239
  - collapseable_section_end "cleanup"
1212
1240
  - echo 'Uploading SBOM to Dependency Track'
1213
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1214
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1241
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
1242
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1215
1243
  environment:
1216
1244
  name: dev/api
1217
1245
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1259,12 +1287,11 @@ api 🧪 test:
1259
1287
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags
1260
1288
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done
1261
1289
  - echo 'Disabling component in Dependency Track'
1262
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1290
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
1263
1291
  - set -e
1264
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-api-$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1292
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1265
1293
  environment:
1266
1294
  name: dev/api
1267
- url: $CL_GITLAB_ENVIRONMENT_URL
1268
1295
  action: stop
1269
1296
  artifacts:
1270
1297
  reports:
@@ -1516,8 +1543,8 @@ api 🧪 test:
1516
1543
  - set -e
1517
1544
  - collapseable_section_end "cleanup"
1518
1545
  - echo 'Uploading SBOM to Dependency Track'
1519
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1520
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1546
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
1547
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1521
1548
  environment:
1522
1549
  name: review/$CI_COMMIT_REF_NAME/api
1523
1550
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1566,12 +1593,11 @@ api 🧪 test:
1566
1593
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api --quiet --delete-tags
1567
1594
  - set -e
1568
1595
  - echo 'Disabling component in Dependency Track'
1569
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1596
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
1570
1597
  - set -e
1571
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api-$CL_review_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1598
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1572
1599
  environment:
1573
1600
  name: review/$CI_COMMIT_REF_NAME/api
1574
- url: $CL_GITLAB_ENVIRONMENT_URL
1575
1601
  action: stop
1576
1602
  artifacts:
1577
1603
  reports:
@@ -1818,8 +1844,8 @@ api 🧪 test:
1818
1844
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done
1819
1845
  - collapseable_section_end "cleanup"
1820
1846
  - echo 'Uploading SBOM to Dependency Track'
1821
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1822
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1847
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
1848
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1823
1849
  environment:
1824
1850
  name: stage/api
1825
1851
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1858,12 +1884,11 @@ api 🧪 test:
1858
1884
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags
1859
1885
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done
1860
1886
  - echo 'Disabling component in Dependency Track'
1861
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1887
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
1862
1888
  - set -e
1863
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-api-$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1889
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1864
1890
  environment:
1865
1891
  name: stage/api
1866
- url: $CL_GITLAB_ENVIRONMENT_URL
1867
1892
  action: stop
1868
1893
  artifacts:
1869
1894
  reports:
@@ -2110,8 +2135,8 @@ api 🧪 test:
2110
2135
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done
2111
2136
  - collapseable_section_end "cleanup"
2112
2137
  - echo 'Uploading SBOM to Dependency Track'
2113
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
2114
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2138
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "$ROOT_URL" "__sbom.json" vex.json || true
2139
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2115
2140
  environment:
2116
2141
  name: prod/api
2117
2142
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -2150,12 +2175,11 @@ api 🧪 test:
2150
2175
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags
2151
2176
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done
2152
2177
  - echo 'Disabling component in Dependency Track'
2153
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
2178
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/api" "$CI_ENVIRONMENT_URL" || true
2154
2179
  - set -e
2155
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-api-$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
2180
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
2156
2181
  environment:
2157
2182
  name: prod/api
2158
- url: $CL_GITLAB_ENVIRONMENT_URL
2159
2183
  action: stop
2160
2184
  artifacts:
2161
2185
  reports:
package/examples/__snapshots__/node-build-with-custom-image.test.ts.snap CHANGED
@@ -422,8 +422,8 @@ www 🧪 test:
422
422
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
423
423
  - collapseable_section_end "cleanup"
424
424
  - echo 'Uploading SBOM to Dependency Track'
425
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
426
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
425
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
426
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
427
427
  environment:
428
428
  name: dev/www
429
429
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -471,12 +471,11 @@ www 🧪 test:
471
471
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags
472
472
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
473
473
  - echo 'Disabling component in Dependency Track'
474
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
474
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
475
475
  - set -e
476
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
476
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
477
477
  environment:
478
478
  name: dev/www
479
- url: $CL_GITLAB_ENVIRONMENT_URL
480
479
  action: stop
481
480
  artifacts:
482
481
  reports:
@@ -728,8 +727,8 @@ www 🧪 test:
728
727
  - set -e
729
728
  - collapseable_section_end "cleanup"
730
729
  - echo 'Uploading SBOM to Dependency Track'
731
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
732
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
730
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
731
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
733
732
  environment:
734
733
  name: review/$CI_COMMIT_REF_NAME/www
735
734
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -778,12 +777,11 @@ www 🧪 test:
778
777
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags
779
778
  - set -e
780
779
  - echo 'Disabling component in Dependency Track'
781
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
780
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
782
781
  - set -e
783
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
782
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
784
783
  environment:
785
784
  name: review/$CI_COMMIT_REF_NAME/www
786
- url: $CL_GITLAB_ENVIRONMENT_URL
787
785
  action: stop
788
786
  artifacts:
789
787
  reports:
@@ -1030,8 +1028,8 @@ www 🧪 test:
1030
1028
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1031
1029
  - collapseable_section_end "cleanup"
1032
1030
  - echo 'Uploading SBOM to Dependency Track'
1033
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1034
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1031
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1032
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1035
1033
  environment:
1036
1034
  name: stage/www
1037
1035
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1070,12 +1068,11 @@ www 🧪 test:
1070
1068
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags
1071
1069
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1072
1070
  - echo 'Disabling component in Dependency Track'
1073
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1071
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1074
1072
  - set -e
1075
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1073
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1076
1074
  environment:
1077
1075
  name: stage/www
1078
- url: $CL_GITLAB_ENVIRONMENT_URL
1079
1076
  action: stop
1080
1077
  artifacts:
1081
1078
  reports:
@@ -1322,8 +1319,8 @@ www 🧪 test:
1322
1319
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1323
1320
  - collapseable_section_end "cleanup"
1324
1321
  - echo 'Uploading SBOM to Dependency Track'
1325
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1326
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1322
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1323
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1327
1324
  environment:
1328
1325
  name: prod/www
1329
1326
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1362,12 +1359,11 @@ www 🧪 test:
1362
1359
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags
1363
1360
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1364
1361
  - echo 'Disabling component in Dependency Track'
1365
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1362
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1366
1363
  - set -e
1367
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1364
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1368
1365
  environment:
1369
1366
  name: prod/www
1370
- url: $CL_GITLAB_ENVIRONMENT_URL
1371
1367
  action: stop
1372
1368
  artifacts:
1373
1369
  reports:
package/examples/__snapshots__/node-build-with-docker-additions.test.ts.snap CHANGED
@@ -424,8 +424,8 @@ www 🧪 test:
424
424
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
425
425
  - collapseable_section_end "cleanup"
426
426
  - echo 'Uploading SBOM to Dependency Track'
427
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
428
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
427
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
428
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
429
429
  environment:
430
430
  name: dev/www
431
431
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -473,12 +473,11 @@ www 🧪 test:
473
473
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags
474
474
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
475
475
  - echo 'Disabling component in Dependency Track'
476
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
476
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
477
477
  - set -e
478
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-dev-www-$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
478
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
479
479
  environment:
480
480
  name: dev/www
481
- url: $CL_GITLAB_ENVIRONMENT_URL
482
481
  action: stop
483
482
  artifacts:
484
483
  reports:
@@ -732,8 +731,8 @@ www 🧪 test:
732
731
  - set -e
733
732
  - collapseable_section_end "cleanup"
734
733
  - echo 'Uploading SBOM to Dependency Track'
735
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
736
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
734
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
735
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
737
736
  environment:
738
737
  name: review/$CI_COMMIT_REF_NAME/www
739
738
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -782,12 +781,11 @@ www 🧪 test:
782
781
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags
783
782
  - set -e
784
783
  - echo 'Disabling component in Dependency Track'
785
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
784
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
786
785
  - set -e
787
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-www-$CL_review_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
786
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
788
787
  environment:
789
788
  name: review/$CI_COMMIT_REF_NAME/www
790
- url: $CL_GITLAB_ENVIRONMENT_URL
791
789
  action: stop
792
790
  artifacts:
793
791
  reports:
@@ -1036,8 +1034,8 @@ www 🧪 test:
1036
1034
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1037
1035
  - collapseable_section_end "cleanup"
1038
1036
  - echo 'Uploading SBOM to Dependency Track'
1039
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1040
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1037
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1038
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1041
1039
  environment:
1042
1040
  name: stage/www
1043
1041
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1076,12 +1074,11 @@ www 🧪 test:
1076
1074
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags
1077
1075
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1078
1076
  - echo 'Disabling component in Dependency Track'
1079
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1077
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1080
1078
  - set -e
1081
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-stage-www-$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1079
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1082
1080
  environment:
1083
1081
  name: stage/www
1084
- url: $CL_GITLAB_ENVIRONMENT_URL
1085
1082
  action: stop
1086
1083
  artifacts:
1087
1084
  reports:
@@ -1330,8 +1327,8 @@ www 🧪 test:
1330
1327
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1331
1328
  - collapseable_section_end "cleanup"
1332
1329
  - echo 'Uploading SBOM to Dependency Track'
1333
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" "__sbom.json" vex.json || true
1334
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1330
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "$ROOT_URL" "__sbom.json" vex.json || true
1331
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1335
1332
  environment:
1336
1333
  name: prod/www
1337
1334
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1370,12 +1367,11 @@ www 🧪 test:
1370
1367
  - gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags
1371
1368
  - gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done
1372
1369
  - echo 'Disabling component in Dependency Track'
1373
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" || true
1370
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/www" "$CI_ENVIRONMENT_URL" || true
1374
1371
  - set -e
1375
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://$(printf %s "pan-test-app-prod-www-$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix" | awk '{print tolower($0)}')" >> gitlab_environment.env
1372
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1376
1373
  environment:
1377
1374
  name: prod/www
1378
- url: $CL_GITLAB_ENVIRONMENT_URL
1379
1375
  action: stop
1380
1376
  artifacts:
1381
1377
  reports:
package/examples/__snapshots__/rails-k8s-with-worker-dockerfile.test.ts.snap CHANGED
@@ -337,9 +337,9 @@ app 🧪 test:
337
337
  - kubernetesCreateSecret
338
338
  - kubernetesDeploy
339
339
  - echo 'Uploading SBOM to Dependency Track'
340
- - /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
340
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
341
341
  - echo deployment successful 😻
342
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
342
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
343
343
  environment:
344
344
  name: dev/app
345
345
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -408,11 +408,10 @@ app 🧪 test:
408
408
  - kubectl config use-context "kube-pan-test-app-dev-app"
409
409
  - kubernetesDelete
410
410
  - echo 'Disabling component in Dependency Track'
411
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://app.dev.test-app.pan.panter.cloud" || true
412
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
411
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
412
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
413
413
  environment:
414
414
  name: dev/app
415
- url: $CL_GITLAB_ENVIRONMENT_URL
416
415
  action: stop
417
416
  artifacts:
418
417
  reports:
@@ -468,10 +467,9 @@ app 🧪 test:
468
467
  - 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"
469
468
  - kubectl config use-context "kube-pan-test-app-dev-app"
470
469
  - kubernetesRollback
471
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env
470
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
472
471
  environment:
473
472
  name: dev/app
474
- url: $CL_GITLAB_ENVIRONMENT_URL
475
473
  action: access
476
474
  artifacts:
477
475
  reports:
@@ -680,9 +678,9 @@ app 🧪 test:
680
678
  - kubernetesCreateSecret
681
679
  - kubernetesDeploy
682
680
  - echo 'Uploading SBOM to Dependency Track'
683
- - /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
681
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
684
682
  - echo deployment successful 😻
685
- - 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
683
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
686
684
  environment:
687
685
  name: review/$CI_COMMIT_REF_NAME/app
688
686
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -749,11 +747,10 @@ app 🧪 test:
749
747
  - 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"
750
748
  - kubernetesDelete
751
749
  - echo 'Disabling component in Dependency Track'
752
- - /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
753
- - 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
750
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
751
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
754
752
  environment:
755
753
  name: review/$CI_COMMIT_REF_NAME/app
756
- url: $CL_GITLAB_ENVIRONMENT_URL
757
754
  action: stop
758
755
  artifacts:
759
756
  reports:
@@ -807,10 +804,9 @@ app 🧪 test:
807
804
  - 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"
808
805
  - 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"
809
806
  - kubernetesRollback
810
- - 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
807
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
811
808
  environment:
812
809
  name: review/$CI_COMMIT_REF_NAME/app
813
- url: $CL_GITLAB_ENVIRONMENT_URL
814
810
  action: access
815
811
  artifacts:
816
812
  reports:
@@ -1011,9 +1007,9 @@ app 🧪 test:
1011
1007
  - kubernetesCreateSecret
1012
1008
  - kubernetesDeploy
1013
1009
  - echo 'Uploading SBOM to Dependency Track'
1014
- - /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
1010
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
1015
1011
  - echo deployment successful 😻
1016
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
1012
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1017
1013
  environment:
1018
1014
  name: stage/app
1019
1015
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1073,11 +1069,10 @@ app 🧪 test:
1073
1069
  - kubectl config use-context "kube-pan-test-app-stage-app"
1074
1070
  - kubernetesDelete
1075
1071
  - echo 'Disabling component in Dependency Track'
1076
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://app.stage.test-app.pan.panter.cloud" || true
1077
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
1072
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
1073
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1078
1074
  environment:
1079
1075
  name: stage/app
1080
- url: $CL_GITLAB_ENVIRONMENT_URL
1081
1076
  action: stop
1082
1077
  artifacts:
1083
1078
  reports:
@@ -1131,10 +1126,9 @@ app 🧪 test:
1131
1126
  - 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"
1132
1127
  - kubectl config use-context "kube-pan-test-app-stage-app"
1133
1128
  - kubernetesRollback
1134
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env
1129
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1135
1130
  environment:
1136
1131
  name: stage/app
1137
- url: $CL_GITLAB_ENVIRONMENT_URL
1138
1132
  action: access
1139
1133
  artifacts:
1140
1134
  reports:
@@ -1335,9 +1329,9 @@ app 🧪 test:
1335
1329
  - kubernetesCreateSecret
1336
1330
  - kubernetesDeploy
1337
1331
  - echo 'Uploading SBOM to Dependency Track'
1338
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://my-fancy-website.com" "__sbom.json" vex.json || true
1332
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "$ROOT_URL" "__sbom.json" vex.json || true
1339
1333
  - echo deployment successful 😻
1340
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env
1334
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1341
1335
  environment:
1342
1336
  name: prod/app
1343
1337
  url: $CL_GITLAB_ENVIRONMENT_URL
@@ -1397,11 +1391,10 @@ app 🧪 test:
1397
1391
  - kubectl config use-context "kube-pan-test-app-prod-app"
1398
1392
  - kubernetesDelete
1399
1393
  - echo 'Disabling component in Dependency Track'
1400
- - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://my-fancy-website.com" || true
1401
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env
1394
+ - /dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "$CI_ENVIRONMENT_URL" || true
1395
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1402
1396
  environment:
1403
1397
  name: prod/app
1404
- url: $CL_GITLAB_ENVIRONMENT_URL
1405
1398
  action: stop
1406
1399
  artifacts:
1407
1400
  reports:
@@ -1455,10 +1448,9 @@ app 🧪 test:
1455
1448
  - 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"
1456
1449
  - kubectl config use-context "kube-pan-test-app-prod-app"
1457
1450
  - kubernetesRollback
1458
- - echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env
1451
+ - echo "CL_GITLAB_ENVIRONMENT_URL=$ROOT_URL" >> gitlab_environment.env
1459
1452
  environment:
1460
1453
  name: prod/app
1461
- url: $CL_GITLAB_ENVIRONMENT_URL
1462
1454
  action: access
1463
1455
  artifacts:
1464
1456
  reports: