Skip to content
This repository was archived by the owner on Dec 3, 2024. It is now read-only.

Commit 0378c94

Browse files
committed
test: make test layouts smaller
1 parent fd4e741 commit 0378c94

File tree

86 files changed

+129
-943
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+129
-943
lines changed

attestation/layout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func manifestFromOCILayout(path string, platform *v1.Platform) (*Manifest, error
103103
// try the containerd annotation if the org.opencontainers.image.ref.name is not a full name
104104
subjectName = idxDescriptor.Annotations[containerd.AnnotationImageName]
105105
if _, err := reference.ParseNamed(subjectName); err != nil {
106-
return nil, fmt.Errorf("failed to parse subject name from annotations")
106+
return nil, fmt.Errorf("failed to find subject name in annotations")
107107
}
108108
}
109109

attestation/layout_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ func TestSubjectNameAnnotations(t *testing.T) {
7676
}{
7777
{name: "oci annotation", ociLayoutPath: test.UnsignedTestImage("..")},
7878
{name: "containerd annotation", ociLayoutPath: filepath.Join("..", "test", "testdata", "containerd-subject-layout")},
79-
{name: "missing subject name", ociLayoutPath: filepath.Join("..", "test", "testdata", "missing-subject-layout"), errorStr: "failed to parse subject name from annotations"},
79+
{name: "missing subject name", ociLayoutPath: filepath.Join("..", "test", "testdata", "missing-subject-layout"), errorStr: "failed to find subject name in annotations"},
8080
}
8181

8282
for _, tc := range testCases {
8383
t.Run(tc.name, func(t *testing.T) {
84-
spec, err := oci.ParseImageSpec(oci.LocalPrefix + tc.ociLayoutPath)
84+
spec, err := oci.ParseImageSpec(oci.LocalPrefix+tc.ociLayoutPath, oci.WithPlatform("linux/arm64"))
8585
require.NoError(t, err)
8686
_, err = policy.CreateImageDetailsResolver(spec)
8787
if tc.errorStr != "" {

test/testdata/containerd-subject-layout/blobs/sha256/0f2ee9a338149a5a1435a7383582e5ef981b8a6bb7415d07d8d70c90d8cfd326

Lines changed: 0 additions & 50 deletions
This file was deleted.

test/testdata/containerd-subject-layout/blobs/sha256/1c70b3e7c3a57801501ec127aa6c918c390c373294ec4fc48f2c6fe703fcc6fe

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/testdata/containerd-subject-layout/blobs/sha256/26da286bbc886aa14d191808db8fcbbd5d8ec68cf0047f954133e76d8e73d71c

Lines changed: 0 additions & 27 deletions
This file was deleted.

test/testdata/containerd-subject-layout/blobs/sha256/2953164d6cc6c8bb8271f78f9fb2003318350a8026ea082b63a249cfa60918a3

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/testdata/containerd-subject-layout/blobs/sha256/2a9b671f3fc9bc5ca967b616d96cbbdb6493e32d4f6abd8f7a191990e8efb289

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/testdata/containerd-subject-layout/blobs/sha256/371954672cfaa92735d6fbd70a787aac618a41d4c8ec8d6e12bd12d0cc601706

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/testdata/containerd-subject-layout/blobs/sha256/3883faf6acc3cae029364ed17ec2ce917fc9a500aab72f813d26fed8404e7162

Lines changed: 0 additions & 27 deletions
This file was deleted.

test/testdata/containerd-subject-layout/blobs/sha256/3e64f9d2888ed9211fbf2c6b5853ea559248fdb4ab711bcea34b65c62f0e026b

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)