1 files changed, 22 insertions, 11 deletions
diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go
index e40e27596..f088d360b 100644
--- a/pkg/domain/infra/tunnel/helpers.go
+++ b/pkg/domain/infra/tunnel/helpers.go
@@ -3,27 +3,37 @@ package tunnel
 import (
 	"context"
 
-	"github.com/containers/podman/v2/libpod/define"
-	"github.com/containers/podman/v2/pkg/bindings/containers"
-	"github.com/containers/podman/v2/pkg/bindings/pods"
-	"github.com/containers/podman/v2/pkg/domain/entities"
-	"github.com/containers/podman/v2/pkg/errorhandling"
+	"github.com/containers/podman/v3/libpod/define"
+	"github.com/containers/podman/v3/pkg/bindings/containers"
+	"github.com/containers/podman/v3/pkg/bindings/pods"
+	"github.com/containers/podman/v3/pkg/domain/entities"
+	"github.com/containers/podman/v3/pkg/errorhandling"
 	"github.com/pkg/errors"
 )
 
 // FIXME: the `ignore` parameter is very likely wrong here as it should rather
 //        be used on *errors* from operations such as remove.
 func getContainersByContext(contextWithConnection context.Context, all, ignore bool, namesOrIDs []string) ([]entities.ListContainer, error) {
+	ctrs, _, err := getContainersAndInputByContext(contextWithConnection, all, ignore, namesOrIDs)
+	return ctrs, err
+}
+
+func getContainersAndInputByContext(contextWithConnection context.Context, all, ignore bool, namesOrIDs []string) ([]entities.ListContainer, []string, error) {
 	if all && len(namesOrIDs) > 0 {
-		return nil, errors.New("cannot lookup containers and all")
+		return nil, nil, errors.New("cannot lookup containers and all")
 	}
 	options := new(containers.ListOptions).WithAll(true).WithSync(true)
 	allContainers, err := containers.List(contextWithConnection, options)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
+	rawInputs := []string{}
 	if all {
-		return allContainers, err
+		for i := range allContainers {
+			rawInputs = append(rawInputs, allContainers[i].ID)
+		}
+
+		return allContainers, rawInputs, err
 	}
 
 	// Note: it would be nicer if the lists endpoint would support that as
@@ -42,7 +52,7 @@ func getContainersByContext(contextWithConnection context.Context, all, ignore b
 			if ignore && errorhandling.Contains(err, define.ErrNoSuchCtr) {
 				continue
 			}
-			return nil, err
+			return nil, nil, err
 		}
 
 		// Now we can do a full match of the ID to find the right
@@ -52,16 +62,17 @@ func getContainersByContext(contextWithConnection context.Context, all, ignore b
 		for _, ctr := range allContainers {
 			if ctr.ID == inspectData.ID {
 				filtered = append(filtered, ctr)
+				rawInputs = append(rawInputs, nameOrID)
 				found = true
 				break
 			}
 		}
 
 		if !found && !ignore {
-			return nil, errors.Wrapf(define.ErrNoSuchCtr, "unable to find container %q", nameOrID)
+			return nil, nil, errors.Wrapf(define.ErrNoSuchCtr, "unable to find container %q", nameOrID)
 		}
 	}
-	return filtered, nil
+	return filtered, rawInputs, nil
 }
 
 func getPodsByContext(contextWithConnection context.Context, all bool, namesOrIDs []string) ([]*entities.ListPodsReport, error) {