Move username and ID out of AssistantMessage

api/proto/teleport/assist/v1/assist.proto

@@ -26,34 +26,29 @@ message GetAssistantMessagesRequest {
   // ConversationId identifies a conversation.
   // It's used to tie all messages in a one conversation.
   string conversation_id = 1;
-
   // username is a username of the user who sent the message.
   string username = 2;
 }
 
 // AssistantMessage is a message sent to the assistant service. The conversation
 // must be created first.
 message AssistantMessage {
-  // ConversationId is used to tie all messages into a conversation.
-  string conversation_id = 1;
-
-  // username is a username of the user who sent the message.
-  string username = 2;
-
   // type is a type of message. It can be Chat response/query or a command to run.
-  string type = 3;
-
+  string type = 1;
   // CreatedTime is the time when the event occurred.
-  google.protobuf.Timestamp created_time = 4;
-
+  google.protobuf.Timestamp created_time = 2;
   // payload is a JSON message
-  string payload = 5;
+  string payload = 3;
 }
 
 // CreateAssistantMessageRequest is a request to the assistant service.
 message CreateAssistantMessageRequest {
   // message is a message sent to the assistant service.
   AssistantMessage message = 1;
+  // ConversationId is used to tie all messages into a conversation.
+  string conversation_id = 2;
+  // username is a username of the user who sent the message.
+  string username = 3;
 }
 
 // GetAssistantMessagesResponse is a response from the assistant service.

lib/auth/assist/assistv1/service.go

@@ -83,5 +83,5 @@ func (a *Service) GetAssistantMessages(ctx context.Context, req *assist.GetAssis
 
 // CreateAssistantMessage adds the message to the backend.
 func (a *Service) CreateAssistantMessage(ctx context.Context, req *assist.CreateAssistantMessageRequest) (*emptypb.Empty, error) {
-	return nil, trace.Wrap(a.backend.CreateAssistantMessage(ctx, req))
+	return &emptypb.Empty{}, trace.Wrap(a.backend.CreateAssistantMessage(ctx, req))
 }

lib/services/local/assistant.go

@@ -211,11 +211,14 @@ func (s *AssistService) GetAssistantMessages(ctx context.Context, req *assist.Ge
 
 // CreateAssistantMessage adds the message to the backend.
 func (s *AssistService) CreateAssistantMessage(ctx context.Context, req *assist.CreateAssistantMessageRequest) error {
-	msg := req.GetMessage()
-	if msg.Username == "" {
+	if req.Username == "" {
 		return trace.BadParameter("missing username")
 	}
+	if req.ConversationId == "" {
+		return trace.BadParameter("missing conversation ID")
+	}
 
+	msg := req.GetMessage()
 	value, err := json.Marshal(msg)
 	if err != nil {
 		return trace.Wrap(err)
@@ -224,7 +227,7 @@ func (s *AssistService) CreateAssistantMessage(ctx context.Context, req *assist.
 	messageID := uuid.New().String()
 
 	item := backend.Item{
-		Key:   backend.Key(assistantMessagePrefix, msg.Username, msg.ConversationId, messageID),
+		Key:   backend.Key(assistantMessagePrefix, req.Username, req.ConversationId, messageID),
 		Value: value,
 	}
 

lib/services/local/assistant_test.go

@@ -77,12 +77,12 @@ func TestAssistantCRUD(t *testing.T) {
 
 	t.Run("create message", func(t *testing.T) {
 		msg := &assist.CreateAssistantMessageRequest{
+			Username:       username,
+			ConversationId: conversationID,
 			Message: &assist.AssistantMessage{
-				Username:       username,
-				CreatedTime:    timestamppb.New(time.Now()),
-				ConversationId: conversationID,
-				Payload:        "foo",
-				Type:           "USER_MSG",
+				CreatedTime: timestamppb.New(time.Now()),
+				Payload:     "foo",
+				Type:        "USER_MSG",
 			},
 		}
 		err := identity.CreateAssistantMessage(ctx, msg)