Skip to content

Commit 2042a67

Browse files
committed
address review suggestions
1 parent 1d6ac04 commit 2042a67

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

evergreen/download-augmented-sbom.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@
44
# SILK_CLIENT_ID
55
# SILK_CLIENT_SECRET
66

7-
cat << EOF > silkbomb.env
8-
SILK_CLIENT_ID=${SILK_CLIENT_ID}
9-
SILK_CLIENT_SECRET=${SILK_CLIENT_SECRET}
10-
EOF
11-
127
declare -r SSDLC_PATH="./artifacts/ssdlc"
138
mkdir -p "${SSDLC_PATH}"
149

1510
echo "Downloading augmented sbom from silk"
1611

1712
docker run --platform="linux/amd64" --rm -v ${PWD}:/pwd \
18-
--env-file silkbomb.env \
13+
-e SILK_CLIENT_ID \
14+
-e SILK_CLIENT_SECRET \
1915
artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 \
2016
download --silk-asset-group mongodb-dotnet-csharp-driver --sbom-out /pwd/${SSDLC_PATH}/augmented-sbom.json

evergreen/evergreen.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,6 @@ functions:
247247
script: |
248248
${PREPARE_SHELL}
249249
./evergreen/download-augmented-sbom.sh
250-
- command: ec2.assume_role
251-
params:
252-
role_arn: ${UPLOAD_SSDLC_RELEASE_ASSETS_ROLE_ARN}
253250
- command: s3.put
254251
params:
255252
aws_key: ${AWS_ACCESS_KEY_ID}
@@ -273,9 +270,6 @@ functions:
273270
script: |
274271
${PREPARE_SHELL}
275272
./evergreen/generate-ssdlc-report.sh
276-
- command: ec2.assume_role
277-
params:
278-
role_arn: ${UPLOAD_SSDLC_RELEASE_ASSETS_ROLE_ARN}
279273
- command: s3.put
280274
params:
281275
aws_key: ${AWS_ACCESS_KEY_ID}
@@ -1888,6 +1882,9 @@ tasks:
18881882

18891883
- name: generate-ssdlc-reports
18901884
commands:
1885+
- command: ec2.assume_role
1886+
params:
1887+
role_arn: ${UPLOAD_SSDLC_RELEASE_ASSETS_ROLE_ARN}
18911888
- func: download-packages
18921889
- func: trace-artifacts
18931890
- func: download-and-promote-augmented-sbom-to-s3-bucket

0 commit comments

Comments
 (0)