Add invoke, add msg type

pkg/bot/interactive/plugin_help.go

@@ -16,7 +16,8 @@ var pluginHelpProvider = map[string]pluginHelpProviderFn{
 		}
 	},
 	"botkube/kubectl": func(platform config.CommPlatformIntegration, btnBuilder *api.ButtonBuilder) api.Section {
-		if platform.IsInteractive() {
+		// TODO(https://github.com/kubeshop/botkube-cloud/issues/645): add support for kubectl builder
+		if platform.IsInteractive() && platform != config.CloudTeamsCommPlatformIntegration {
 			return api.Section{
 				Base: api.Base{
 					Header: "Run kubectl commands",

pkg/bot/teams_cloud.go

@@ -11,6 +11,7 @@ import (
 	"github.com/avast/retry-go/v4"
 	"github.com/infracloudio/msbotbuilder-go/core/activity"
 	"github.com/infracloudio/msbotbuilder-go/schema"
+	"github.com/mitchellh/mapstructure"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
 
@@ -26,8 +27,6 @@ import (
 	"github.com/kubeshop/botkube/pkg/sliceutil"
 )
 
-const channelIDKeyName = "teamsChannelId"
-
 var _ Bot = &CloudTeams{}
 
 // CloudTeams listens for user's messages, execute commands and sends back the response.
@@ -92,7 +91,6 @@ func NewCloudTeams(
 	if err != nil {
 		return nil, err
 	}
-
 	return &CloudTeams{
 		log:                  log,
 		executorFactory:      executorFactory,
@@ -254,9 +252,12 @@ func (b *CloudTeams) handleStreamMessage(ctx context.Context, data *pb.CloudActi
 		return nil, fmt.Errorf("while unmarshaling activity event: %w", err)
 	}
 	switch act.Type {
-	case schema.Message:
+	case schema.Message, schema.Invoke:
 		b.log.WithField("message", formatx.StructDumper().Sdump(act)).Debug("Processing Cloud message...")
-		channel, exists := b.getChannelForActivity(act)
+		channel, exists, err := b.getChannelForActivity(act)
+		if err != nil {
+			b.log.WithError(err).Error("cannot extract message channel id, processing with empty...")
+		}
 
 		msg := b.processMessage(ctx, act, channel, exists)
 		if msg.IsEmpty() {
@@ -273,6 +274,7 @@ func (b *CloudTeams) handleStreamMessage(ctx context.Context, data *pb.CloudActi
 		conversationRef := activity.GetCoversationReference(act)
 		return &pb.AgentActivity{
 			Message: &pb.Message{
+				MessageType:    pb.MessageType_MESSAGE_EXECUTOR,
 				TeamId:         channel.teamID,
 				ConversationId: conversationRef.Conversation.ID,
 				ActivityId:     conversationRef.ActivityID, // activity ID allows us to send it as a thread message
@@ -301,7 +303,8 @@ func (b *CloudTeams) processMessage(ctx context.Context, act schema.Activity, ch
 		},
 		Message: trimmedMsg,
 		User: execute.UserInput{
-			//Mention:     "", // TODO(https://github.com/kubeshop/botkube-cloud/issues/677): set when adding interactivity support.
+			// TODO: we need to add support for mentions on cloud side.
+			//Mention:     "",
 			DisplayName: act.From.Name,
 		},
 	})
@@ -322,6 +325,7 @@ func (b *CloudTeams) sendAgentActivity(ctx context.Context, msg interactive.Core
 
 		act := &pb.AgentActivity{
 			Message: &pb.Message{
+				MessageType:    pb.MessageType_MESSAGE_SOURCE,
 				TeamId:         channel.teamID,
 				ActivityId:     "", // empty so it will be sent on root instead of sending as a thread message
 				ConversationId: channel.ID,
@@ -338,19 +342,31 @@ func (b *CloudTeams) sendAgentActivity(ctx context.Context, msg interactive.Core
 	return errs.ErrorOrNil()
 }
 
-func (b *CloudTeams) getChannelForActivity(act schema.Activity) (teamsCloudChannelConfigByID, bool) {
-	rawChannelID, exists := act.ChannelData[channelIDKeyName]
-	if !exists {
-		return teamsCloudChannelConfigByID{}, false
+type channelData struct {
+	Channel struct {
+		ID string `mapstructure:"id"`
+	} `mapstructure:"channel"`
+	TeamsChannelID string `mapstructure:"teamsChannelId"`
+}
+
+func (b *CloudTeams) getChannelForActivity(act schema.Activity) (teamsCloudChannelConfigByID, bool, error) {
+	var data channelData
+	err := mapstructure.Decode(act.ChannelData, &data)
+	if err != nil {
+		return teamsCloudChannelConfigByID{}, false, fmt.Errorf("while decoding data: %w", err)
 	}
 
-	channelID, ok := rawChannelID.(string)
-	if !ok {
-		return teamsCloudChannelConfigByID{}, false
+	if data.Channel.ID == "" && data.TeamsChannelID == "" {
+		return teamsCloudChannelConfigByID{}, false, fmt.Errorf("cannot find channel id in: %s", formatx.StructDumper().Sdump(act.ChannelData))
 	}
 
-	channel, exists := b.getChannels()[channelID]
-	return channel, exists
+	id := data.TeamsChannelID
+	if id == "" {
+		id = data.Channel.ID
+	}
+
+	channel, exists := b.getChannels()[id]
+	return channel, exists, nil
 }
 
 func (b *CloudTeams) getChannelsToNotify(sourceBindings []string) []teamsCloudChannelConfigByID {

pkg/config/config.go

@@ -101,7 +101,7 @@ const (
 )
 
 func (c CommPlatformIntegration) IsInteractive() bool {
-	return c == SocketSlackCommPlatformIntegration || c == CloudSlackCommPlatformIntegration
+	return c == SocketSlackCommPlatformIntegration || c == CloudSlackCommPlatformIntegration || c == CloudTeamsCommPlatformIntegration
 }
 
 // String returns string platform name.

pkg/execute/plugin_executor.go

@@ -102,7 +102,7 @@ func (e *PluginExecutor) Execute(ctx context.Context, bindings []string, slackSt
 		Command: cmdCtx.CleanCmd,
 		Configs: configs,
 		Context: executor.ExecuteInputContext{
-			IsInteractivitySupported: cmdCtx.Platform.IsInteractive(),
+			IsInteractivitySupported: e.doesPlatformInteractivity(cmdCtx),
 			SlackState:               slackState,
 			KubeConfig:               kubeconfig,
 			Message: executor.Message{
@@ -146,6 +146,15 @@ func (e *PluginExecutor) Execute(ctx context.Context, bindings []string, slackSt
 	return out, nil
 }
 
+func (e *PluginExecutor) doesPlatformInteractivity(cmdCtx CommandContext) bool {
+	// TODO(https://github.com/kubeshop/botkube-cloud/issues/645): add support for kubectl builder
+	if strings.EqualFold(cmdCtx.CleanCmd, "kubectl") && cmdCtx.Platform == config.CloudTeamsCommPlatformIntegration {
+		// event though the cloud Teams support some interactivity, we do not support the command builder yet.
+		return false
+	}
+	return cmdCtx.Platform.IsInteractive()
+}
+
 func allMessagesMarkedAsSkip(msgs []api.Message) bool {
 	for _, item := range msgs {
 		if item.Type != api.SkipMessage {

proto/cloud_teams.proto

@@ -9,11 +9,17 @@ message AgentActivity {
   Message message = 2;
 }
 
+enum MessageType {
+  MESSAGE_EXECUTOR = 0;
+  MESSAGE_SOURCE = 1;
+}
+
 message Message {
   string teamId = 1;
   string activityId = 2;
   string conversationId = 3;
-  bytes data = 4;
+  MessageType messageType = 4;
+  bytes data = 5;
 }
 
 message CloudActivity {