fix: upload (external) SBOM files alongside artifacts #315
+103
−43
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
leodido
changed the title
sign-cache command
leodido
changed the title
sign-cache command
leodido
changed the base branch from
ldd/resolve-builtin-pkg-internal
to
main
When LEEWAY_DEFAULT_CACHE_LEVEL=remote-pull is set (SLSA mode), the normal upload path is skipped and sign-cache handles uploads. However, sign-cache only uploaded artifacts and attestations, not SBOM files. This caused SBOM vulnerability scans to fail with 'SBOM file not found in package archive' because SBOM files were generated locally but never uploaded to the remote cache. Now sign-cache also uploads SBOM sidecar files (.sbom.cdx.json, .sbom.spdx.json, .sbom.json) alongside artifacts and attestations. Co-authored-by: Ona <no-reply@ona.com>
When artifact and attestation already exist in cache, we were returning early without checking for SBOM files. This caused SBOM files to be missing when builds were re-run. Now we call uploadSBOMFiles in all code paths to ensure SBOM files are uploaded if they exist locally but are missing from the cache. Co-authored-by: Ona <no-reply@ona.com>
Move SBOM file extension constants to pkg/leeway/cache/types.go to avoid duplication across sbom.go, s3.go, and signing/upload.go. Add SBOMSidecarExtensions() function that returns all SBOM sidecar file extensions, ensuring consistency across the codebase. Co-authored-by: Ona <no-reply@ona.com>
leodido
force-pushed
the
ldd/sbom-sign-cache-upload
branch
from
7b5ffb0 to
06ff9ee
Compare
corneliusludmann
approved these changes
Dec 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Upload SBOM sidecar files alongside artifacts when using the
sign-cachecommand.Stacked on #314
Changes
Add SBOM upload to sign-cache (
signing/upload.go).sbom.cdx.json,.sbom.spdx.json,.sbom.jsonfiles alongside artifactsFix SBOM upload when artifact already exists
UploadArtifactWithAttestationConsolidate SBOM constants (
cache/types.go)SBOMSidecarExtensions()functionsbom.go,s3.go,signing/upload.goTesting