container_portforward: add support for short pod IDs

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
cri-o · Jun 13, 2018 · 7cdbd3b · 7cdbd3b
1 parent 4774d94
commit 7cdbd3b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/server/container_portforward.go b/server/container_portforward.go
@@ -33,7 +33,11 @@ func (s *Server) PortForward(ctx context.Context, req *pb.PortForwardRequest) (r
 }
 
 func (ss streamService) PortForward(podSandboxID string, port int32, stream io.ReadWriteCloser) error {
-	c := ss.runtimeServer.GetSandboxContainer(podSandboxID)
+	sandboxID, err := ss.runtimeServer.PodIDIndex().Get(podSandboxID)
+	if err != nil {
+		return fmt.Errorf("PodSandbox with ID starting with %s not found: %v", podSandboxID, err)
+	}
+	c := ss.runtimeServer.GetSandboxContainer(sandboxID)
 
 	if c == nil {
 		return fmt.Errorf("could not find container for sandbox %q", podSandboxID)