Merge pull request #1228 from junnplus/multiple-ids

AkihiroSuda · web-flow · commit 947bf753e508 · 2022-07-15T14:06:34.000+09:00
fix found multiple IDs when container walker
diff --git a/cmd/nerdctl/commit.go b/cmd/nerdctl/commit.go
@@ -62,7 +62,7 @@ func commitAction(cmd *cobra.Command, args []string) error {
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
 			if found.MatchCount > 1 {
-				return fmt.Errorf("ambiguous ID %q", found.Req)
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
 			}
 			imageID, err := commit.Commit(ctx, client, found.Container, opts)
 			if err != nil {
diff --git a/cmd/nerdctl/exec.go b/cmd/nerdctl/exec.go
@@ -82,7 +82,7 @@ func execAction(cmd *cobra.Command, args []string) error {
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
 			if found.MatchCount > 1 {
-				return fmt.Errorf("ambiguous ID %q", found.Req)
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
 			}
 			return execActionWithContainer(ctx, cmd, args, found.Container, client)
 		},
diff --git a/cmd/nerdctl/history.go b/cmd/nerdctl/history.go
@@ -83,6 +83,9 @@ func historyAction(cmd *cobra.Command, args []string) error {
 	walker := &imagewalker.ImageWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found imagewalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 			defer cancel()
 			img := containerd.NewImage(client, found.Image)
@@ -147,8 +150,6 @@ func historyAction(cmd *cobra.Command, args []string) error {
 			errs = append(errs, err)
 		} else if n == 0 {
 			errs = append(errs, fmt.Errorf("no such object: %s", req))
-		} else if n > 1 {
-			return fmt.Errorf("multiple IDs found with provided prefix: %s", req)
 		}
 	}
 	if len(errs) > 0 {
diff --git a/cmd/nerdctl/kill.go b/cmd/nerdctl/kill.go
@@ -70,9 +70,12 @@ func killAction(cmd *cobra.Command, args []string) error {
 	walker := &containerwalker.ContainerWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			if err := killContainer(ctx, found.Container, signal); err != nil {
 				if errdefs.IsNotFound(err) {
-					fmt.Fprintf(cmd.ErrOrStderr(), "Error response from daemon: Cannot kill container: %s: No such container: %s\n", found.Req, found.Req)
+					fmt.Fprintf(cmd.ErrOrStderr(), "No such container: %s\n", found.Req)
 					os.Exit(1)
 				}
 				return err
diff --git a/cmd/nerdctl/logs.go b/cmd/nerdctl/logs.go
@@ -100,7 +100,7 @@ func logsAction(cmd *cobra.Command, args []string) error {
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
 			if found.MatchCount > 1 {
-				return fmt.Errorf("ambiguous ID %q", found.Req)
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
 			}
 			l, err := found.Container.Labels(ctx)
 			if err != nil {
diff --git a/cmd/nerdctl/pause.go b/cmd/nerdctl/pause.go
@@ -50,6 +50,9 @@ func pauseAction(cmd *cobra.Command, args []string) error {
 	walker := &containerwalker.ContainerWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			if err := pauseContainer(ctx, client, found.Container.ID()); err != nil {
 				return err
 			}
diff --git a/cmd/nerdctl/port.go b/cmd/nerdctl/port.go
@@ -83,7 +83,7 @@ func portAction(cmd *cobra.Command, args []string) error {
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
 			if found.MatchCount > 1 {
-				return fmt.Errorf("ambiguous ID %q", found.Req)
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
 			}
 			return printPort(ctx, cmd, found.Container, argPort, argProto)
 		},
diff --git a/cmd/nerdctl/rename.go b/cmd/nerdctl/rename.go
@@ -68,7 +68,7 @@ func renameAction(cmd *cobra.Command, args []string) error {
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
 			if found.MatchCount > 1 {
-				return fmt.Errorf("ambiguous ID %q", found.Req)
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
 			}
 			return renameContainer(ctx, found.Container, args[1], ns, namest, hostst)
 		},
diff --git a/cmd/nerdctl/rm.go b/cmd/nerdctl/rm.go
@@ -79,6 +79,9 @@ func rmAction(cmd *cobra.Command, args []string) error {
 	walker := &containerwalker.ContainerWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			err = removeContainer(cmd, ctx, found.Container, ns, force, removeAnonVolumes)
 			if err != nil {
 				return err
diff --git a/cmd/nerdctl/start.go b/cmd/nerdctl/start.go
@@ -69,6 +69,9 @@ func startAction(cmd *cobra.Command, args []string) error {
 	walker := &containerwalker.ContainerWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			if err := startContainer(ctx, found.Container, flagA); err != nil {
 				return err
 			}
diff --git a/cmd/nerdctl/stop.go b/cmd/nerdctl/stop.go
@@ -68,6 +68,9 @@ func stopAction(cmd *cobra.Command, args []string) error {
 	walker := &containerwalker.ContainerWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			if err := stopContainer(ctx, found.Container, timeout); err != nil {
 				if errdefs.IsNotFound(err) {
 					fmt.Fprintf(cmd.ErrOrStderr(), "No such container: %s\n", found.Req)
diff --git a/cmd/nerdctl/top.go b/cmd/nerdctl/top.go
@@ -98,6 +98,9 @@ func topAction(cmd *cobra.Command, args []string) error {
 	walker := &containerwalker.ContainerWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			if err := containerTop(ctx, cmd, client, found.Container.ID(), strings.Join(args[1:], " ")); err != nil {
 				return err
 			}
diff --git a/cmd/nerdctl/unpause.go b/cmd/nerdctl/unpause.go
@@ -50,6 +50,9 @@ func unpauseAction(cmd *cobra.Command, args []string) error {
 	walker := &containerwalker.ContainerWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			if err := unpauseContainer(ctx, client, found.Container.ID()); err != nil {
 				return err
 			}
diff --git a/cmd/nerdctl/update.go b/cmd/nerdctl/update.go
@@ -93,6 +93,9 @@ func updateAction(cmd *cobra.Command, args []string) error {
 	walker := &containerwalker.ContainerWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			err = updateContainer(ctx, client, found.Container.ID(), options, cmd)
 			return err
 		},
@@ -103,8 +106,6 @@ func updateAction(cmd *cobra.Command, args []string) error {
 			return err
 		} else if n == 0 {
 			return fmt.Errorf("no such container %s", req)
-		} else if n > 1 {
-			return fmt.Errorf("multiple IDs found with provided prefix: %s", req)
 		}
 	}
 	return nil
diff --git a/cmd/nerdctl/wait.go b/cmd/nerdctl/wait.go
@@ -51,6 +51,9 @@ func containerWaitAction(cmd *cobra.Command, args []string) error {
 	walker := &containerwalker.ContainerWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found containerwalker.Found) error {
+			if found.MatchCount > 1 {
+				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
+			}
 			containers = append(containers, found.Container)
 			return nil
 		},
@@ -63,8 +66,6 @@ func containerWaitAction(cmd *cobra.Command, args []string) error {
 		}
 		if n == 0 {
 			return fmt.Errorf("no such container: %s", req)
-		} else if n > 1 {
-			return fmt.Errorf("multiple IDs found with provided prefix: %s", req)
 		}
 	}
 	var allErr error

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func commitAction(cmd *cobra.Command, args []string) error {`
`62`	`62`	`Client: client,`
`63`	`63`	`OnFound: func(ctx context.Context, found containerwalker.Found) error {`
`64`	`64`	`if found.MatchCount > 1 {`
`65`		`- return fmt.Errorf("ambiguous ID %q", found.Req)`
	`65`	`+ return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)`
`66`	`66`	`}`
`67`	`67`	`imageID, err := commit.Commit(ctx, client, found.Container, opts)`
`68`	`68`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func execAction(cmd *cobra.Command, args []string) error {`
`82`	`82`	`Client: client,`
`83`	`83`	`OnFound: func(ctx context.Context, found containerwalker.Found) error {`
`84`	`84`	`if found.MatchCount > 1 {`
`85`		`- return fmt.Errorf("ambiguous ID %q", found.Req)`
	`85`	`+ return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)`
`86`	`86`	`}`
`87`	`87`	`return execActionWithContainer(ctx, cmd, args, found.Container, client)`
`88`	`88`	`},`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func logsAction(cmd *cobra.Command, args []string) error {`
`100`	`100`	`Client: client,`
`101`	`101`	`OnFound: func(ctx context.Context, found containerwalker.Found) error {`
`102`	`102`	`if found.MatchCount > 1 {`
`103`		`- return fmt.Errorf("ambiguous ID %q", found.Req)`
	`103`	`+ return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)`
`104`	`104`	`}`
`105`	`105`	`l, err := found.Container.Labels(ctx)`
`106`	`106`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func portAction(cmd *cobra.Command, args []string) error {`
`83`	`83`	`Client: client,`
`84`	`84`	`OnFound: func(ctx context.Context, found containerwalker.Found) error {`
`85`	`85`	`if found.MatchCount > 1 {`
`86`		`- return fmt.Errorf("ambiguous ID %q", found.Req)`
	`86`	`+ return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)`
`87`	`87`	`}`
`88`	`88`	`return printPort(ctx, cmd, found.Container, argPort, argProto)`
`89`	`89`	`},`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func renameAction(cmd *cobra.Command, args []string) error {`
`68`	`68`	`Client: client,`
`69`	`69`	`OnFound: func(ctx context.Context, found containerwalker.Found) error {`
`70`	`70`	`if found.MatchCount > 1 {`
`71`		`- return fmt.Errorf("ambiguous ID %q", found.Req)`
	`71`	`+ return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)`
`72`	`72`	`}`
`73`	`73`	`return renameContainer(ctx, found.Container, args[1], ns, namest, hostst)`
`74`	`74`	`},`