Single attestation when creating VSA

pkg/attestation/types.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	v1 "github.com/google/go-containerregistry/pkg/v1"
-	"github.com/google/go-containerregistry/pkg/v1/types"
 	intoto "github.com/in-toto/in-toto-golang/in_toto"
 	v02 "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
@@ -28,27 +27,23 @@ var base64Encoding = base64.StdEncoding.Strict()
 type AttestationLayer struct {
 	Statement   *intoto.Statement
 	Layer       v1.Layer
-	MediaType   types.MediaType
 	Annotations map[string]string
 }
 
 type AttestationImage struct {
-	Layers []*AttestationLayer
-	Image  v1.Image
-}
-
-type SignedAttestationImage struct {
-	Image               v1.Image
-	Descriptor          *v1.Descriptor
-	AttestationManifest *AttestationManifest
+	Descriptor *v1.Descriptor
+	Layers     []*AttestationLayer
+	Image      v1.Image
 }
 
 type AttestationManifest struct {
-	Descriptor        *v1.Descriptor
-	Attestation       *AttestationImage
-	MediaType         types.MediaType
-	Annotations       map[string]string
-	Digest            v1.Hash
+	OriginalDescriptor *v1.Descriptor
+	// kept up to date during signing
+
+	AttestationImage *AttestationImage
+
+	// details of subect image
+	SubjectName       string
 	SubjectDescriptor *v1.Descriptor
 }