From 9d4b6836db627910a712a95d11b362ccea797019 Mon Sep 17 00:00:00 2001 From: Jenna Goldstrich Date: Tue, 12 Nov 2024 09:04:50 -0800 Subject: [PATCH] Name --- internal/hcp/registry/types.bucket.go | 1 + packer/build.go | 2 ++ sbomexample.pkr.hcl | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/hcp/registry/types.bucket.go b/internal/hcp/registry/types.bucket.go index d5e669ee2..ab068a308 100644 --- a/internal/hcp/registry/types.bucket.go +++ b/internal/hcp/registry/types.bucket.go @@ -245,6 +245,7 @@ func (bucket *Bucket) uploadSbom(ctx context.Context, buildName string, sbom pac BuildID: buildToUpdate.ID, Body: &hcpPackerModels.HashicorpCloudPacker20230101UploadSbomBody{ CompressedSbom: sbom.CompressedData, + Name: sbom.Name, Format: sbom.Format, }, }, diff --git a/packer/build.go b/packer/build.go index eade2625d..d23637f67 100644 --- a/packer/build.go +++ b/packer/build.go @@ -55,6 +55,7 @@ type CoreBuild struct { } type SBOM struct { + Name string Format string CompressedData []byte } @@ -313,6 +314,7 @@ func (b *CoreBuild) Run(ctx context.Context, originalUi packersdk.Ui) ([]packers sbomInternalProvisioner, ok := p.Provisioner.(*SBOMInternalProvisioner) if ok { sbom := SBOM{ + Name: sbomInternalProvisioner.SBOMName, Format: sbomInternalProvisioner.SBOMFormat, CompressedData: sbomInternalProvisioner.CompressedData, } diff --git a/sbomexample.pkr.hcl b/sbomexample.pkr.hcl index 47fd539e4..5a493abbd 100644 --- a/sbomexample.pkr.hcl +++ b/sbomexample.pkr.hcl @@ -29,9 +29,11 @@ build { provisioner "hcp-sbom" { source = "/tmp/sbom_cyclonedx.json" destination = "sbom_cyclonedx.json" + name = "foo" } - provisioner "hcp-sbom" { source = "/tmp/sbom_spdx.json" - } + destination = "sbom_spdx.json" + name = "fooo" + } }