diff --git a/.evergreen/functions.yml b/.evergreen/functions.yml index b1fb5b0c798..7958d32eea8 100644 --- a/.evergreen/functions.yml +++ b/.evergreen/functions.yml @@ -93,6 +93,34 @@ post: - src/.evergreen/logs/* remote_file: ${project}/${revision}_${revision_order_id}/${build_variant}/${task_name} content_type: text/plain + - command: s3.put + params: + <<: *save-artifact-params-private + local_file: src/.sbom/dependencies.json + remote_file: ${project}/${revision}_${revision_order_id}/dependencies.json + content_type: application/json + optional: true + - command: s3.put + params: + <<: *save-artifact-params-private + local_file: src/.sbom/snyk-test-result.json + remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.json + content_type: application/json + optional: true + - command: s3.put + params: + <<: *save-artifact-params-private + local_file: src/.sbom/snyk-test-result.html + remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.html + content_type: text/html + optional: true + - command: s3.put + params: + <<: *save-artifact-params-private + local_file: src/.sbom/vulnerability-report.md + remote_file: ${project}/${revision}_${revision_order_id}/vulnerability-report.md + content_type: text/markdown + optional: true - command: attach.results params: file_location: src/packages/compass-e2e-tests/.log/report.json @@ -614,31 +642,3 @@ functions: if [[ "$EVERGREEN_IS_PATCH" != "true" ]]; then exit $return_code fi - - command: s3.put - params: - <<: *save-artifact-params-private - local_file: src/.sbom/dependencies.json - remote_file: ${project}/${revision}_${revision_order_id}/dependencies.json - content_type: application/json - optional: true - - command: s3.put - params: - <<: *save-artifact-params-private - local_file: src/.sbom/snyk-test-result.json - remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.json - content_type: application/json - optional: true - - command: s3.put - params: - <<: *save-artifact-params-private - local_file: src/.sbom/snyk-test-result.html - remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.html - content_type: text/html - optional: true - - command: s3.put - params: - <<: *save-artifact-params-private - local_file: src/.sbom/vulnerability-report.md - remote_file: ${project}/${revision}_${revision_order_id}/vulnerability-report.md - content_type: text/markdown - optional: true diff --git a/scripts/generate-snyk-reports.sh b/scripts/generate-snyk-reports.sh deleted file mode 100644 index db79170e144..00000000000 --- a/scripts/generate-snyk-reports.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -mkdir -p .snyk-reports - -electron_version=$(node -e "console.log(require('electron/package.json').version)") - -npx lerna exec 'mkdir -p node_modules' - -echo "Generating report for the electron version used (${electron_version}) ..." -npx snyk test "electron@${electron_version}" --json --severity-threshold=high > .snyk-reports/electron.json - -echo "Generating report with prod deps only ..." -npx snyk test --all-projects --json --severity-threshold=high > .snyk-reports/prod-only.json - -echo "Generating report with all deps ..." -npx snyk test --all-projects --severity-threshold=high --json --dev > .snyk-reports/all.json - -echo "Generating html reports ..." -npx snyk-to-html -i .snyk-reports/electron.json -o .snyk-reports/electron.html -npx snyk-to-html -i .snyk-reports/prod-only.json -o .snyk-reports/prod-only.html -npx snyk-to-html -i .snyk-reports/all.json -o .snyk-reports/all.html