cli/container_rename: Move to API validation

Signed-off-by: Paweł Gronowski <[email protected]>

Author: vvoland

cli/command/container/rename.go

@@ -1,7 +1,6 @@
 package container
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/docker/cli/cli"
@@ -19,10 +18,6 @@ func newRenameCommand(dockerCLI command.Cli) *cobra.Command {
 		Args:  cli.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			oldName, newName := args[0], args[1]
-			if newName == "" {
-				// TODO(thaJeztah): remove once https://github.com/moby/moby/pull/51336 is merged and vendored.
-				return errors.New("new name cannot be blank")
-			}
 			_, err := dockerCLI.Client().ContainerRename(cmd.Context(), oldName, client.ContainerRenameOptions{
 				NewName: newName,
 			})

cli/command/container/rename_test.go

@@ -26,3 +26,27 @@ func TestContainerRename(t *testing.T) {
 	res.Assert(t, icmd.Success)
 	assert.Equal(t, "/"+newName, strings.TrimSpace(res.Stdout()))
 }
+
+func TestContainerRenameEmptyOldName(t *testing.T) {
+	res := icmd.RunCommand("docker", "container", "rename", "", "newName")
+	res.Assert(t, icmd.Expected{
+		ExitCode: 1,
+		Err:      "invalid container name or ID: value is empty",
+	})
+}
+
+func TestContainerRenameEmptyNewName(t *testing.T) {
+	oldName := "old_name_" + t.Name()
+	res := icmd.RunCommand("docker", "run", "-d", "--name", oldName, fixtures.AlpineImage, "sleep", "60")
+	res.Assert(t, icmd.Success)
+	cID := strings.TrimSpace(res.Stdout())
+	t.Cleanup(func() {
+		icmd.RunCommand("docker", "container", "rm", "-f", cID).Assert(t, icmd.Success)
+	})
+
+	res = icmd.RunCommand("docker", "container", "rename", oldName, "")
+	res.Assert(t, icmd.Expected{
+		ExitCode: 1,
+		Err:      "new name cannot be blank",
+	})
+}