Skip to content

Commit 2870853

Browse files
authored
Replace Sbom and bombon with tom-bombadil flake (#4448)
* Replace Sbom and bombon with tom-bombadil flake Delete now unused files and expressions. * Add changelog entry
1 parent 54c7d6b commit 2870853

File tree

8 files changed

+17
-669
lines changed

8 files changed

+17
-669
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,6 @@ services/nginz/third_party/nginx-module-vts
102102

103103
# dumped out by running tests in kind
104104
logs-integration
105+
106+
# BOM file - https://github.com/wireapp/tom-bombadil
107+
sbom.json

Makefile

+9-7
Original file line numberDiff line numberDiff line change
@@ -589,16 +589,18 @@ kind-restart-%: .local/kind-kubeconfig
589589
helm-template-%: clean-charts charts-integration
590590
./hack/bin/helm-template.sh $(*)
591591

592+
sbom.json:
593+
nix -Lv build -f nix wireServer.bomDependencies && \
594+
nix run 'github:wireapp/tom-bombadil#create-sbom' -- --root-package-name "wire-server"
595+
592596
# Ask the security team for the `DEPENDENCY_TRACK_API_KEY` (if you need it)
593-
# changing the directory is necessary because of some quirkiness of how
594-
# runhaskell / ghci behaves (it doesn't find modules that aren't in the same
595-
# directory as the script that is being executed)
596597
.PHONY: upload-bombon
597-
upload-bombon:
598-
cd ./hack/bin && ./bombon.hs -- \
598+
upload-bombon: sbom.json
599+
nix run 'github:wireapp/tom-bombadil#upload-bom' -- \
600+
--project-name "wire-server" \
599601
--project-version $(HELM_SEMVER) \
600-
--api-key $(DEPENDENCY_TRACK_API_KEY) \
601-
--auto-create
602+
--auto-create \
603+
--bom-file ./sbom.json
602604

603605
.PHONY: openapi-validate
604606
openapi-validate:
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Use Nix flake (tom-bombadil) to create and upload SBOM files in CI.

0 commit comments

Comments
 (0)