docker/attest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AttestationImage field from AttestationManifest

Browse Source
This commit is contained in:
James Carnegie
2024-07-09 13:36:33 +01:00
parent 116c668183
commit 5faf0801ee
9 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/oci/layout.go
View File

@@ -44,7 +44,7 @@ func (r *OCILayoutResolver) fetchAttestationManifest() (*attestation.Attestation
func (r *OCILayoutResolver) Attestations(ctx context.Context, predicateType string) ([]*att.Envelope, error) {
var envs []*att.Envelope
for _, attestationLayer := range r.AttestationManifest.AttestationImage.OriginalLayers {
for _, attestationLayer := range r.AttestationManifest.OriginalLayers {
if attestationLayer.Annotations[attestation.InTotoPredicateType] != predicateType {
continue
}
@@ -134,7 +134,7 @@ func attestationManifestFromOCILayout(path string, platform *v1.Platform) (*atte
return nil, fmt.Errorf("failed to get attestations from image: %w", err)
}
attest := &attestation.AttestationManifest{
AttestationImage: &att.AttestationImage{OriginalLayers: layers},
OriginalLayers: layers,
OriginalDescriptor: &mf,
SubjectName: name,
SubjectDescriptor: subjectDescriptor,

2
pkg/oci/oci.go
View File

@@ -49,7 +49,7 @@ func WithOptions(ctx context.Context, platform *v1.Platform) []remote.Option {
func ExtractEnvelopes(manifest *attestation.AttestationManifest, predicateType string) ([]*att.Envelope, error) {
var envs []*att.Envelope
for _, attestationLayer := range manifest.AttestationImage.OriginalLayers {
for _, attestationLayer := range manifest.OriginalLayers {
mt, err := attestationLayer.Layer.MediaType()
if err != nil {
return nil, fmt.Errorf("failed to get layer media type: %w", err)

2
pkg/oci/referrers.go
View File

@@ -86,7 +86,7 @@ func (r *ReferrersResolver) resolveAttestations(ctx context.Context) error {
}
attest := &attestation.AttestationManifest{
SubjectName: r.Identifier,
AttestationImage: &attestation.AttestationImage{OriginalLayers: layers},
OriginalLayers: layers,
OriginalDescriptor: &m,
SubjectDescriptor: desc,
}

2
pkg/oci/registry.go
View File

@@ -132,7 +132,7 @@ func FetchAttestationManifest(ctx context.Context, image string, platform *v1.Pl
return nil, fmt.Errorf("failed to get attestations from image: %w", err)
}
attest := &attestation.AttestationManifest{
AttestationImage: &att.AttestationImage{OriginalLayers: layers},
OriginalLayers: layers,
OriginalDescriptor: &remoteDescriptor.Descriptor,
SubjectName: image,
SubjectDescriptor: subjectDescriptor,