Merge pull request #2513 from dmcgowan/set-default-platform-withplatform

dmcgowan · web-flow · commit efb04a336184 · 2018-07-31T17:38:23.000-07:00
Fix for empty platform
diff --git a/client.go b/client.go
@@ -449,10 +449,7 @@ func (c *Client) GetImage(ctx context.Context, ref string) (Image, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &image{
-		client: c,
-		i:      i,
-	}, nil
+	return NewImage(c, i), nil
 }
 
 // ListImages returns all existing images
@@ -463,10 +460,7 @@ func (c *Client) ListImages(ctx context.Context, filters ...string) ([]Image, er
 	}
 	images := make([]Image, len(imgs))
 	for i, img := range imgs {
-		images[i] = &image{
-			client: c,
-			i:      img,
-		}
+		images[i] = NewImage(c, img)
 	}
 	return images, nil
 }
diff --git a/client_opts.go b/client_opts.go
@@ -18,6 +18,7 @@ package containerd
 
 import (
 	"github.com/containerd/containerd/images"
+	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/remotes"
 	"google.golang.org/grpc"
 )
@@ -76,6 +77,9 @@ type RemoteOpt func(*Client, *RemoteContext) error
 // WithPlatform allows the caller to specify a platform to retrieve
 // content for
 func WithPlatform(platform string) RemoteOpt {
+	if platform == "" {
+		platform = platforms.Default()
+	}
 	return func(_ *Client, c *RemoteContext) error {
 		for _, p := range c.Platforms {
 			if p == platform {
diff --git a/container.go b/container.go
@@ -173,10 +173,7 @@ func (c *container) Image(ctx context.Context) (Image, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get image %s for container", r.Image)
 	}
-	return &image{
-		client: c.client,
-		i:      i,
-	}, nil
+	return NewImage(c.client, i), nil
 }
 
 func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...NewTaskOpts) (_ Task, err error) {
diff --git a/import.go b/import.go
@@ -80,10 +80,7 @@ func (c *Client) Import(ctx context.Context, importer images.Importer, reader io
 			imgrec = updated
 		}
 
-		images = append(images, &image{
-			client: c,
-			i:      imgrec,
-		})
+		images = append(images, NewImage(c, imgrec))
 	}
 	return images, nil
 }
diff --git a/task.go b/task.go
@@ -458,10 +458,7 @@ func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (Imag
 	if im, err = t.client.ImageService().Create(ctx, im); err != nil {
 		return nil, err
 	}
-	return &image{
-		client: t.client,
-		i:      im,
-	}, nil
+	return NewImage(t.client, im), nil
 }
 
 // UpdateTaskInfo allows updated specific settings to be changed on a task

Original file line number	Diff line number	Diff line change
`@@ -449,10 +449,7 @@ func (c *Client) GetImage(ctx context.Context, ref string) (Image, error) {`
`449`	`449`	`if err != nil {`
`450`	`450`	`return nil, err`
`451`	`451`	`}`
`452`		`- return &image{`
`453`		`- client: c,`
`454`		`- i: i,`
`455`		`- }, nil`
	`452`	`+ return NewImage(c, i), nil`
`456`	`453`	`}`
`457`	`454`
`458`	`455`	`// ListImages returns all existing images`
`@@ -463,10 +460,7 @@ func (c *Client) ListImages(ctx context.Context, filters ...string) ([]Image, er`
`463`	`460`	`}`
`464`	`461`	`images := make([]Image, len(imgs))`
`465`	`462`	`for i, img := range imgs {`
`466`		`- images[i] = &image{`
`467`		`- client: c,`
`468`		`- i: img,`
`469`		`- }`
	`463`	`+ images[i] = NewImage(c, img)`
`470`	`464`	`}`
`471`	`465`	`return images, nil`
`472`	`466`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,10 +173,7 @@ func (c *container) Image(ctx context.Context) (Image, error) {`
`173`	`173`	`if err != nil {`
`174`	`174`	`return nil, errors.Wrapf(err, "failed to get image %s for container", r.Image)`
`175`	`175`	`}`
`176`		`- return &image{`
`177`		`- client: c.client,`
`178`		`- i: i,`
`179`		`- }, nil`
	`176`	`+ return NewImage(c.client, i), nil`
`180`	`177`	`}`
`181`	`178`
`182`	`179`	`func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...NewTaskOpts) (_ Task, err error) {`
Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,7 @@ func (c *Client) Import(ctx context.Context, importer images.Importer, reader io`
`80`	`80`	`imgrec = updated`
`81`	`81`	`}`
`82`	`82`
`83`		`- images = append(images, &image{`
`84`		`- client: c,`
`85`		`- i: imgrec,`
`86`		`- })`
	`83`	`+ images = append(images, NewImage(c, imgrec))`
`87`	`84`	`}`
`88`	`85`	`return images, nil`
`89`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -458,10 +458,7 @@ func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (Imag`
`458`	`458`	`if im, err = t.client.ImageService().Create(ctx, im); err != nil {`
`459`	`459`	`return nil, err`
`460`	`460`	`}`
`461`		`- return &image{`
`462`		`- client: t.client,`
`463`		`- i: im,`
`464`		`- }, nil`
	`461`	`+ return NewImage(t.client, im), nil`
`465`	`462`	`}`
`466`	`463`
`467`	`464`	`// UpdateTaskInfo allows updated specific settings to be changed on a task`