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

Merge pull request #1644 from cpuguy83/unmarshal_error_desc

Browse Source 
Improve error message for `WithContainerExtension`
This commit is contained in:
Kenfe-Mickaël Laventure 2017-10-16 09:17:46 -07:00 committed by GitHub
commit 103dd0e75e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
container_opts.go
View File

@ -150,18 +150,21 @@ func setSnapshotterIfEmpty(c *containers.Container) {
// integration. // integration.
// //
// Make sure to register the type of `extension` in the typeurl package via // Make sure to register the type of `extension` in the typeurl package via
// `typeurl.Register` otherwise the type data will be inferred, including how // `typeurl.Register` or container creation may fail.
// to encode and decode the object.
func WithContainerExtension(name string, extension interface{}) NewContainerOpts { func WithContainerExtension(name string, extension interface{}) NewContainerOpts {
return func(ctx context.Context, client *Client, c *containers.Container) error { return func(ctx context.Context, client *Client, c *containers.Container) error {
any, err := typeurl.MarshalAny(extension)
if err != nil {
return err
}
if name == "" { if name == "" {
return errors.Wrapf(errdefs.ErrInvalidArgument, "extension key must not be zero-length") return errors.Wrapf(errdefs.ErrInvalidArgument, "extension key must not be zero-length")
} }
any, err := typeurl.MarshalAny(extension)
if err != nil {
if errors.Cause(err) == typeurl.ErrNotFound {
return errors.Wrapf(err, "extension %q is not registered with the typeurl package, see `typeurl.Register`", name)
}
return errors.Wrap(err, "error marshalling extension")
}
if c.Extensions == nil { if c.Extensions == nil {
c.Extensions = make(map[string]types.Any) c.Extensions = make(map[string]types.Any)
} }