@catladder/pipeline 1.148.0 → 1.148.1
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.
- package/dist/bundles/catladder-gitlab/index.js +1 -1
- package/dist/constants.js +1 -1
- package/dist/deploy/cloudRun/createJobs/common.js +1 -1
- package/dist/deploy/sbom.js +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-meteor-with-worker.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-no-service.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-non-public.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-post-stop-job.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-service-gen2.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-service-with-volumes.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-storybook.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-with-ngnix.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +16 -16
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +16 -16
- package/examples/__snapshots__/cloud-run-with-worker.ts.snap +8 -8
- package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +8 -8
- package/examples/__snapshots__/custom-build-job.ts.snap +8 -8
- package/examples/__snapshots__/custom-deploy.ts.snap +8 -8
- package/examples/__snapshots__/custom-sbom-java.ts.snap +8 -8
- package/examples/__snapshots__/kubernetes-application-customization.ts.snap +8 -8
- package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +8 -8
- package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +8 -8
- package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +16 -16
- package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +8 -8
- package/examples/__snapshots__/local-dot-env.ts.snap +8 -8
- package/examples/__snapshots__/meteor-kubernetes.ts.snap +8 -8
- package/examples/__snapshots__/multiline-var.ts.snap +16 -16
- package/examples/__snapshots__/native-app.ts.snap +12 -12
- package/examples/__snapshots__/node-build-with-custom-image.ts.snap +8 -8
- package/examples/__snapshots__/node-build-with-docker-additions.ts.snap +8 -8
- package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +16 -16
- package/examples/__snapshots__/wait-for-other-deploy.ts.snap +8 -8
- package/package.json +1 -1
- package/src/deploy/cloudRun/createJobs/common.ts +1 -1
- package/src/deploy/sbom.ts +2 -2
|
@@ -341,7 +341,7 @@ EOF
|
|
|
341
341
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/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/dev/api@$version --quiet --delete-tags; done",
|
|
342
342
|
"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",
|
|
343
343
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
344
|
-
"echo Uploading SBOM to Dependency Track",
|
|
344
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
345
345
|
"/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",
|
|
346
346
|
"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",
|
|
347
347
|
],
|
|
@@ -392,7 +392,7 @@ EOF
|
|
|
392
392
|
"gcloud run services delete pan-test-app-dev-api --project=asdf --region=asia-east1",
|
|
393
393
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags",
|
|
394
394
|
"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",
|
|
395
|
-
"echo Disabling component in Dependency Track",
|
|
395
|
+
"echo 'Disabling component in Dependency Track'",
|
|
396
396
|
"/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",
|
|
397
397
|
"set -e",
|
|
398
398
|
"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",
|
|
@@ -762,7 +762,7 @@ EOF",
|
|
|
762
762
|
"gem install bundler",
|
|
763
763
|
"bundle install",
|
|
764
764
|
"bundle exec fastlane deploy_test",
|
|
765
|
-
"echo Uploading SBOM to Dependency Track",
|
|
765
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
766
766
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
767
767
|
],
|
|
768
768
|
"stage": "deploy dev",
|
|
@@ -1298,7 +1298,7 @@ EOF
|
|
|
1298
1298
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
|
|
1299
1299
|
"set -e",
|
|
1300
1300
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
1301
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1301
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1302
1302
|
"/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",
|
|
1303
1303
|
"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",
|
|
1304
1304
|
],
|
|
@@ -1352,7 +1352,7 @@ EOF
|
|
|
1352
1352
|
"set +e",
|
|
1353
1353
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api --quiet --delete-tags",
|
|
1354
1354
|
"set -e",
|
|
1355
|
-
"echo Disabling component in Dependency Track",
|
|
1355
|
+
"echo 'Disabling component in Dependency Track'",
|
|
1356
1356
|
"/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",
|
|
1357
1357
|
"set -e",
|
|
1358
1358
|
"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",
|
|
@@ -1722,7 +1722,7 @@ EOF",
|
|
|
1722
1722
|
"gem install bundler",
|
|
1723
1723
|
"bundle install",
|
|
1724
1724
|
"bundle exec fastlane deploy_test",
|
|
1725
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1725
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1726
1726
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
1727
1727
|
],
|
|
1728
1728
|
"stage": "deploy review",
|
|
@@ -2349,7 +2349,7 @@ EOF
|
|
|
2349
2349
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +7 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api@$version --quiet --delete-tags; done",
|
|
2350
2350
|
"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",
|
|
2351
2351
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
2352
|
-
"echo Uploading SBOM to Dependency Track",
|
|
2352
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
2353
2353
|
"/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",
|
|
2354
2354
|
"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",
|
|
2355
2355
|
],
|
|
@@ -2474,7 +2474,7 @@ EOF
|
|
|
2474
2474
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/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/stage/api@$version --quiet --delete-tags; done",
|
|
2475
2475
|
"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",
|
|
2476
2476
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
2477
|
-
"echo Uploading SBOM to Dependency Track",
|
|
2477
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
2478
2478
|
"/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",
|
|
2479
2479
|
"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",
|
|
2480
2480
|
],
|
|
@@ -2525,7 +2525,7 @@ EOF
|
|
|
2525
2525
|
"gcloud run services delete pan-test-app-prod-api --project=asdf --region=asia-east1",
|
|
2526
2526
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags",
|
|
2527
2527
|
"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",
|
|
2528
|
-
"echo Disabling component in Dependency Track",
|
|
2528
|
+
"echo 'Disabling component in Dependency Track'",
|
|
2529
2529
|
"/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",
|
|
2530
2530
|
"set -e",
|
|
2531
2531
|
"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",
|
|
@@ -2578,7 +2578,7 @@ EOF
|
|
|
2578
2578
|
"gcloud run services delete pan-test-app-stage-api --project=asdf --region=asia-east1",
|
|
2579
2579
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags",
|
|
2580
2580
|
"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",
|
|
2581
|
-
"echo Disabling component in Dependency Track",
|
|
2581
|
+
"echo 'Disabling component in Dependency Track'",
|
|
2582
2582
|
"/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",
|
|
2583
2583
|
"set -e",
|
|
2584
2584
|
"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",
|
|
@@ -2953,7 +2953,7 @@ EOF",
|
|
|
2953
2953
|
"gem install bundler",
|
|
2954
2954
|
"bundle install",
|
|
2955
2955
|
"bundle exec fastlane deploy_test",
|
|
2956
|
-
"echo Uploading SBOM to Dependency Track",
|
|
2956
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
2957
2957
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
2958
2958
|
],
|
|
2959
2959
|
"stage": "deploy prod",
|
|
@@ -3030,7 +3030,7 @@ EOF",
|
|
|
3030
3030
|
"gem install bundler",
|
|
3031
3031
|
"bundle install",
|
|
3032
3032
|
"bundle exec fastlane deploy_test",
|
|
3033
|
-
"echo Uploading SBOM to Dependency Track",
|
|
3033
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
3034
3034
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
3035
3035
|
],
|
|
3036
3036
|
"stage": "deploy stage",
|
|
@@ -341,7 +341,7 @@ EOF
|
|
|
341
341
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/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/dev/www@$version --quiet --delete-tags; done",
|
|
342
342
|
"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",
|
|
343
343
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
344
|
-
"echo Uploading SBOM to Dependency Track",
|
|
344
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
345
345
|
"/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",
|
|
346
346
|
"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",
|
|
347
347
|
],
|
|
@@ -392,7 +392,7 @@ EOF
|
|
|
392
392
|
"gcloud run services delete pan-test-app-dev-www --project=asdf --region=asia-east1",
|
|
393
393
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags",
|
|
394
394
|
"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",
|
|
395
|
-
"echo Disabling component in Dependency Track",
|
|
395
|
+
"echo 'Disabling component in Dependency Track'",
|
|
396
396
|
"/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",
|
|
397
397
|
"set -e",
|
|
398
398
|
"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",
|
|
@@ -924,7 +924,7 @@ EOF
|
|
|
924
924
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
|
|
925
925
|
"set -e",
|
|
926
926
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
927
|
-
"echo Uploading SBOM to Dependency Track",
|
|
927
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
928
928
|
"/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",
|
|
929
929
|
"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",
|
|
930
930
|
],
|
|
@@ -978,7 +978,7 @@ EOF
|
|
|
978
978
|
"set +e",
|
|
979
979
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
|
|
980
980
|
"set -e",
|
|
981
|
-
"echo Disabling component in Dependency Track",
|
|
981
|
+
"echo 'Disabling component in Dependency Track'",
|
|
982
982
|
"/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",
|
|
983
983
|
"set -e",
|
|
984
984
|
"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",
|
|
@@ -1601,7 +1601,7 @@ EOF
|
|
|
1601
1601
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +7 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www@$version --quiet --delete-tags; done",
|
|
1602
1602
|
"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",
|
|
1603
1603
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
1604
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1604
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1605
1605
|
"/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",
|
|
1606
1606
|
"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",
|
|
1607
1607
|
],
|
|
@@ -1726,7 +1726,7 @@ EOF
|
|
|
1726
1726
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/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/stage/www@$version --quiet --delete-tags; done",
|
|
1727
1727
|
"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",
|
|
1728
1728
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
1729
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1729
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1730
1730
|
"/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",
|
|
1731
1731
|
"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",
|
|
1732
1732
|
],
|
|
@@ -1777,7 +1777,7 @@ EOF
|
|
|
1777
1777
|
"gcloud run services delete pan-test-app-prod-www --project=asdf --region=asia-east1",
|
|
1778
1778
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags",
|
|
1779
1779
|
"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",
|
|
1780
|
-
"echo Disabling component in Dependency Track",
|
|
1780
|
+
"echo 'Disabling component in Dependency Track'",
|
|
1781
1781
|
"/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",
|
|
1782
1782
|
"set -e",
|
|
1783
1783
|
"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",
|
|
@@ -1830,7 +1830,7 @@ EOF
|
|
|
1830
1830
|
"gcloud run services delete pan-test-app-stage-www --project=asdf --region=asia-east1",
|
|
1831
1831
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags",
|
|
1832
1832
|
"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",
|
|
1833
|
-
"echo Disabling component in Dependency Track",
|
|
1833
|
+
"echo 'Disabling component in Dependency Track'",
|
|
1834
1834
|
"/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",
|
|
1835
1835
|
"set -e",
|
|
1836
1836
|
"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",
|
|
@@ -343,7 +343,7 @@ EOF
|
|
|
343
343
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/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/dev/www@$version --quiet --delete-tags; done",
|
|
344
344
|
"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",
|
|
345
345
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
346
|
-
"echo Uploading SBOM to Dependency Track",
|
|
346
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
347
347
|
"/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",
|
|
348
348
|
"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",
|
|
349
349
|
],
|
|
@@ -394,7 +394,7 @@ EOF
|
|
|
394
394
|
"gcloud run services delete pan-test-app-dev-www --project=asdf --region=asia-east1",
|
|
395
395
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags",
|
|
396
396
|
"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",
|
|
397
|
-
"echo Disabling component in Dependency Track",
|
|
397
|
+
"echo 'Disabling component in Dependency Track'",
|
|
398
398
|
"/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",
|
|
399
399
|
"set -e",
|
|
400
400
|
"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",
|
|
@@ -928,7 +928,7 @@ EOF
|
|
|
928
928
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
|
|
929
929
|
"set -e",
|
|
930
930
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
931
|
-
"echo Uploading SBOM to Dependency Track",
|
|
931
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
932
932
|
"/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",
|
|
933
933
|
"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",
|
|
934
934
|
],
|
|
@@ -982,7 +982,7 @@ EOF
|
|
|
982
982
|
"set +e",
|
|
983
983
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www --quiet --delete-tags",
|
|
984
984
|
"set -e",
|
|
985
|
-
"echo Disabling component in Dependency Track",
|
|
985
|
+
"echo 'Disabling component in Dependency Track'",
|
|
986
986
|
"/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",
|
|
987
987
|
"set -e",
|
|
988
988
|
"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",
|
|
@@ -1609,7 +1609,7 @@ EOF
|
|
|
1609
1609
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +7 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www@$version --quiet --delete-tags; done",
|
|
1610
1610
|
"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",
|
|
1611
1611
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
1612
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1612
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1613
1613
|
"/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",
|
|
1614
1614
|
"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",
|
|
1615
1615
|
],
|
|
@@ -1734,7 +1734,7 @@ EOF
|
|
|
1734
1734
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/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/stage/www@$version --quiet --delete-tags; done",
|
|
1735
1735
|
"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",
|
|
1736
1736
|
"echo -e "\\e[0Ksection_end:$(date +%s):cleanup\\r\\e[0K"",
|
|
1737
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1737
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1738
1738
|
"/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",
|
|
1739
1739
|
"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",
|
|
1740
1740
|
],
|
|
@@ -1785,7 +1785,7 @@ EOF
|
|
|
1785
1785
|
"gcloud run services delete pan-test-app-prod-www --project=asdf --region=asia-east1",
|
|
1786
1786
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags",
|
|
1787
1787
|
"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",
|
|
1788
|
-
"echo Disabling component in Dependency Track",
|
|
1788
|
+
"echo 'Disabling component in Dependency Track'",
|
|
1789
1789
|
"/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",
|
|
1790
1790
|
"set -e",
|
|
1791
1791
|
"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",
|
|
@@ -1838,7 +1838,7 @@ EOF
|
|
|
1838
1838
|
"gcloud run services delete pan-test-app-stage-www --project=asdf --region=asia-east1",
|
|
1839
1839
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags",
|
|
1840
1840
|
"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",
|
|
1841
|
-
"echo Disabling component in Dependency Track",
|
|
1841
|
+
"echo 'Disabling component in Dependency Track'",
|
|
1842
1842
|
"/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",
|
|
1843
1843
|
"set -e",
|
|
1844
1844
|
"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",
|
|
@@ -328,7 +328,7 @@ EOF
|
|
|
328
328
|
"echo -e "\\e[0Ksection_end:$(date +%s):writeallvalues\\r\\e[0K"",
|
|
329
329
|
"kubernetesCreateSecret",
|
|
330
330
|
"kubernetesDeploy",
|
|
331
|
-
"echo Uploading SBOM to Dependency Track",
|
|
331
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
332
332
|
"/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",
|
|
333
333
|
"echo deployment successful 😻",
|
|
334
334
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env",
|
|
@@ -404,7 +404,7 @@ EOF
|
|
|
404
404
|
"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"",
|
|
405
405
|
"kubectl config use-context "kube-pan-test-app-dev-app"",
|
|
406
406
|
"kubernetesDelete",
|
|
407
|
-
"echo Disabling component in Dependency Track",
|
|
407
|
+
"echo 'Disabling component in Dependency Track'",
|
|
408
408
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://app.dev.test-app.pan.panter.cloud" || true",
|
|
409
409
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env",
|
|
410
410
|
],
|
|
@@ -902,7 +902,7 @@ EOF
|
|
|
902
902
|
"echo -e "\\e[0Ksection_end:$(date +%s):writeallvalues\\r\\e[0K"",
|
|
903
903
|
"kubernetesCreateSecret",
|
|
904
904
|
"kubernetesDeploy",
|
|
905
|
-
"echo Uploading SBOM to Dependency Track",
|
|
905
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
906
906
|
"/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",
|
|
907
907
|
"echo deployment successful 😻",
|
|
908
908
|
"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",
|
|
@@ -978,7 +978,7 @@ EOF
|
|
|
978
978
|
"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"",
|
|
979
979
|
"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"",
|
|
980
980
|
"kubernetesDelete",
|
|
981
|
-
"echo Disabling component in Dependency Track",
|
|
981
|
+
"echo 'Disabling component in Dependency Track'",
|
|
982
982
|
"/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",
|
|
983
983
|
"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",
|
|
984
984
|
],
|
|
@@ -1543,7 +1543,7 @@ EOF
|
|
|
1543
1543
|
"echo -e "\\e[0Ksection_end:$(date +%s):writeallvalues\\r\\e[0K"",
|
|
1544
1544
|
"kubernetesCreateSecret",
|
|
1545
1545
|
"kubernetesDeploy",
|
|
1546
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1546
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1547
1547
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://my-fancy-website.com" "__sbom.json" vex.json || true",
|
|
1548
1548
|
"echo deployment successful 😻",
|
|
1549
1549
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env",
|
|
@@ -1715,7 +1715,7 @@ EOF
|
|
|
1715
1715
|
"echo -e "\\e[0Ksection_end:$(date +%s):writeallvalues\\r\\e[0K"",
|
|
1716
1716
|
"kubernetesCreateSecret",
|
|
1717
1717
|
"kubernetesDeploy",
|
|
1718
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1718
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1719
1719
|
"/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",
|
|
1720
1720
|
"echo deployment successful 😻",
|
|
1721
1721
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env",
|
|
@@ -1791,7 +1791,7 @@ EOF
|
|
|
1791
1791
|
"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"",
|
|
1792
1792
|
"kubectl config use-context "kube-pan-test-app-prod-app"",
|
|
1793
1793
|
"kubernetesDelete",
|
|
1794
|
-
"echo Disabling component in Dependency Track",
|
|
1794
|
+
"echo 'Disabling component in Dependency Track'",
|
|
1795
1795
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://my-fancy-website.com" || true",
|
|
1796
1796
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env",
|
|
1797
1797
|
],
|
|
@@ -1867,7 +1867,7 @@ EOF
|
|
|
1867
1867
|
"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"",
|
|
1868
1868
|
"kubectl config use-context "kube-pan-test-app-stage-app"",
|
|
1869
1869
|
"kubernetesDelete",
|
|
1870
|
-
"echo Disabling component in Dependency Track",
|
|
1870
|
+
"echo 'Disabling component in Dependency Track'",
|
|
1871
1871
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://app.stage.test-app.pan.panter.cloud" || true",
|
|
1872
1872
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env",
|
|
1873
1873
|
],
|
|
@@ -2338,7 +2338,7 @@ EOF
|
|
|
2338
2338
|
"echo -e "\\e[0Ksection_end:$(date +%s):writeallvalues\\r\\e[0K"",
|
|
2339
2339
|
"kubernetesCreateSecret",
|
|
2340
2340
|
"kubernetesDeploy",
|
|
2341
|
-
"echo Uploading SBOM to Dependency Track",
|
|
2341
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
2342
2342
|
"/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",
|
|
2343
2343
|
"echo deployment successful 😻",
|
|
2344
2344
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env",
|
|
@@ -2414,7 +2414,7 @@ EOF
|
|
|
2414
2414
|
"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"",
|
|
2415
2415
|
"kubectl config use-context "kube-pan-test-app-dev-app"",
|
|
2416
2416
|
"kubernetesDelete",
|
|
2417
|
-
"echo Disabling component in Dependency Track",
|
|
2417
|
+
"echo 'Disabling component in Dependency Track'",
|
|
2418
2418
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://app.dev.test-app.pan.panter.cloud" || true",
|
|
2419
2419
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://app.dev.test-app.pan.panter.cloud" >> gitlab_environment.env",
|
|
2420
2420
|
],
|
|
@@ -2916,7 +2916,7 @@ EOF
|
|
|
2916
2916
|
"echo -e "\\e[0Ksection_end:$(date +%s):writeallvalues\\r\\e[0K"",
|
|
2917
2917
|
"kubernetesCreateSecret",
|
|
2918
2918
|
"kubernetesDeploy",
|
|
2919
|
-
"echo Uploading SBOM to Dependency Track",
|
|
2919
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
2920
2920
|
"/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",
|
|
2921
2921
|
"echo deployment successful 😻",
|
|
2922
2922
|
"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",
|
|
@@ -2992,7 +2992,7 @@ EOF
|
|
|
2992
2992
|
"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"",
|
|
2993
2993
|
"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"",
|
|
2994
2994
|
"kubernetesDelete",
|
|
2995
|
-
"echo Disabling component in Dependency Track",
|
|
2995
|
+
"echo 'Disabling component in Dependency Track'",
|
|
2996
2996
|
"/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",
|
|
2997
2997
|
"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",
|
|
2998
2998
|
],
|
|
@@ -3565,7 +3565,7 @@ EOF
|
|
|
3565
3565
|
"echo -e "\\e[0Ksection_end:$(date +%s):writeallvalues\\r\\e[0K"",
|
|
3566
3566
|
"kubernetesCreateSecret",
|
|
3567
3567
|
"kubernetesDeploy",
|
|
3568
|
-
"echo Uploading SBOM to Dependency Track",
|
|
3568
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
3569
3569
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/app" "https://my-fancy-website.com" "__sbom.json" vex.json || true",
|
|
3570
3570
|
"echo deployment successful 😻",
|
|
3571
3571
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env",
|
|
@@ -3737,7 +3737,7 @@ EOF
|
|
|
3737
3737
|
"echo -e "\\e[0Ksection_end:$(date +%s):writeallvalues\\r\\e[0K"",
|
|
3738
3738
|
"kubernetesCreateSecret",
|
|
3739
3739
|
"kubernetesDeploy",
|
|
3740
|
-
"echo Uploading SBOM to Dependency Track",
|
|
3740
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
3741
3741
|
"/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",
|
|
3742
3742
|
"echo deployment successful 😻",
|
|
3743
3743
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env",
|
|
@@ -3813,7 +3813,7 @@ EOF
|
|
|
3813
3813
|
"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"",
|
|
3814
3814
|
"kubectl config use-context "kube-pan-test-app-prod-app"",
|
|
3815
3815
|
"kubernetesDelete",
|
|
3816
|
-
"echo Disabling component in Dependency Track",
|
|
3816
|
+
"echo 'Disabling component in Dependency Track'",
|
|
3817
3817
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://my-fancy-website.com" || true",
|
|
3818
3818
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://my-fancy-website.com" >> gitlab_environment.env",
|
|
3819
3819
|
],
|
|
@@ -3889,7 +3889,7 @@ EOF
|
|
|
3889
3889
|
"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"",
|
|
3890
3890
|
"kubectl config use-context "kube-pan-test-app-stage-app"",
|
|
3891
3891
|
"kubernetesDelete",
|
|
3892
|
-
"echo Disabling component in Dependency Track",
|
|
3892
|
+
"echo 'Disabling component in Dependency Track'",
|
|
3893
3893
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "pan-test-app/app" "https://app.stage.test-app.pan.panter.cloud" || true",
|
|
3894
3894
|
"echo "CL_GITLAB_ENVIRONMENT_URL=https://app.stage.test-app.pan.panter.cloud" >> gitlab_environment.env",
|
|
3895
3895
|
],
|
|
@@ -196,7 +196,7 @@ exports[`matches snapshot 1`] = `
|
|
|
196
196
|
"echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
|
|
197
197
|
"cd api",
|
|
198
198
|
"yarn deploy",
|
|
199
|
-
"echo Uploading SBOM to Dependency Track",
|
|
199
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
200
200
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
201
201
|
],
|
|
202
202
|
"stage": "deploy dev",
|
|
@@ -504,7 +504,7 @@ exports[`matches snapshot 1`] = `
|
|
|
504
504
|
"echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
|
|
505
505
|
"cd www",
|
|
506
506
|
"yarn deploy",
|
|
507
|
-
"echo Uploading SBOM to Dependency Track",
|
|
507
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
508
508
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
509
509
|
],
|
|
510
510
|
"stage": "deploy dev",
|
|
@@ -885,7 +885,7 @@ exports[`matches snapshot 1`] = `
|
|
|
885
885
|
"echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
|
|
886
886
|
"cd api",
|
|
887
887
|
"yarn deploy",
|
|
888
|
-
"echo Uploading SBOM to Dependency Track",
|
|
888
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
889
889
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
890
890
|
],
|
|
891
891
|
"stage": "deploy review",
|
|
@@ -1193,7 +1193,7 @@ exports[`matches snapshot 1`] = `
|
|
|
1193
1193
|
"echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
|
|
1194
1194
|
"cd www",
|
|
1195
1195
|
"yarn deploy",
|
|
1196
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1196
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1197
1197
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
1198
1198
|
],
|
|
1199
1199
|
"stage": "deploy review",
|
|
@@ -1593,7 +1593,7 @@ exports[`matches snapshot 1`] = `
|
|
|
1593
1593
|
"echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
|
|
1594
1594
|
"cd api",
|
|
1595
1595
|
"yarn deploy",
|
|
1596
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1596
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1597
1597
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
1598
1598
|
],
|
|
1599
1599
|
"stage": "deploy prod",
|
|
@@ -1647,7 +1647,7 @@ exports[`matches snapshot 1`] = `
|
|
|
1647
1647
|
"echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
|
|
1648
1648
|
"cd api",
|
|
1649
1649
|
"yarn deploy",
|
|
1650
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1650
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1651
1651
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/api" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
1652
1652
|
],
|
|
1653
1653
|
"stage": "deploy stage",
|
|
@@ -1921,7 +1921,7 @@ exports[`matches snapshot 1`] = `
|
|
|
1921
1921
|
"echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
|
|
1922
1922
|
"cd www",
|
|
1923
1923
|
"yarn deploy",
|
|
1924
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1924
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1925
1925
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
1926
1926
|
],
|
|
1927
1927
|
"stage": "deploy prod",
|
|
@@ -1979,7 +1979,7 @@ exports[`matches snapshot 1`] = `
|
|
|
1979
1979
|
"echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
|
|
1980
1980
|
"cd www",
|
|
1981
1981
|
"yarn deploy",
|
|
1982
|
-
"echo Uploading SBOM to Dependency Track",
|
|
1982
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
1983
1983
|
"/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "pan-test-app/www" "https://unknown-host.example.com" "__sbom.json" vex.json || true",
|
|
1984
1984
|
],
|
|
1985
1985
|
"stage": "deploy stage",
|
package/package.json
CHANGED
|
@@ -21,7 +21,7 @@ export const setGoogleProjectNumberScript = (
|
|
|
21
21
|
`export GCLOUD_PROJECT_NUMBER=$(${gcloudCmd()} projects describe ${
|
|
22
22
|
deployConfig.projectId
|
|
23
23
|
} --format="value(projectNumber)")`,
|
|
24
|
-
|
|
24
|
+
'echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"',
|
|
25
25
|
];
|
|
26
26
|
|
|
27
27
|
export const makeLabelString = (obj: Record<string, unknown>) =>
|
package/src/deploy/sbom.ts
CHANGED
|
@@ -10,7 +10,7 @@ export const getDependencyTrackUploadScript = (
|
|
|
10
10
|
return sbomDeactivated(context)
|
|
11
11
|
? []
|
|
12
12
|
: [
|
|
13
|
-
"echo Uploading SBOM to Dependency Track",
|
|
13
|
+
"echo 'Uploading SBOM to Dependency Track'",
|
|
14
14
|
`/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.componentName}" "${context.environment.url}" "${SBOM_FILE}" vex.json || true`,
|
|
15
15
|
];
|
|
16
16
|
};
|
|
@@ -21,7 +21,7 @@ export const getDependencyTrackDeleteScript = (
|
|
|
21
21
|
return sbomDeactivated(context)
|
|
22
22
|
? []
|
|
23
23
|
: [
|
|
24
|
-
"echo Disabling component in Dependency Track",
|
|
24
|
+
"echo 'Disabling component in Dependency Track'",
|
|
25
25
|
`/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.componentName}" "${context.environment.url}" || true`,
|
|
26
26
|
];
|
|
27
27
|
};
|