Merge pull request protobom#231 from jhoward-lm/backend-interface-update

Revert StoreRetriever to only accept Document
puerco · May 30, 2024 · 066088a · 066088a
2 parents f8cd372 + 6951a4d
commit 066088a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 25 deletions.
diff --git a/pkg/reader/options.go b/pkg/reader/options.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/protobom/protobom/pkg/formats"
 	"github.com/protobom/protobom/pkg/native"
-	"github.com/protobom/protobom/pkg/sbom"
 	"github.com/protobom/protobom/pkg/storage"
 )
 
@@ -70,7 +69,7 @@ func WithSniffer(s Sniffer) ReaderOption {
 	}
 }
 
-func WithStoreRetriever(sb storage.StoreRetriever[*sbom.Document]) ReaderOption {
+func WithStoreRetriever(sb storage.StoreRetriever) ReaderOption {
 	return func(r *Reader) {
 		if sb != nil {
 			r.Storage = sb

diff --git a/pkg/reader/reader.go b/pkg/reader/reader.go
@@ -60,7 +60,7 @@ func GetFormatUnserializer(format formats.Format) (native.Unserializer, error) {
 
 type Reader struct {
 	sniffer Sniffer
-	Storage storage.StoreRetriever[*sbom.Document]
+	Storage storage.StoreRetriever
 	Options *Options
 }
 

diff --git a/pkg/storage/backend.go b/pkg/storage/backend.go
@@ -6,31 +6,23 @@
 
 package storage
 
-import (
-	"github.com/protobom/protobom/pkg/sbom"
-)
+import "github.com/protobom/protobom/pkg/sbom"
 
 type (
-	ProtobomType interface {
-		*sbom.Document | *sbom.DocumentType | *sbom.Edge | *sbom.ExternalReference |
-			*sbom.Metadata | *sbom.Node | *sbom.NodeList | *sbom.Person | *sbom.Purpose | *sbom.Tool |
-			map[sbom.HashAlgorithm]string | map[sbom.SoftwareIdentifierType]string
-	}
-
-	Storer[T ProtobomType] interface {
-		Store(T, *StoreOptions) error
+	Storer interface {
+		Store(*sbom.Document, *StoreOptions) error
 	}
 
-	Retriever[T ProtobomType] interface {
-		Retrieve(string, *RetrieveOptions) (T, error)
+	Retriever interface {
+		Retrieve(string, *RetrieveOptions) (*sbom.Document, error)
 	}
 
-	StoreRetriever[T ProtobomType] interface {
-		Storer[T]
-		Retriever[T]
+	StoreRetriever interface {
+		Storer
+		Retriever
 	}
 
-	Backend[T ProtobomType] interface {
-		StoreRetriever[T]
+	Backend interface {
+		StoreRetriever
 	}
 )
diff --git a/pkg/storage/filesystem.go b/pkg/storage/filesystem.go
@@ -13,7 +13,7 @@ import (
 	"sigs.k8s.io/release-utils/util"
 )
 
-var _ StoreRetriever[*sbom.Document] = (*FileSystem)(nil)
+var _ StoreRetriever = (*FileSystem)(nil)
 
 type FileSystemOptions struct {
 	// Path is the path top the directory where the storage

diff --git a/pkg/writer/options.go b/pkg/writer/options.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/protobom/protobom/pkg/formats"
 	"github.com/protobom/protobom/pkg/native"
-	"github.com/protobom/protobom/pkg/sbom"
 	"github.com/protobom/protobom/pkg/storage"
 )
 
@@ -39,7 +38,7 @@ func WithFormat(f formats.Format) WriterOption {
 	}
 }
 
-func WithStoreRetriever(sb storage.StoreRetriever[*sbom.Document]) WriterOption {
+func WithStoreRetriever(sb storage.StoreRetriever) WriterOption {
 	return func(w *Writer) {
 		if sb != nil {
 			w.Storage = sb

diff --git a/pkg/writer/writer.go b/pkg/writer/writer.go
@@ -16,7 +16,7 @@ import (
 )
 
 type Writer struct {
-	Storage storage.StoreRetriever[*sbom.Document]
+	Storage storage.StoreRetriever
 	Options *Options
 }