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

centralize harded-code message

Browse Source 
Signed-off-by: Fahed Dorgaa <fahed.dorgaa@gmail.com>
This commit is contained in:
Fahed Dorgaa
2019-07-13 15:07:23 +02:00
parent f2b6c31d0f
commit db95af43f3
6 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/ctr/commands/containers/containers.go
View File

@@ -28,9 +28,9 @@ import (
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/cmd/ctr/commands/run"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/typeurl"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
@@ -65,17 +65,17 @@ var createCommand = cli.Command{
if config {
id = context.Args().First()
if context.NArg() > 1 {
return errors.New("with spec config file, only container id should be provided")
return errdefs.ErrArgConfigFile
}
} else {
id = context.Args().Get(1)
ref = context.Args().First()
if ref == "" {
return errors.New("image ref must be provided")
return errdefs.ErrUnprovidedImageRef
}
}
if id == "" {
return errors.New("container id must be provided")
return errdefs.ErrEmptyContainerId
}
client, ctx, cancel, err := commands.NewClient(context)
if err != nil {
@@ -168,7 +168,7 @@ var deleteCommand = cli.Command{
}
if context.NArg() == 0 {
return errors.New("must specify at least one container to delete")
return errdefs.ErrDeleteNoneContainer
}
for _, arg := range context.Args() {
if err := deleteContainer(ctx, client, arg, deleteOpts...); err != nil {
@@ -214,7 +214,7 @@ var setLabelsCommand = cli.Command{
Action: func(context *cli.Context) error {
containerID, labels := commands.ObjectWithLabelArgs(context)
if containerID == "" {
return errors.New("container id must be provided")
return errdefs.ErrEmptyContainerId
}
client, ctx, cancel, err := commands.NewClient(context)
if err != nil {
@@ -250,7 +250,7 @@ var infoCommand = cli.Command{
Action: func(context *cli.Context) error {
id := context.Args().First()
if id == "" {
return errors.New("container id must be provided")
return errdefs.ErrEmptyContainerId
}
client, ctx, cancel, err := commands.NewClient(context)
if err != nil {