github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

integration/client: replace hardcoded strings for OCI-spec consts

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-10-17 12:30:31 +02:00
parent d3f5e0c90e
commit b006f1c159
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/client/export_test.go
View File

@ -171,10 +171,10 @@ func assertOCITar(t *testing.T, r io.Reader, docker bool) {
t.Error(err) t.Error(err)
continue continue
} }
if h.Name == "oci-layout" { if h.Name == ocispec.ImageLayoutFile {
foundOCILayout = true foundOCILayout = true
} }
if h.Name == "index.json" { if h.Name == ocispec.ImageIndexFile {
foundIndexJSON = true foundIndexJSON = true
} }
if h.Name == "manifest.json" { if h.Name == "manifest.json" {

58
integration/client/import_test.go
View File

@ -260,19 +260,19 @@ func TestImport(t *testing.T) {
{ {
Name: "OCI-BadFormat", Name: "OCI-BadFormat",
Writer: tartest.TarAll( Writer: tartest.TarAll(
tc.File("oci-layout", []byte(`{"imageLayoutVersion":"2.0.0"}`), 0644), tc.File(ocispec.ImageLayoutFile, []byte(`{"imageLayoutVersion":"2.0.0"}`), 0644),
), ),
}, },
{ {
Name: "OCI", Name: "OCI",
Writer: tartest.TarAll( Writer: tartest.TarAll(
tc.Dir("blobs", 0755), tc.Dir(ocispec.ImageBlobsDir, 0755),
tc.Dir("blobs/sha256", 0755), tc.Dir(ocispec.ImageBlobsDir+"/sha256", 0755),
tc.File("blobs/sha256/"+d1.Encoded(), b1, 0644), tc.File(ocispec.ImageBlobsDir+"/sha256/"+d1.Encoded(), b1, 0644),
tc.File("blobs/sha256/"+d2.Encoded(), c1, 0644), tc.File(ocispec.ImageBlobsDir+"/sha256/"+d2.Encoded(), c1, 0644),
tc.File("blobs/sha256/"+d3.Encoded(), m1, 0644), tc.File(ocispec.ImageBlobsDir+"/sha256/"+d3.Encoded(), m1, 0644),
tc.File("index.json", createIndex(m1, "latest", "docker.io/lib/img:ok"), 0644), tc.File(ocispec.ImageIndexFile, createIndex(m1, "latest", "docker.io/lib/img:ok"), 0644),
tc.File("oci-layout", []byte(`{"imageLayoutVersion":"1.0.0"}`), 0644), tc.File(ocispec.ImageLayoutFile, []byte(`{"imageLayoutVersion":"`+ocispec.ImageLayoutVersion+`"}`), 0644),
), ),
Check: func(t *testing.T, imgs []images.Image) { Check: func(t *testing.T, imgs []images.Image) {
names := []string{ names := []string{
@ -287,13 +287,13 @@ func TestImport(t *testing.T) {
{ {
Name: "OCIPrefixName", Name: "OCIPrefixName",
Writer: tartest.TarAll( Writer: tartest.TarAll(
tc.Dir("blobs", 0755), tc.Dir(ocispec.ImageBlobsDir, 0755),
tc.Dir("blobs/sha256", 0755), tc.Dir(ocispec.ImageBlobsDir+"/sha256", 0755),
tc.File("blobs/sha256/"+d1.Encoded(), b1, 0644), tc.File(ocispec.ImageBlobsDir+"/sha256/"+d1.Encoded(), b1, 0644),
tc.File("blobs/sha256/"+d2.Encoded(), c1, 0644), tc.File(ocispec.ImageBlobsDir+"/sha256/"+d2.Encoded(), c1, 0644),
tc.File("blobs/sha256/"+d3.Encoded(), m1, 0644), tc.File(ocispec.ImageBlobsDir+"/sha256/"+d3.Encoded(), m1, 0644),
tc.File("index.json", createIndex(m1, "latest", "docker.io/lib/img:ok"), 0644), tc.File(ocispec.ImageIndexFile, createIndex(m1, "latest", "docker.io/lib/img:ok"), 0644),
tc.File("oci-layout", []byte(`{"imageLayoutVersion":"1.0.0"}`), 0644), tc.File(ocispec.ImageLayoutFile, []byte(`{"imageLayoutVersion":"`+ocispec.ImageLayoutVersion+`"}`), 0644),
), ),
Check: func(t *testing.T, imgs []images.Image) { Check: func(t *testing.T, imgs []images.Image) {
names := []string{ names := []string{
@ -311,13 +311,13 @@ func TestImport(t *testing.T) {
{ {
Name: "OCIPrefixName2", Name: "OCIPrefixName2",
Writer: tartest.TarAll( Writer: tartest.TarAll(
tc.Dir("blobs", 0755), tc.Dir(ocispec.ImageBlobsDir, 0755),
tc.Dir("blobs/sha256", 0755), tc.Dir(ocispec.ImageBlobsDir+"/sha256", 0755),
tc.File("blobs/sha256/"+d1.Encoded(), b1, 0644), tc.File(ocispec.ImageBlobsDir+"/sha256/"+d1.Encoded(), b1, 0644),
tc.File("blobs/sha256/"+d2.Encoded(), c1, 0644), tc.File(ocispec.ImageBlobsDir+"/sha256/"+d2.Encoded(), c1, 0644),
tc.File("blobs/sha256/"+d3.Encoded(), m1, 0644), tc.File(ocispec.ImageBlobsDir+"/sha256/"+d3.Encoded(), m1, 0644),
tc.File("index.json", createIndex(m1, "latest", "localhost:5000/myimage:old", "docker.io/lib/img:ok"), 0644), tc.File(ocispec.ImageIndexFile, createIndex(m1, "latest", "localhost:5000/myimage:old", "docker.io/lib/img:ok"), 0644),
tc.File("oci-layout", []byte(`{"imageLayoutVersion":"1.0.0"}`), 0644), tc.File(ocispec.ImageLayoutFile, []byte(`{"imageLayoutVersion":"`+ocispec.ImageLayoutVersion+`"}`), 0644),
), ),
Check: func(t *testing.T, imgs []images.Image) { Check: func(t *testing.T, imgs []images.Image) {
names := []string{ names := []string{
@ -530,14 +530,14 @@ func TestTransferImport(t *testing.T) {
t.Run(testCase.Name, func(t *testing.T) { t.Run(testCase.Name, func(t *testing.T) {
tc := tartest.TarContext{} tc := tartest.TarContext{}
files := []tartest.WriterToTar{ files := []tartest.WriterToTar{
tc.Dir("blobs", 0755), tc.Dir(ocispec.ImageBlobsDir, 0755),
tc.Dir("blobs/sha256", 0755), tc.Dir(ocispec.ImageBlobsDir+"/sha256", 0755),
} }
descs, tws := createImages(tc, testCase.Images...) descs, tws := createImages(tc, testCase.Images...)
files = append(files, tws...) files = append(files, tws...)
files = append(files, tc.File("oci-layout", []byte(`{"imageLayoutVersion":"1.0.0"}`), 0644)) files = append(files, tc.File(ocispec.ImageLayoutFile, []byte(`{"imageLayoutVersion":"`+ocispec.ImageLayoutVersion+`"}`), 0644))
r := tartest.TarFromWriterTo(tartest.TarAll(files...)) r := tartest.TarFromWriterTo(tartest.TarAll(files...))
@ -629,13 +629,13 @@ func createImages(tc tartest.TarContext, imageNames ...string) (descs map[string
} }
seed := hash64(image) seed := hash64(image)
bb, b := createContent(128, seed) bb, b := createContent(128, seed)
tw = append(tw, tc.File("blobs/sha256/"+b.Encoded(), bb, 0644)) tw = append(tw, tc.File(ocispec.ImageBlobsDir+"/sha256/"+b.Encoded(), bb, 0644))
cb, c := createConfig("linux", "amd64", image) cb, c := createConfig("linux", "amd64", image)
tw = append(tw, tc.File("blobs/sha256/"+c.Encoded(), cb, 0644)) tw = append(tw, tc.File(ocispec.ImageBlobsDir+"/sha256/"+c.Encoded(), cb, 0644))
mb, m, _ := createManifest(cb, [][]byte{bb}) mb, m, _ := createManifest(cb, [][]byte{bb})
tw = append(tw, tc.File("blobs/sha256/"+m.Encoded(), mb, 0644)) tw = append(tw, tc.File(ocispec.ImageBlobsDir+"/sha256/"+m.Encoded(), mb, 0644))
annotations := map[string]string{} annotations := map[string]string{}
if image != "" { if image != "" {
@ -671,7 +671,7 @@ func createImages(tc tartest.TarContext, imageNames ...string) (descs map[string
Size: int64(len(ib)), Size: int64(len(ib)),
MediaType: ocispec.MediaTypeImageIndex, MediaType: ocispec.MediaTypeImageIndex,
} }
tw = append(tw, tc.File("index.json", ib, 0644)) tw = append(tw, tc.File(ocispec.ImageIndexFile, ib, 0644))
var idxName string var idxName string
if len(imageNames) > 0 { if len(imageNames) > 0 {