address review suggestions

mongodb · Jun 12, 2024 · ea4280c · ea4280c
1 parent d52e7cf
commit ea4280c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/evergreen/download-augmented-sbom.sh b/evergreen/download-augmented-sbom.sh
@@ -4,17 +4,13 @@
 # SILK_CLIENT_ID
 # SILK_CLIENT_SECRET
 
-cat << EOF > silkbomb.env
-SILK_CLIENT_ID=${SILK_CLIENT_ID}
-SILK_CLIENT_SECRET=${SILK_CLIENT_SECRET}
-EOF
-
 declare -r SSDLC_PATH="./artifacts/ssdlc"
 mkdir -p "${SSDLC_PATH}"
 
 echo "Downloading augmented sbom from silk"
 
 docker run --platform="linux/amd64" --rm -v ${PWD}:/pwd \
-  --env-file silkbomb.env \
+  -e SILK_CLIENT_ID \
+  -e SILK_CLIENT_SECRET \
   artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 \
   download --silk-asset-group mongodb-dotnet-csharp-driver --sbom-out /pwd/${SSDLC_PATH}/augmented-sbom.json
diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml
@@ -264,9 +264,6 @@ functions:
         script: |
           ${PREPARE_SHELL}
           ./evergreen/download-augmented-sbom.sh
-    - command: ec2.assume_role
-      params:
-        role_arn: ${UPLOAD_SSDLC_RELEASE_ASSETS_ROLE_ARN}
     - command: s3.put
       params:
         aws_key: ${AWS_ACCESS_KEY_ID}
@@ -290,9 +287,6 @@ functions:
         script: |
           ${PREPARE_SHELL}
           ./evergreen/generate-ssdlc-report.sh
-    - command: ec2.assume_role
-      params:
-        role_arn: ${UPLOAD_SSDLC_RELEASE_ASSETS_ROLE_ARN}
     - command: s3.put
       params:
         aws_key: ${AWS_ACCESS_KEY_ID}
@@ -1924,6 +1918,9 @@ tasks:
 
     - name: generate-ssdlc-reports
       commands:
+        - command: ec2.assume_role
+          params:
+            role_arn: ${UPLOAD_SSDLC_RELEASE_ASSETS_ROLE_ARN}
         - func: download-packages
         - func: trace-artifacts
         - func: download-and-promote-augmented-sbom-to-s3-bucket