images/archive: use mediatype helpers

neersighted · vvoland · commit 42b60d865296 · 2024-01-03T16:07:45.000+01:00
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com> (cherry picked from commit 377c5ca) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
diff --git a/images/archive/exporter.go b/images/archive/exporter.go
@@ -170,8 +170,7 @@ func Export(ctx context.Context, store content.Provider, writer io.Writer, opts
 	dManifests := map[digest.Digest]*exportManifest{}
 	resolvedIndex := map[digest.Digest]digest.Digest{}
 	for _, desc := range eo.manifests {
-		switch desc.MediaType {
-		case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest:
+		if images.IsManifestType(desc.MediaType) {
 			mt, ok := dManifests[desc.Digest]
 			if !ok {
 				// TODO(containerd): Skip if already added
@@ -191,7 +190,7 @@ func Export(ctx context.Context, store content.Provider, writer io.Writer, opts
 			if name != "" {
 				mt.names = append(mt.names, name)
 			}
-		case images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
+		} else if images.IsIndexType(desc.MediaType) {
 			d, ok := resolvedIndex[desc.Digest]
 			if !ok {
 				if err := desc.Digest.Validate(); err != nil {
@@ -255,7 +254,7 @@ func Export(ctx context.Context, store content.Provider, writer io.Writer, opts
 				}
 
 			}
-		default:
+		} else {
 			return fmt.Errorf("only manifests may be exported: %w", errdefs.ErrInvalidArgument)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,7 @@ func Export(ctx context.Context, store content.Provider, writer io.Writer, opts`
`170`	`170`	`dManifests := map[digest.Digest]*exportManifest{}`
`171`	`171`	`resolvedIndex := map[digest.Digest]digest.Digest{}`
`172`	`172`	`for _, desc := range eo.manifests {`
`173`		`- switch desc.MediaType {`
`174`		`- case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest:`
	`173`	`+ if images.IsManifestType(desc.MediaType) {`
`175`	`174`	`mt, ok := dManifests[desc.Digest]`
`176`	`175`	`if !ok {`
`177`	`176`	`// TODO(containerd): Skip if already added`
`@@ -191,7 +190,7 @@ func Export(ctx context.Context, store content.Provider, writer io.Writer, opts`
`191`	`190`	`if name != "" {`
`192`	`191`	`mt.names = append(mt.names, name)`
`193`	`192`	`}`
`194`		`- case images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:`
	`193`	`+ } else if images.IsIndexType(desc.MediaType) {`
`195`	`194`	`d, ok := resolvedIndex[desc.Digest]`
`196`	`195`	`if !ok {`
`197`	`196`	`if err := desc.Digest.Validate(); err != nil {`
`@@ -255,7 +254,7 @@ func Export(ctx context.Context, store content.Provider, writer io.Writer, opts`
`255`	`254`	`}`
`256`	`255`
`257`	`256`	`}`
`258`		`- default:`
	`257`	`+ } else {`
`259`	`258`	`return fmt.Errorf("only manifests may be exported: %w", errdefs.ErrInvalidArgument)`
`260`	`259`	`}`
`261`	`260`	`}`