Merge pull request #17137 from juanvallejo/jvallejo/allow-resource-kind-format-rsync

Automatic merge from submit-queue.

allow rsrs/kind format in oc rsync

Fixes #15076

Updates `oc rsync` to allow a pod to be passed with the `<kind>/<name>` format.

cc @openshift/cli-review

Author: openshift-merge-robot

pkg/oc/cli/cmd/rsync/pathspec.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	kvalidation "k8s.io/kubernetes/pkg/api/validation"
+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
 // pathSpec represents a path (remote or local) given as a source or destination
@@ -46,10 +47,21 @@ func (s *pathSpec) Validate() error {
 	return nil
 }
 
+// isPathForPod receives a path and returns true
+// if it matches a <podName>:/path format
+func isPathForPod(path string) bool {
+	parts := strings.SplitN(path, ":", 2)
+	if len(parts) == 1 || (isWindows() && len(parts[0]) == 1) {
+		return false
+	}
+
+	return true
+}
+
 // parsePathSpec parses a string argument into a pathSpec object
 func parsePathSpec(path string) (*pathSpec, error) {
 	parts := strings.SplitN(path, ":", 2)
-	if len(parts) == 1 || (isWindows() && len(parts[0]) == 1) {
+	if !isPathForPod(path) {
 		return &pathSpec{
 			Path: path,
 		}, nil
@@ -63,6 +75,46 @@ func parsePathSpec(path string) (*pathSpec, error) {
 	}, nil
 }
 
+// resolveResourceKindPath determines if a given path contains a resource
+// formatted as resource/kind, and returns the resource name without the
+// <kind/> segment, ensuring that the resource is of type Pod, if it exists.
+func resolveResourceKindPath(f kcmdutil.Factory, path, namespace string) (string, error) {
+	parts := strings.SplitN(path, ":", 2)
+	if !isPathForPod(path) {
+		return path, nil
+	}
+
+	podName := parts[0]
+
+	// if the specified pod name is given in the <kind>/<name> format
+	// validate the podName without the <kind/> segment.
+	if podSegs := strings.Split(podName, "/"); len(podSegs) > 1 {
+		podName = podSegs[1]
+	}
+
+	r := f.NewBuilder(true).
+		NamespaceParam(namespace).
+		SingleResourceType().
+		ResourceNames("pods", podName).
+		Do()
+
+	if err := r.Err(); err != nil {
+		return "", err
+	}
+	infos, err := r.Infos()
+	if err != nil {
+		return "", err
+	}
+
+	// if there were no errors, we should expect
+	// one resource to exist
+	if len(infos) == 0 || infos[0].Mapping.Resource != "pods" {
+		return "", fmt.Errorf("error: expected resource to be of type pod, got %q", infos[0].Mapping.Resource)
+	}
+
+	return fmt.Sprintf("%s:%s", podName, parts[1]), nil
+}
+
 // convertWindowsPath converts a windows native path to a path that can be used by
 // the rsync command in windows.
 // It can take one of three forms:

pkg/oc/cli/cmd/rsync/rsync.go

@@ -186,22 +186,33 @@ func (o *RsyncOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args [
 		return kcmdutil.UsageError(cmd, "only SOURCE_DIR and POD:DESTINATION_DIR should be specified as arguments")
 	}
 
-	// Set main command arguments
 	var err error
-	o.Source, err = parsePathSpec(args[0])
+	namespace, _, err := f.DefaultNamespace()
 	if err != nil {
 		return err
 	}
-	o.Destination, err = parsePathSpec(args[1])
+	o.Namespace = namespace
+
+	// allow and parse resources specified in the <kind>/<name> format
+	parsedSourcePath, err := resolveResourceKindPath(f, args[0], namespace)
 	if err != nil {
 		return err
 	}
 
-	namespace, _, err := f.DefaultNamespace()
+	parsedDestPath, err := resolveResourceKindPath(f, args[1], namespace)
+	if err != nil {
+		return err
+	}
+
+	// Set main command arguments
+	o.Source, err = parsePathSpec(parsedSourcePath)
+	if err != nil {
+		return err
+	}
+	o.Destination, err = parsePathSpec(parsedDestPath)
 	if err != nil {
 		return err
 	}
-	o.Namespace = namespace
 
 	o.Strategy, err = o.determineStrategy(f, cmd, o.StrategyName)
 	if err != nil {