From 99c10d42c038f95762ad3fc79808dedfa8f8fbe2 Mon Sep 17 00:00:00 2001
From: Devashish <devashish.patel@hashicorp.com>
Date: Mon, 21 Oct 2024 18:34:27 -0400
Subject: [PATCH] WIP2

---
 internal/hcp/registry/types.bucket.go | 6 ++++--
 internal/hcp/registry/types.builds.go | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/internal/hcp/registry/types.bucket.go b/internal/hcp/registry/types.bucket.go
index 42be96664..8a96df981 100644
--- a/internal/hcp/registry/types.bucket.go
+++ b/internal/hcp/registry/types.bucket.go
@@ -12,6 +12,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
+
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/hcp-sdk-go/clients/cloud-packer-service/stable/2023-01-01/client/packer_service"
 	hcpPackerModels "github.com/hashicorp/hcp-sdk-go/clients/cloud-packer-service/stable/2023-01-01/models"
@@ -223,7 +225,7 @@ func (bucket *Bucket) UpdateBuildStatus(
 	return nil
 }
 
-func (bucket *Bucket) uploadSbom(ctx context.Context, buildName string, compressedSbom []byte) error {
+func (bucket *Bucket) uploadSbom(ctx context.Context, buildName string, sbom packer.SBOM) error {
 	buildToUpdate, err := bucket.Version.Build(buildName)
 	if err != nil {
 		return err
@@ -242,7 +244,7 @@ func (bucket *Bucket) uploadSbom(ctx context.Context, buildName string, compress
 			Fingerprint: bucket.Version.Fingerprint,
 			BuildID:     buildToUpdate.ID,
 			Body: &hcpPackerModels.HashicorpCloudPacker20230101UploadSbomBody{
-				CompressedSbom: compressedSbom,
+				CompressedSbom: sbom.CompressedData,
 			},
 		},
 		nil,
diff --git a/internal/hcp/registry/types.builds.go b/internal/hcp/registry/types.builds.go
index 6a5f41f40..0ca531c2c 100644
--- a/internal/hcp/registry/types.builds.go
+++ b/internal/hcp/registry/types.builds.go
@@ -6,6 +6,8 @@ package registry
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
+
 	hcpPackerModels "github.com/hashicorp/hcp-sdk-go/clients/cloud-packer-service/stable/2023-01-01/models"
 	packerSDKRegistry "github.com/hashicorp/packer-plugin-sdk/packer/registry/image"
 )
@@ -21,7 +23,7 @@ type Build struct {
 	Status        hcpPackerModels.HashicorpCloudPacker20230101BuildStatus
 	Metadata      hcpPackerModels.HashicorpCloudPacker20230101BuildMetadata
 
-	CompressedSboms [][]byte
+	CompressedSboms []packer.SBOM
 }
 
 // NewBuildFromCloudPackerBuild converts a HashicorpCloudPackerBuild to a local build that can be tracked and