Merge pull request #34 from rancherlabs/windows

sbom: Add support for `windows/amd64`
rancherlabs · Feb 5, 2025 · e144311 · e144311
2 parents 6c27ba2 + 19641af
commit e144311
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cmd/sbom.go b/cmd/sbom.go
@@ -39,6 +39,8 @@ func sbomCmd(img, outformat, platform string) error {
 		spdx = data.LinuxAmd64.SPDX
 	} else if strings.EqualFold(platform, "linux/arm64") && data.LinuxArm64 != nil {
 		spdx = data.LinuxArm64.SPDX
+	} else if strings.EqualFold(platform, "windows/amd64") && data.WindowsAmd64 != nil {
+		spdx = data.WindowsAmd64.SPDX
 	} else if data.SPDX != nil {
 		spdx = *data.SPDX
 	} else {

diff --git a/internal/sbom/sbom.go b/internal/sbom/sbom.go
@@ -18,9 +18,10 @@ import (
 )
 
 type BuildKitSBOM struct {
-	LinuxAmd64 *archSBOM        `json:"linux/amd64,omitempty"`
-	LinuxArm64 *archSBOM        `json:"linux/arm64,omitempty"`
-	SPDX       *json.RawMessage `json:"SPDX,omitempty"`
+	LinuxAmd64   *archSBOM        `json:"linux/amd64,omitempty"`
+	LinuxArm64   *archSBOM        `json:"linux/arm64,omitempty"`
+	WindowsAmd64 *archSBOM        `json:"windows/amd64,omitempty"`
+	SPDX         *json.RawMessage `json:"SPDX,omitempty"`
 }
 
 type archSBOM struct {