Skip to content

Commit 8789106

Browse files
authored
fix(ci): adopt augmented SBOM integration with Silk MONGOSH-1773 (#2021)
1 parent e6a811c commit 8789106

File tree

3 files changed

+27
-5
lines changed

3 files changed

+27
-5
lines changed

.evergreen.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7550,6 +7550,10 @@ functions:
75507550
PACKAGE_VARIANT: ${package_variant}
75517551
ARTIFACTORY_USERNAME: ${artifactory_username}
75527552
ARTIFACTORY_PASSWORD: ${artifactory_password}
7553+
# for Silk SBOM integration
7554+
SILK_ASSET_GROUP: mongosh-${executable_os_id}
7555+
SILK_CLIENT_ID: ${silk_client_id}
7556+
SILK_CLIENT_SECRET: ${silk_client_secret}
75537557
create_static_analysis_report:
75547558
- command: s3.get
75557559
params:
@@ -16801,7 +16805,7 @@ tasks:
1680116805
- func: install
1680216806
vars:
1680316807
node_js_version: "20.12.2"
16804-
- func: create_static_analysis_report
16808+
- func: create_static_analysis_report
1680516809
vars:
1680616810
node_js_version: "20.12.2"
1680716811

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22
set -e
33
set -x
4+
45
npm run evergreen-release download-crypt-shared-library
56

67
ls -lhA dist
@@ -9,9 +10,22 @@ echo "pkg:generic/mongo_crypt_shared@$(cat dist/.mongosh_crypt_*.version)" >> di
910
cat dist/.purls.txt
1011

1112
set +x
12-
docker login artifactory.corp.mongodb.com --username ${ARTIFACTORY_USERNAME} --password ${ARTIFACTORY_PASSWORD}
13+
echo "${ARTIFACTORY_PASSWORD}" | docker login artifactory.corp.mongodb.com --username "${ARTIFACTORY_USERNAME}" --password-stdin
14+
cat << EOF > silkbomb.env
15+
SILK_CLIENT_ID=${SILK_CLIENT_ID}
16+
SILK_CLIENT_SECRET=${SILK_CLIENT_SECRET}
17+
EOF
1318
set -x
1419

20+
trap_handler() {
21+
rm -f silkbomb.env
22+
}
23+
trap trap_handler ERR EXIT
24+
1525
docker pull artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0
1626
docker run --rm -v ${PWD}:/pwd artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 update \
17-
--purls /pwd/dist/.purls.txt --sbom_out /pwd/dist/.sbom.json
27+
--purls /pwd/dist/.purls.txt --sbom-out /pwd/dist/.sbom-lite.json
28+
docker run --env-file silkbomb.env --rm -v ${PWD}:/pwd artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 upload \
29+
--silk-asset-group "${SILK_ASSET_GROUP}" --sbom-in /pwd/dist/.sbom-lite.json
30+
docker run --env-file silkbomb.env --rm -v ${PWD}:/pwd artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 download \
31+
--silk-asset-group "${SILK_ASSET_GROUP}" --sbom-out /pwd/dist/.sbom.json

.evergreen/evergreen.yml.in

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,9 +522,13 @@ functions:
522522
PACKAGE_VARIANT: ${package_variant}
523523
ARTIFACTORY_USERNAME: ${artifactory_username}
524524
ARTIFACTORY_PASSWORD: ${artifactory_password}
525+
# for Silk SBOM integration
526+
SILK_ASSET_GROUP: mongosh-${executable_os_id}
527+
SILK_CLIENT_ID: ${silk_client_id}
528+
SILK_CLIENT_SECRET: ${silk_client_secret}
525529
create_static_analysis_report:
526530
<%
527-
let firstPartyDepsFilenames = [];
531+
let firstPartyDepsFilenames = [];
528532
for (const { executableOsId, packages } of RELEASE_PACKAGE_MATRIX) {
529533
const filename = `mongosh-${executableOsId}-first-party-deps.json`;
530534
firstPartyDepsFilenames.push(filename); %>
@@ -1391,7 +1395,7 @@ tasks:
13911395
- func: install
13921396
vars:
13931397
node_js_version: "<% out(NODE_JS_VERSION_20) %>"
1394-
- func: create_static_analysis_report
1398+
- func: create_static_analysis_report
13951399
vars:
13961400
node_js_version: "<% out(NODE_JS_VERSION_20) %>"
13971401

0 commit comments

Comments
 (0)