From e50ae970dd8a94a132f72b3c02e4d025c52c096a Mon Sep 17 00:00:00 2001 From: Jenna Goldstrich Date: Mon, 21 Oct 2024 16:46:59 -0700 Subject: [PATCH] Add example, add SBOM format --- internal/hcp/registry/types.bucket.go | 1 + whateverlucas.pkr.hcl => sbomexample.pkr.hcl | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) rename whateverlucas.pkr.hcl => sbomexample.pkr.hcl (79%) diff --git a/internal/hcp/registry/types.bucket.go b/internal/hcp/registry/types.bucket.go index 8a96df981..d5e669ee2 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, + Format: sbom.Format, }, }, nil, diff --git a/whateverlucas.pkr.hcl b/sbomexample.pkr.hcl similarity index 79% rename from whateverlucas.pkr.hcl rename to sbomexample.pkr.hcl index 4f680455a..47fd539e4 100644 --- a/whateverlucas.pkr.hcl +++ b/sbomexample.pkr.hcl @@ -22,11 +22,16 @@ build { "apt-get update && apt-get -y install curl", "bash -c \"$(curl -sSL \"https://install.mondoo.com/sh\")\"", "cnquery sbom --output cyclonedx-json >/tmp/sbom_cyclonedx.json", + "cnquery sbom --output spdx-json > /tmp/sbom_spdx.json", ] } - provisioner "hcp_sbom" { + provisioner "hcp-sbom" { source = "/tmp/sbom_cyclonedx.json" destination = "sbom_cyclonedx.json" } + + provisioner "hcp-sbom" { + source = "/tmp/sbom_spdx.json" + } }