Add SBOM format flag to publish-release

cmd/publish-release/cmd/github.go

@@ -86,6 +86,7 @@ type githubPageCmdLineOptions struct {
 	noupdate         bool
 	draft            bool
 	sbom             bool
+	sbomFormat       string
 	name             string
 	repo             string
 	template         string
@@ -150,14 +151,18 @@ func init() {
 		true,
 		"Generate an SPDX bill of materials and attach it to the release",
 	)
-
+	githubPageCmd.PersistentFlags().StringVar(
+		&ghPageOpts.sbomFormat,
+		"sbom-format",
+		string(announce.FormatJSON),
+		"format to use for the SBOM [json|tag-value]",
+	)
 	githubPageCmd.PersistentFlags().StringVar(
 		&ghPageOpts.repoPath,
 		"repo-path",
 		".",
 		"Path to the source code repository",
 	)
-
 	githubPageCmd.PersistentFlags().StringVar(
 		&ghPageOpts.ReleaseNotesFile,
 		"release-notes-file",
@@ -278,6 +283,7 @@ func runGithubPage(opts *githubPageCmdLineOptions) (err error) {
 			RepoDirectory: opts.repoPath,
 			Assets:        assets,
 			Tag:           commandLineOpts.tag,
+			Format:        announce.SBOMFormat(opts.sbomFormat),
 		})
 		if err != nil {
 			return fmt.Errorf("generating sbom: %w", err)

compile-release-tools

@@ -22,6 +22,8 @@ RELEASE_TOOLS=(
   krel
   kubepkg
   schedule-builder
+  publish-release
+  release-notes
 )
 
 setup_env() {

pkg/announce/github_page.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 
+	"sigs.k8s.io/bom/pkg/serialize"
 	"sigs.k8s.io/bom/pkg/spdx"
 	"sigs.k8s.io/release-sdk/git"
 	"sigs.k8s.io/release-sdk/github"
@@ -104,11 +105,19 @@ type GitHubPageOptions struct {
 	Substitutions map[string]string
 }
 
+type SBOMFormat string
+
+const (
+	FormatJSON     SBOMFormat = "json"
+	FormatTagValue SBOMFormat = "tag-value"
+)
+
 type SBOMOptions struct {
 	ReleaseName   string
 	Repo          string
 	RepoDirectory string
-	Tag           string // Version Tag
+	Tag           string     // Version Tag
+	Format        SBOMFormat // "tag-value"  | "json"
 	Assets        []Asset
 }
 
@@ -169,7 +178,22 @@ func GenerateReleaseSBOM(opts *SBOMOptions) (string, error) {
 		}
 	}
 
-	if err := doc.Write(sbomFile); err != nil {
+	var renderer serialize.Serializer
+	switch opts.Format {
+	case FormatJSON:
+		renderer = &serialize.JSON{}
+	case FormatTagValue:
+		renderer = &serialize.TagValue{}
+	default:
+		return "", fmt.Errorf("invalid SBOM format, must be one of %s, %s", FormatJSON, FormatTagValue)
+	}
+
+	markup, err := renderer.Serialize(doc)
+	if err != nil {
+		return "", fmt.Errorf("serializing sbom: %w", err)
+	}
+
+	if err := os.WriteFile(sbomFile, []byte(markup), 0o600); err != nil {
 		return "", fmt.Errorf("writing sbom to disk: %w", err)
 	}