Skip to content

Commit cf4e319

Browse files
committed
Migrate sbom functions to releaser task
1 parent 2cb5d03 commit cf4e319

File tree

3 files changed

+15
-82
lines changed

3 files changed

+15
-82
lines changed

build/ci/release.yml

Lines changed: 11 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ functions:
100100
params:
101101
shell: bash
102102
script: |
103-
docker run \
103+
podman run \
104104
--pull=always \
105105
--platform="linux/amd64" \
106106
--rm \
107107
--env-file ${workdir}/kondukto_credentials.env \
108108
-v ${workdir}:/workdir \
109109
901841024863.dkr.ecr.us-east-1.amazonaws.com/release-infrastructure/silkbomb:2.0 \
110110
upload \
111-
--sbom-in /workdir/src/github.com/mongodb/mongodb-atlas-cli/compliance/sbom.json \
111+
--sbom-in /workdir/src/github.com/mongodb/mongodb-atlas-cli/sbom.json \
112112
--repo mongodb_mongodb-atlas-cli \
113113
--branch ${branch_name}
114114
rm ${workdir}/kondukto_credentials.env
@@ -253,6 +253,7 @@ functions:
253253
- src/github.com/mongodb/mongodb-atlas-cli/dist/*.json
254254
- src/github.com/mongodb/mongodb-atlas-cli/dist/*.msi
255255
- src/github.com/mongodb/mongodb-atlas-cli/dist/*.sig
256+
- src/github.com/mongodb/mongodb-atlas-cli/sbom.json
256257
remote_file: ${project}/dist/${revision}_${created_at}/
257258
bucket: mongodb-mongocli-build
258259
permissions: public-read
@@ -391,16 +392,14 @@ tasks:
391392
permissions: public-read
392393
content_type: ${content_type|application/octet-stream}
393394
display_name: unsigned
394-
- name: generate_and_upload_sbom
395-
commands:
396-
- func: "generate sbom"
397-
- func: "run silkbomb"
398395
- name: package_goreleaser
399396
tags: ["packaging"]
400397
depends_on:
401398
- name: compile
402399
variant: "code_health"
403400
commands:
401+
- func: "generate sbom"
402+
- func: "run silkbomb"
404403
- func: "generate notices"
405404
- func: "install goreleaser"
406405
- func: "install macos notarization service"
@@ -413,66 +412,12 @@ tasks:
413412
- project
414413
- revision
415414
- created_at
416-
env:
417-
BUCKET: mongodb-mongocli-build
418-
unstable: ${unstable}
419-
binary: build/package/download-win-binaries.sh
420-
- command: subprocess.exec
421-
type: test
422-
params:
423-
include_expansions_in_env:
424-
- unstable
425-
env:
426-
ARTIFACTORY_USERNAME: ${artifactory_username}
427-
ARTIFACTORY_PASSWORD: ${artifactory_password}
428-
GRS_USERNAME: ${garasign_username}
429-
GRS_PASSWORD: ${garasign_password}
430-
AUTHENTICODE_KEY_NAME: ${authenticode_key_name}
431-
working_dir: src/github.com/mongodb/mongodb-atlas-cli
432-
binary: build/package/windows_notarize.sh
433-
- func: "package"
434-
vars:
435-
unstable: ${unstable}
436-
ARTIFACTORY_USERNAME: ${artifactory_username}
437-
ARTIFACTORY_PASSWORD: ${artifactory_password}
438-
GRS_USERNAME: ${garasign_username}
439-
GRS_PASSWORD: ${garasign_password}
440-
- func: "rename pkg"
441-
vars:
442-
unstable: ${unstable}
443-
latest_deb: ${latest_deb}
444-
latest_rpm: ${latest_rpm}
445-
package_name: ${package_name}
446-
meta_package_name: ${meta_package_name}
447-
- command: archive.targz_pack
448-
params:
449-
target: src/github.com/mongodb/mongodb-atlas-cli/dist/atlascli-deb-x86_64.tgz
450-
source_dir: src/github.com/mongodb/mongodb-atlas-cli/dist/apt/x86_64
451-
include:
452-
- "*.deb"
453-
- command: archive.targz_pack
454-
params:
455-
target: src/github.com/mongodb/mongodb-atlas-cli/dist/atlascli-deb-arm64.tgz
456-
source_dir: src/github.com/mongodb/mongodb-atlas-cli/dist/apt/arm64
457-
include:
458-
- "*.deb"
459-
- command: archive.targz_pack
460-
params:
461-
target: src/github.com/mongodb/mongodb-atlas-cli/dist/atlascli-rpm-x86_64.tgz
462-
source_dir: src/github.com/mongodb/mongodb-atlas-cli/dist/yum/x86_64
463-
include:
464-
- "*.rpm"
465-
- command: archive.targz_pack
466-
params:
467-
target: src/github.com/mongodb/mongodb-atlas-cli/dist/atlascli-rpm-aarch64.tgz
468-
source_dir: src/github.com/mongodb/mongodb-atlas-cli/dist/yum/arm64
469-
include:
470-
- "*.rpm"
471-
- func: "generate download archive json"
472-
vars:
473-
package_name: ${package_name}
474-
FEED_FILE_NAME: "${package_name}.json"
475-
- func: "upload dist"
415+
script: |
416+
set -e
417+
ls -l ./dist
418+
ls -l
419+
curl -f "https://mongodb-mongocli-build.s3.amazonaws.com/${project}/dist/${revision}_${created_at}/sbom.json" -o sbom.json
420+
cat sbom.json
476421
- command: s3.put
477422
params:
478423
role_arn: "arn:aws:iam::119629040606:role/s3-access.cdn-origin-mongocli"
@@ -588,8 +533,6 @@ buildvariants:
588533
depends_on:
589534
- name: package_msi
590535
variant: "go_atlascli_msi_snapshot"
591-
- name: generate_and_upload_sbom
592-
variant: ssdlc
593536
- name: publish_atlascli_snapshot
594537
display_name: "Publish AtlasCLI Snapshot"
595538
run_on:
@@ -615,8 +558,6 @@ buildvariants:
615558
depends_on:
616559
- name: package_msi
617560
variant: release_atlascli_msi
618-
- name: generate_and_upload_sbom
619-
variant: ssdlc
620561
- name: copybara
621562
display_name: "Copybara"
622563
git_tag_only: true
@@ -669,11 +610,3 @@ buildvariants:
669610
- ubuntu2004-small
670611
tasks:
671612
- name: .smoke-test .generate .repo .atlascli
672-
- name: ssdlc
673-
display_name: Compliance [ssdlc]
674-
run_on:
675-
- ubuntu2204-small
676-
expansions:
677-
<<: *go_linux_version
678-
tasks:
679-
- name: generate_and_upload_sbom

build/package/.goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,5 @@ release:
142142
name_template: "MongoDB Atlas CLI {{.Version}}"
143143
extra_files:
144144
- glob: ./bin/*.msi
145-
- glob: compliance/**/*
145+
- glob: ./sbom.json
146146
version: 2

build/package/generate-sbom.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ set -Eeou pipefail
1919
export WORKDIR=${workdir:?}
2020

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

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

0 commit comments

Comments
 (0)