Merge pull request #8663 from vrothberg/run-950

archive endpoint massaging

1 files changed, 29 insertions, 35 deletions

diff --git a/pkg/domain/infra/abi/cp.go b/pkg/domain/infra/abi/cp.go
index 9409df743..362053cce 100644
--- a/pkg/domain/infra/abi/cp.go
+++ b/pkg/domain/infra/abi/cp.go
@@ -2,46 +2,53 @@ package abi
 
 import (
 	"context"
-	"strings"
 
 	"github.com/containers/podman/v2/libpod"
 	"github.com/containers/podman/v2/pkg/copy"
 	"github.com/containers/podman/v2/pkg/domain/entities"
-	"github.com/pkg/errors"
 )
 
 func (ic *ContainerEngine) ContainerCp(ctx context.Context, source, dest string, options entities.ContainerCpOptions) error {
-	srcCtr, srcPath := parsePath(ic.Libpod, source)
-	destCtr, destPath := parsePath(ic.Libpod, dest)
-
-	if srcCtr != nil && destCtr != nil {
-		return errors.Errorf("invalid arguments %q, %q: you must use just one container", source, dest)
+	// Parse user input.
+	sourceContainerStr, sourcePath, destContainerStr, destPath, err := copy.ParseSourceAndDestination(source, dest)
+	if err != nil {
+		return err
 	}
-	if srcCtr == nil && destCtr == nil {
-		return errors.Errorf("invalid arguments %q, %q: you must specify one container", source, dest)
+
+	// Look up containers.
+	var sourceContainer, destContainer *libpod.Container
+	if len(sourceContainerStr) > 0 {
+		sourceContainer, err = ic.Libpod.LookupContainer(sourceContainerStr)
+		if err != nil {
+			return err
+		}
 	}
-	if len(srcPath) == 0 || len(destPath) == 0 {
-		return errors.Errorf("invalid arguments %q, %q: you must specify paths", source, dest)
+	if len(destContainerStr) > 0 {
+		destContainer, err = ic.Libpod.LookupContainer(destContainerStr)
+		if err != nil {
+			return err
+		}
 	}
 
 	var sourceItem, destinationItem copy.CopyItem
-	var err error
-	// Copy from the container to the host.
-	if srcCtr != nil {
-		sourceItem, err = copy.CopyItemForContainer(srcCtr, srcPath, options.Pause, true)
+
+	// Source ... container OR host.
+	if sourceContainer != nil {
+		sourceItem, err = copy.CopyItemForContainer(sourceContainer, sourcePath, options.Pause, true)
 		defer sourceItem.CleanUp()
 		if err != nil {
 			return err
 		}
 	} else {
-		sourceItem, err = copy.CopyItemForHost(srcPath, true)
+		sourceItem, err = copy.CopyItemForHost(sourcePath, true)
 		if err != nil {
 			return err
 		}
 	}
 
-	if destCtr != nil {
-		destinationItem, err = copy.CopyItemForContainer(destCtr, destPath, options.Pause, false)
+	// Destination ... container OR host.
+	if destContainer != nil {
+		destinationItem, err = copy.CopyItemForContainer(destContainer, destPath, options.Pause, false)
 		defer destinationItem.CleanUp()
 		if err != nil {
 			return err
@@ -55,22 +62,9 @@ func (ic *ContainerEngine) ContainerCp(ctx context.Context, source, dest string,
 	}
 
 	// Copy from the host to the container.
-	return copy.Copy(&sourceItem, &destinationItem, options.Extract)
-}
-
-func parsePath(runtime *libpod.Runtime, path string) (*libpod.Container, string) {
-	if len(path) == 0 {
-		return nil, ""
-	}
-	if path[0] == '.' || path[0] == '/' { // A path cannot point to a container.
-		return nil, path
-	}
-	pathArr := strings.SplitN(path, ":", 2)
-	if len(pathArr) == 2 {
-		ctr, err := runtime.LookupContainer(pathArr[0])
-		if err == nil {
-			return ctr, pathArr[1]
-		}
+	copier, err := copy.GetCopier(&sourceItem, &destinationItem, options.Extract)
+	if err != nil {
+		return err
 	}
-	return nil, path
+	return copier.Copy()
 }