mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
848792c42e
`docker rename foo ''` would result in: ``` usage: docker rename OLD_NAME NEW_NAME ``` which is the old engine's way of return errors - yes that's in the daemon code. So I fixed that error msg to just be normal. While doing that I noticed that using an empty string for the source container name failed but didn't print any error message at all. This is because we would generate a URL like: ../containers//rename/.. which would cause a 301 redirect to ../containers/rename/.. however the CLI code doesn't actually deal with 301's - it just ignores them and returns back to the CLI code/caller. Rather than changing the CLI to deal with 3xx error codes, which would probably be a good thing to do in a follow-on PR, for this immediate issue I just added a cli-side check for empty strings for both old and new names. This way we catch it even before we hit the daemon. API callers will get a 404, assuming they follow the 301, for the case of the src being empty, and the new error msg when the destination is empty - so we should be good now. Add tests for both cases too. Signed-off-by: Doug Davis <dug@us.ibm.com>
48 lines
1 KiB
Go
48 lines
1 KiB
Go
package daemon
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
// ContainerRename changes the name of a container, using the oldName
|
|
// to find the container. An error is returned if newName is already
|
|
// reserved.
|
|
func (daemon *Daemon) ContainerRename(oldName, newName string) error {
|
|
if oldName == "" || newName == "" {
|
|
return fmt.Errorf("Neither old nor new names may be empty")
|
|
}
|
|
|
|
container, err := daemon.Get(oldName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
oldName = container.Name
|
|
|
|
container.Lock()
|
|
defer container.Unlock()
|
|
if newName, err = daemon.reserveName(container.ID, newName); err != nil {
|
|
return fmt.Errorf("Error when allocating new name: %s", err)
|
|
}
|
|
|
|
container.Name = newName
|
|
|
|
undo := func() {
|
|
container.Name = oldName
|
|
daemon.reserveName(container.ID, oldName)
|
|
daemon.containerGraphDB.Delete(newName)
|
|
}
|
|
|
|
if err := daemon.containerGraphDB.Delete(oldName); err != nil {
|
|
undo()
|
|
return fmt.Errorf("Failed to delete container %q: %v", oldName, err)
|
|
}
|
|
|
|
if err := container.toDisk(); err != nil {
|
|
undo()
|
|
return err
|
|
}
|
|
|
|
container.logEvent("rename")
|
|
return nil
|
|
}
|