Skip to content

CLOUDP-321185: fix sbom not included in release #3927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+9 −22
Open

CLOUDP-321185: fix sbom not included in release #3927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa05755
Migrate sbom functions to releaser task
cveticm May 30, 2025
2e97fde
Test if sbom is present in s3
cveticm May 30, 2025
bcdc65f
Fix test
cveticm May 30, 2025
6eb36fb
revert test
cveticm Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions build/ci/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ functions:
params:
shell: bash
script: |
docker run \
podman run \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason to use podman over docker?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this function is now being run on a rhel build var where podman is native. Originally this function was being run on a separate build var from the release task which was a ubuntu machine for which docker is native to.

--pull=always \
--platform="linux/amd64" \
--rm \
--env-file ${workdir}/kondukto_credentials.env \
-v ${workdir}:/workdir \
901841024863.dkr.ecr.us-east-1.amazonaws.com/release-infrastructure/silkbomb:2.0 \
upload \
--sbom-in /workdir/src/github.com/mongodb/mongodb-atlas-cli/compliance/sbom.json \
--sbom-in /workdir/src/github.com/mongodb/mongodb-atlas-cli/sbom.json \
--repo mongodb_mongodb-atlas-cli \
--branch ${branch_name}
rm ${workdir}/kondukto_credentials.env
Expand Down Expand Up @@ -253,6 +253,7 @@ functions:
- src/github.com/mongodb/mongodb-atlas-cli/dist/*.json
- src/github.com/mongodb/mongodb-atlas-cli/dist/*.msi
- src/github.com/mongodb/mongodb-atlas-cli/dist/*.sig
- src/github.com/mongodb/mongodb-atlas-cli/sbom.json
remote_file: ${project}/dist/${revision}_${created_at}/
bucket: mongodb-mongocli-build
permissions: public-read
Expand Down Expand Up @@ -391,16 +392,14 @@ tasks:
permissions: public-read
content_type: ${content_type|application/octet-stream}
display_name: unsigned
- name: generate_and_upload_sbom
commands:
- func: "generate sbom"
- func: "run silkbomb"
- name: package_goreleaser
tags: ["packaging"]
depends_on:
- name: compile
variant: "code_health"
commands:
- func: "generate sbom"
- func: "run silkbomb"
- func: "generate notices"
- func: "install goreleaser"
- func: "install macos notarization service"
Expand Down Expand Up @@ -588,8 +587,6 @@ buildvariants:
depends_on:
- name: package_msi
variant: "go_atlascli_msi_snapshot"
- name: generate_and_upload_sbom
variant: ssdlc
- name: publish_atlascli_snapshot
display_name: "Publish AtlasCLI Snapshot"
run_on:
Expand All @@ -615,8 +612,6 @@ buildvariants:
depends_on:
- name: package_msi
variant: release_atlascli_msi
- name: generate_and_upload_sbom
variant: ssdlc
- name: copybara
display_name: "Copybara"
git_tag_only: true
Expand Down Expand Up @@ -669,11 +664,3 @@ buildvariants:
- ubuntu2004-small
tasks:
- name: .smoke-test .generate .repo .atlascli
- name: ssdlc
display_name: Compliance [ssdlc]
run_on:
- ubuntu2204-small
expansions:
<<: *go_linux_version
tasks:
- name: generate_and_upload_sbom
2 changes: 1 addition & 1 deletion build/package/.goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,5 @@ release:
name_template: "MongoDB Atlas CLI {{.Version}}"
extra_files:
- glob: ./bin/*.msi
- glob: compliance/**/*
- glob: ./sbom.json
version: 2
6 changes: 3 additions & 3 deletions build/package/generate-sbom.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ set -Eeou pipefail
export WORKDIR=${workdir:?}

# Authenticate Docker to AWS ECR
aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 901841024863.dkr.ecr.us-east-1.amazonaws.com
aws ecr get-login-password --region us-east-1 | podman login --username AWS --password-stdin 901841024863.dkr.ecr.us-east-1.amazonaws.com

echo "Generating SBOMs..."
docker run --rm \
podman run --rm \
-v "$WORKDIR/src/github.com/mongodb/mongodb-atlas-cli:/pwd" \
901841024863.dkr.ecr.us-east-1.amazonaws.com/release-infrastructure/silkbomb:2.0 \
update \
--purls /pwd/build/package/purls.txt \
--sbom-out /pwd/compliance/sbom.json
--sbom-out /pwd/sbom.json

Loading