fixup! executors: implement streaming exec

hashicorp · May 10, 2019 · fc4f92b · fc4f92b
1 parent 90386e4
commit fc4f92b
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/drivers/shared/executor/client.go b/drivers/shared/executor/client.go
@@ -189,10 +189,22 @@ func (d *grpcExecutorClient) ExecStreaming(ctx context.Context,
 	tty bool,
 	execStream drivers.ExecTaskStream) error {
 
-	stream, err := d.client.ExecStreaming(ctx)
+	err := d.execStreaming(ctx, command, tty, execStream)
 	if err != nil {
 		return grpcutils.HandleGrpcErr(err, d.doneCtx)
 	}
+	return nil
+}
+
+func (d *grpcExecutorClient) execStreaming(ctx context.Context,
+	command []string,
+	tty bool,
+	execStream drivers.ExecTaskStream) error {
+
+	stream, err := d.client.ExecStreaming(ctx)
+	if err != nil {
+		return err
+	}
 
 	err = stream.Send(&dproto.ExecTaskStreamingRequest{
 		Setup: &dproto.ExecTaskStreamingRequest_Setup{
@@ -201,7 +213,7 @@ func (d *grpcExecutorClient) ExecStreaming(ctx context.Context,
 		},
 	})
 	if err != nil {
-		return grpcutils.HandleGrpcErr(err, d.doneCtx)
+		return err
 	}
 
 	errCh := make(chan error, 1)