Adjusted protoc definitions

Author: cmaglie

commands/daemon/debug.go

@@ -25,10 +25,10 @@ import (
 // DebugService implements the `Debug` service
 type DebugService struct{}
 
-// StreamingOpen returns a stream response that can be used to fetch data from the
-// Debug target. The first message passed through the `StreamingOpenReq` must
-// contain Debug configuration params, not data.
-func (s *DebugService) StreamingOpen(stream dbg.Debug_StreamingOpenServer) error {
+// Debug returns a stream response that can be used to fetch data from the
+// target. The first message passed through the `Debug` request must
+// contain DebugConfigReq configuration params, not data.
+func (s *DebugService) Debug(stream dbg.Debug_DebugServer) error {
 
 	// grab the first message
 	msg, err := stream.Recv()
@@ -44,7 +44,7 @@ func (s *DebugService) StreamingOpen(stream dbg.Debug_StreamingOpenServer) error
 
 	// launch debug recipe attaching stdin and out to grpc streaming
 	resp, err := cmd.Debug(stream.Context(), req, stream, feedStream(func(data []byte) {
-		stream.Send(&dbg.StreamingOpenResp{Data: data})
+		stream.Send(&dbg.DebugResp{Data: data})
 	}))
 	if err != nil {
 		return (err)

commands/debug/debug.go

@@ -26,7 +26,7 @@ import (
 )
 
 // Debug FIXMEDOC
-func Debug(ctx context.Context, req *dbg.DebugReq, inStream dbg.Debug_StreamingOpenServer, out io.Writer) (*dbg.StreamingOpenResp, error) {
+func Debug(ctx context.Context, req *dbg.DebugConfigReq, inStream dbg.Debug_DebugServer, out io.Writer) (*dbg.DebugResp, error) {
 	cmdArgs := []string{"gdb"}
 	// Run Tool
 	cmd, err := executils.Command(cmdArgs)
@@ -37,7 +37,7 @@ func Debug(ctx context.Context, req *dbg.DebugReq, inStream dbg.Debug_StreamingO
 	in, err := cmd.StdinPipe()
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		return &dbg.StreamingOpenResp{}, nil // TODO: send error in response
+		return &dbg.DebugResp{}, nil // TODO: send error in response
 	}
 	defer in.Close()
 
@@ -46,7 +46,7 @@ func Debug(ctx context.Context, req *dbg.DebugReq, inStream dbg.Debug_StreamingO
 	err = cmd.Start()
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		return &dbg.StreamingOpenResp{}, nil // TODO: send error in response
+		return &dbg.DebugResp{}, nil // TODO: send error in response
 	}
 
 	// now we can read the other commands and re-route to the Debug Client...
@@ -63,5 +63,5 @@ func Debug(ctx context.Context, req *dbg.DebugReq, inStream dbg.Debug_StreamingO
 	}()
 
 	err = cmd.Wait() // TODO: handle err
-	return &dbg.StreamingOpenResp{}, nil
+	return &dbg.DebugResp{}, nil
 }