Increase platform option

zhouhao · zhouhao · commit 0dd2b1960b2b · 2017-07-18T09:16:44.000+08:00
Signed-off-by: zhouhao &lt;zhouhao@cn.fujitsu.com&gt;
diff --git a/cmd/oci-image-tool/create.go b/cmd/oci-image-tool/create.go
@@ -29,9 +29,10 @@ var bundleTypes = []string{
 }
 
 type bundleCmd struct {
-	typ  string // the type to bundle, can be empty string
-	ref  string
-	root string
+	typ      string // the type to bundle, can be empty string
+	ref      string
+	root     string
+	platform []string
 }
 
 func createHandle(context *cli.Context) error {
@@ -40,9 +41,10 @@ func createHandle(context *cli.Context) error {
 	}
 
 	v := bundleCmd{
-		typ:  context.String("type"),
-		ref:  context.String("ref"),
-		root: context.String("rootfs"),
+		typ:      context.String("type"),
+		ref:      context.String("ref"),
+		root:     context.String("rootfs"),
+		platform: context.StringSlice("platform"),
 	}
 
 	if v.typ == "" {
@@ -56,10 +58,10 @@ func createHandle(context *cli.Context) error {
 	var err error
 	switch v.typ {
 	case image.TypeImageLayout:
-		err = image.CreateRuntimeBundleLayout(context.Args()[0], context.Args()[1], v.ref, v.root)
+		err = image.CreateRuntimeBundleLayout(context.Args()[0], context.Args()[1], v.ref, v.root, v.platform)
 
 	case image.TypeImage:
-		err = image.CreateRuntimeBundleFile(context.Args()[0], context.Args()[1], v.ref, v.root)
+		err = image.CreateRuntimeBundleFile(context.Args()[0], context.Args()[1], v.ref, v.root, v.platform)
 
 	default:
 		err = fmt.Errorf("cannot create %q", v.typ)
@@ -95,5 +97,9 @@ var createCommand = cli.Command{
 			Value: "rootfs",
 			Usage: "A directory representing the root filesystem of the container in the OCI runtime bundle. It is strongly recommended to keep the default value.",
 		},
+		cli.StringSliceFlag{
+			Name:  "platform",
+			Usage: "The platform contains os and arch. Filter manifests according to the conditions provided. Only applicable if reftype is index.",
+		},
 	},
 }
diff --git a/cmd/oci-image-tool/unpack.go b/cmd/oci-image-tool/unpack.go
@@ -29,8 +29,9 @@ var unpackTypes = []string{
 }
 
 type unpackCmd struct {
-	typ string // the type to unpack, can be empty string
-	ref string
+	typ      string // the type to unpack, can be empty string
+	ref      string
+	platform []string
 }
 
 func unpackHandle(context *cli.Context) error {
@@ -39,8 +40,9 @@ func unpackHandle(context *cli.Context) error {
 	}
 
 	v := unpackCmd{
-		typ: context.String("type"),
-		ref: context.String("ref"),
+		typ:      context.String("type"),
+		ref:      context.String("ref"),
+		platform: context.StringSlice("platform"),
 	}
 
 	if v.typ == "" {
@@ -54,10 +56,10 @@ func unpackHandle(context *cli.Context) error {
 	var err error
 	switch v.typ {
 	case image.TypeImageLayout:
-		err = image.UnpackLayout(context.Args()[0], context.Args()[1], v.ref)
+		err = image.UnpackLayout(context.Args()[0], context.Args()[1], v.ref, v.platform)
 
 	case image.TypeImage:
-		err = image.UnpackFile(context.Args()[0], context.Args()[1], v.ref)
+		err = image.UnpackFile(context.Args()[0], context.Args()[1], v.ref, v.platform)
 
 	default:
 		err = fmt.Errorf("cannot unpack %q", v.typ)
@@ -86,5 +88,9 @@ var unpackCommand = cli.Command{
 			Value: "v1.0",
 			Usage: "The ref pointing to the manifest of the OCI image. This must be present in the 'refs' subdirectory of the image.",
 		},
+		cli.StringSliceFlag{
+			Name:  "platform",
+			Usage: "The platform contains os and arch conditions. Filter manifests according to the conditions provided. Only applicable if reftype is index.",
+		},
 	},
 }
diff --git a/completions/bash/oci-image-tool b/completions/bash/oci-image-tool
@@ -150,7 +150,7 @@ _oci-image-tool_create() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--type --ref --rootfs --help -h" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--type --ref --rootfs --platform --help -h" -- "$cur" ) )
 			;;
 	esac
 
@@ -166,7 +166,7 @@ _oci-image-tool_unpack() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--type --ref --help -h" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--type --ref --platform --help -h" -- "$cur" ) )
 			;;
 	esac
 
diff --git a/image/image.go b/image/image.go
@@ -115,7 +115,7 @@ func validate(w walker, refs []string, out *log.Logger) error {
 			}
 
 			for _, manifest := range index.Manifests {
-				m, err := findManifest(w, &(manifest.Descriptor))
+				m, err := findManifest(w, &manifest)
 				if err != nil {
 					return err
 				}
@@ -136,30 +136,30 @@ func validate(w walker, refs []string, out *log.Logger) error {
 // UnpackLayout walks through the file tree given by src and, using the layers
 // specified in the manifest pointed to by the given ref, unpacks all layers in
 // the given destination directory or returns an error if the unpacking failed.
-func UnpackLayout(src, dest, ref string) error {
-	return unpack(newPathWalker(src), dest, ref)
+func UnpackLayout(src, dest, ref string, platform []string) error {
+	return unpack(newPathWalker(src), dest, ref, platform)
 }
 
 // UnpackFile opens the file pointed by tarFileName and calls Unpack on it.
-func UnpackFile(tarFileName, dest, ref string) error {
+func UnpackFile(tarFileName, dest, ref string, platform []string) error {
 	f, err := os.Open(tarFileName)
 	if err != nil {
 		return errors.Wrap(err, "unable to open file")
 	}
 	defer f.Close()
 
-	return Unpack(f, dest, ref)
+	return Unpack(f, dest, ref, platform)
 }
 
 // Unpack walks through the tar stream and, using the layers specified in
 // the manifest pointed to by the given ref, unpacks all layers in the given
 // destination directory or returns an error if the unpacking failed.
 // The destination will be created if it does not exist.
-func Unpack(r io.ReadSeeker, dest, refName string) error {
-	return unpack(newTarWalker(r), dest, refName)
+func Unpack(r io.ReadSeeker, dest, refName string, platform []string) error {
+	return unpack(newTarWalker(r), dest, refName, platform)
 }
 
-func unpack(w walker, dest, refName string) error {
+func unpack(w walker, dest, refName string, platform []string) error {
 	ref, err := findDescriptor(w, refName)
 	if err != nil {
 		return err
@@ -188,28 +188,17 @@ func unpack(w walker, dest, refName string) error {
 			return err
 		}
 
-		if err := validateIndex(index, w); err != nil {
+		if err = validateIndex(index, w); err != nil {
 			return err
 		}
 
-		if len(index.Manifests) == 0 {
-			fmt.Println("warning: no manifests found")
-			return nil
+		manifests, err := filterManifest(w, index.Manifests, platform)
+		if err != nil {
+			return err
 		}
 
-		for _, manifest := range index.Manifests {
-			m, err := findManifest(w, &(manifest.Descriptor))
-			if err != nil {
-				return err
-			}
-
-			if err := m.validate(w); err != nil {
-				return err
-			}
-
-			if err := m.unpack(w, dest); err != nil {
-				return err
-			}
+		for _, m := range manifests {
+			return m.unpack(w, dest)
 		}
 	}
 
@@ -219,30 +208,30 @@ func unpack(w walker, dest, refName string) error {
 // CreateRuntimeBundleLayout walks through the file tree given by src and
 // creates an OCI runtime bundle in the given destination dest
 // or returns an error if the unpacking failed.
-func CreateRuntimeBundleLayout(src, dest, ref, root string) error {
-	return createRuntimeBundle(newPathWalker(src), dest, ref, root)
+func CreateRuntimeBundleLayout(src, dest, ref, root string, platform []string) error {
+	return createRuntimeBundle(newPathWalker(src), dest, ref, root, platform)
 }
 
 // CreateRuntimeBundleFile opens the file pointed by tarFile and calls
 // CreateRuntimeBundle.
-func CreateRuntimeBundleFile(tarFile, dest, ref, root string) error {
+func CreateRuntimeBundleFile(tarFile, dest, ref, root string, platform []string) error {
 	f, err := os.Open(tarFile)
 	if err != nil {
 		return errors.Wrap(err, "unable to open file")
 	}
 	defer f.Close()
 
-	return createRuntimeBundle(newTarWalker(f), dest, ref, root)
+	return createRuntimeBundle(newTarWalker(f), dest, ref, root, platform)
 }
 
 // CreateRuntimeBundle walks through the given tar stream and
 // creates an OCI runtime bundle in the given destination dest
 // or returns an error if the unpacking failed.
-func CreateRuntimeBundle(r io.ReadSeeker, dest, ref, root string) error {
-	return createRuntimeBundle(newTarWalker(r), dest, ref, root)
+func CreateRuntimeBundle(r io.ReadSeeker, dest, ref, root string, platform []string) error {
+	return createRuntimeBundle(newTarWalker(r), dest, ref, root, platform)
 }
 
-func createRuntimeBundle(w walker, dest, refName, rootfs string) error {
+func createRuntimeBundle(w walker, dest, refName, rootfs string, platform []string) error {
 	ref, err := findDescriptor(w, refName)
 	if err != nil {
 		return err
@@ -262,7 +251,7 @@ func createRuntimeBundle(w walker, dest, refName, rootfs string) error {
 			return err
 		}
 
-		return createRuntimebundle(w, m, dest, rootfs)
+		return createBundle(w, m, dest, rootfs)
 	}
 
 	if ref.MediaType == validRefMediaTypes[1] {
@@ -271,35 +260,24 @@ func createRuntimeBundle(w walker, dest, refName, rootfs string) error {
 			return err
 		}
 
-		if err := validateIndex(index, w); err != nil {
+		if err = validateIndex(index, w); err != nil {
 			return err
 		}
 
-		if len(index.Manifests) == 0 {
-			fmt.Println("warning: no manifests found")
-			return nil
+		manifests, err := filterManifest(w, index.Manifests, platform)
+		if err != nil {
+			return err
 		}
 
-		for _, manifest := range index.Manifests {
-			m, err := findManifest(w, &(manifest.Descriptor))
-			if err != nil {
-				return err
-			}
-
-			if err := m.validate(w); err != nil {
-				return err
-			}
-
-			if err := createRuntimebundle(w, m, dest, rootfs); err != nil {
-				return err
-			}
+		for _, m := range manifests {
+			return createBundle(w, m, dest, rootfs)
 		}
 	}
 
 	return nil
 }
 
-func createRuntimebundle(w walker, m *manifest, dest, rootfs string) error {
+func createBundle(w walker, m *manifest, dest, rootfs string) error {
 	c, err := findConfig(w, &m.Config)
 	if err != nil {
 		return err
@@ -332,3 +310,37 @@ func createRuntimebundle(w walker, m *manifest, dest, rootfs string) error {
 
 	return json.NewEncoder(f).Encode(spec)
 }
+
+// filertManifest returns a filtered list of manifests
+func filterManifest(w walker, Manifests []v1.Descriptor, platform []string) ([]*manifest, error) {
+	var manifests []*manifest
+
+	if len(Manifests) == 0 {
+		fmt.Println("warning: no manifests found")
+		return manifests, nil
+	}
+
+	if len(platform) != 2 {
+		return manifests, fmt.Errorf("platform must have os and arch")
+	}
+
+	for _, manifest := range Manifests {
+		m, err := findManifest(w, &manifest)
+		if err != nil {
+			return manifests, err
+		}
+
+		if err := m.validate(w); err != nil {
+			return manifests, err
+		}
+		if manifest.Platform.OS == platform[0] && manifest.Platform.Architecture == platform[1] {
+			manifests = append(manifests, m)
+		}
+	}
+
+	if len(manifests) == 0 {
+		return manifests, fmt.Errorf("There is no matching manifest")
+	}
+
+	return manifests, nil
+}
diff --git a/image/index.go b/image/index.go
@@ -28,8 +28,8 @@ import (
 	"github.com/pkg/errors"
 )
 
-func findIndex(w walker, d *v1.Descriptor) (*v1.ImageIndex, error) {
-	var index v1.ImageIndex
+func findIndex(w walker, d *v1.Descriptor) (*v1.Index, error) {
+	var index v1.Index
 
 	switch err := w.walk(func(path string, info os.FileInfo, r io.Reader) error {
 		if info.IsDir() || filepath.Clean(path) != indexPath {
@@ -60,9 +60,9 @@ func findIndex(w walker, d *v1.Descriptor) (*v1.ImageIndex, error) {
 	}
 }
 
-func validateIndex(index *v1.ImageIndex, w walker) error {
+func validateIndex(index *v1.Index, w walker) error {
 	for _, manifest := range index.Manifests {
-		if err := validateDescriptor(&manifest.Descriptor, w, []string{v1.MediaTypeImageManifest}); err != nil {
+		if err := validateDescriptor(&manifest, w, []string{v1.MediaTypeImageManifest}); err != nil {
 			return errors.Wrap(err, "manifest validation failed")
 		}
 	}
diff --git a/man/oci-image-tool-create.1.md b/man/oci-image-tool-create.1.md
@@ -26,6 +26,10 @@ runtime-spec-compatible `dest/config.json`.
 **--type**=""
   Type of the file to unpack. If unset, oci-image-tool will try to auto-detect the type. One of "imageLayout,image"
 
+**--platform**=""
+  The platform contains os and arch. Filter manifests according to the conditions provided.
+  Only applicable if reftype is index.
+
 # EXAMPLES
 ```
 $ skopeo copy docker://busybox oci:busybox-oci
diff --git a/man/oci-image-tool-unpack.1.md b/man/oci-image-tool-unpack.1.md
@@ -20,6 +20,11 @@ oci-image-tool unpack \- Unpack an image or image source layout
 **--type**=""
   Type of the file to unpack. If unset, oci-image-tool will try to auto-detect the type. One of "imageLayout,image"
 
+**--platform**=""
+  The platform contains os and arch. Filter manifests according to the conditions provided.
+  Only applicable if reftype is index.
+
+
 # EXAMPLES
 ```
 $ skopeo copy docker://busybox oci:busybox-oci

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ import (`
`28`	`28`	`"github.com/pkg/errors"`
`29`	`29`	`)`
`30`	`30`
`31`		`-func findIndex(w walker, d v1.Descriptor) (v1.ImageIndex, error) {`
`32`		`- var index v1.ImageIndex`
	`31`	`+func findIndex(w walker, d v1.Descriptor) (v1.Index, error) {`
	`32`	`+ var index v1.Index`
`33`	`33`
`34`	`34`	`switch err := w.walk(func(path string, info os.FileInfo, r io.Reader) error {`
`35`	`35`	`if info.IsDir() \|\| filepath.Clean(path) != indexPath {`
`@@ -60,9 +60,9 @@ func findIndex(w walker, d v1.Descriptor) (v1.ImageIndex, error) {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`-func validateIndex(index *v1.ImageIndex, w walker) error {`
	`63`	`+func validateIndex(index *v1.Index, w walker) error {`
`64`	`64`	`for _, manifest := range index.Manifests {`
`65`		`- if err := validateDescriptor(&manifest.Descriptor, w, []string{v1.MediaTypeImageManifest}); err != nil {`
	`65`	`+ if err := validateDescriptor(&manifest, w, []string{v1.MediaTypeImageManifest}); err != nil {`
`66`	`66`	`return errors.Wrap(err, "manifest validation failed")`
`67`	`67`	`}`
`68`	`68`	`}`