Added oneof clause to MonitorResponse

Author: cmaglie

commands/service_monitor.go

@@ -160,7 +160,7 @@ func (s *arduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer
 
 	// Send a message with Success set to true to notify the caller of the port being now active
 	syncSend := NewSynchronizedSend(stream.Send)
-	_ = syncSend.Send(&rpc.MonitorResponse{Success: true})
+	_ = syncSend.Send(&rpc.MonitorResponse{Message: &rpc.MonitorResponse_Success{Success: true}})
 
 	ctx, cancel := context.WithCancel(stream.Context())
 	gracefulCloseInitiated := &atomic.Bool{}
@@ -175,13 +175,13 @@ func (s *arduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer
 				return
 			}
 			if err != nil {
-				syncSend.Send(&rpc.MonitorResponse{Error: err.Error()})
+				syncSend.Send(&rpc.MonitorResponse{Message: &rpc.MonitorResponse_Error{Error: err.Error()}})
 				return
 			}
 			if conf := msg.GetUpdatedConfiguration(); conf != nil {
 				for _, c := range conf.GetSettings() {
 					if err := monitor.Configure(c.GetSettingId(), c.GetValue()); err != nil {
-						syncSend.Send(&rpc.MonitorResponse{Error: err.Error()})
+						syncSend.Send(&rpc.MonitorResponse{Message: &rpc.MonitorResponse_Error{Error: err.Error()}})
 					}
 				}
 			}
@@ -199,7 +199,7 @@ func (s *arduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer
 					return
 				}
 				if err != nil {
-					syncSend.Send(&rpc.MonitorResponse{Error: err.Error()})
+					syncSend.Send(&rpc.MonitorResponse{Message: &rpc.MonitorResponse_Error{Error: err.Error()}})
 					return
 				}
 				tx = tx[n:]
@@ -217,10 +217,10 @@ func (s *arduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer
 				break
 			}
 			if err != nil {
-				syncSend.Send(&rpc.MonitorResponse{Error: err.Error()})
+				syncSend.Send(&rpc.MonitorResponse{Message: &rpc.MonitorResponse_Error{Error: err.Error()}})
 				break
 			}
-			if err := syncSend.Send(&rpc.MonitorResponse{RxData: buff[:n]}); err != nil {
+			if err := syncSend.Send(&rpc.MonitorResponse{Message: &rpc.MonitorResponse_RxData{RxData: buff[:n]}}); err != nil {
 				break
 			}
 		}

rpc/cc/arduino/cli/commands/v1/monitor.pb.go

@@ -51,22 +51,24 @@ message MonitorPortOpenRequest {
 }
 
 message MonitorPortConfiguration {
-  // The port configuration parameters to configure
+  // The port configuration parameters
   repeated MonitorPortSetting settings = 1;
 }
 
 message MonitorResponse {
-  // Eventual errors dealing with monitor port
-  string error = 1;
-  // Data received from the port
-  bytes rx_data = 2;
-  // Settings applied to the port, may be returned after a port is opened (to
-  // report the default settings) or after a new port_configuration is sent
-  // (to report the new settings applied)
-  repeated MonitorPortSetting applied_settings = 3;
-  // A message with this field set to true is sent as soon as the port is
-  // succesfully opened
-  bool success = 4;
+  oneof message {
+    // Eventual errors dealing with monitor port
+    string error = 1;
+    // Data received from the port
+    bytes rx_data = 2;
+    // Settings applied to the port, may be returned after a port is opened (to
+    // report the default settings) or after a new port_configuration is sent
+    // (to report the new settings applied)
+    MonitorPortConfiguration applied_settings = 3;
+    // A message with this field set to true is sent as soon as the port is
+    // succesfully opened
+    bool success = 4;
+  }
 }
 
 message MonitorPortSetting {