Support channel-based group mapping for Cloud Teams

.github/workflows/codeql.yaml

@@ -35,8 +35,8 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
-
+          go-version-file: 'go.mod'
+          cache: true
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

cmd/cli/cmd/config/config.go

@@ -1,6 +1,8 @@
 package config
 
-import "github.com/spf13/cobra"
+import (
+	"github.com/spf13/cobra"
+)
 
 // NewCmd returns a new cobra.Command subcommand for config-related operations.
 func NewCmd() *cobra.Command {

cmd/cli/cmd/telemetry/telemetry.go

@@ -1,6 +1,8 @@
 package telemetry
 
-import "github.com/spf13/cobra"
+import (
+	"github.com/spf13/cobra"
+)
 
 // NewCmd returns a new cobra.Command subcommand for telemetry-related operations.
 func NewCmd() *cobra.Command {

go.mod

@@ -1,5 +1,7 @@
 module github.com/kubeshop/botkube
 
+go 1.21
+
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/DanielTitkov/go-adaptive-cards v0.2.2
@@ -280,8 +282,6 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
-go 1.19
-
 replace (
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0
 	go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.16.0

hack/fmt-imports.sh

@@ -9,7 +9,7 @@ set -E         # needs to be set if we want the ERR trap
 
 CURRENT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 REPO_ROOT_DIR=$(cd "${CURRENT_DIR}/.." && pwd)
-GOIMPORTS_REVISER_VERSION=3.3.1
+GOIMPORTS_REVISER_VERSION=3.6.0
 
 host::os() {
   local host_os

internal/cli/analytics/cmd.go

@@ -1,6 +1,8 @@
 package analytics
 
-import "github.com/spf13/cobra"
+import (
+	"github.com/spf13/cobra"
+)
 
 // InjectAnalyticsReporting injects analytics reporting into the command.
 func InjectAnalyticsReporting(in cobra.Command, cmdName string) *cobra.Command {

internal/config/flag.go

@@ -1,6 +1,8 @@
 package config
 
-import "github.com/spf13/pflag"
+import (
+	"github.com/spf13/pflag"
+)
 
 var configPathsFlag []string
 

internal/config/reloader/noop.go

@@ -1,6 +1,8 @@
 package reloader
 
-import "context"
+import (
+	"context"
+)
 
 var _ Reloader = (*NoopReloader)(nil)
 

internal/config/reloader/reloader.go

@@ -1,6 +1,8 @@
 package reloader
 
-import "context"
+import (
+	"context"
+)
 
 // Reloader is an interface for reloading configuration.
 type Reloader interface {

internal/config/remote/config.go

@@ -1,6 +1,8 @@
 package remote
 
-import "os"
+import (
+	"os"
+)
 
 const (
 	// ProviderEndpointEnvKey holds config provider endpoint.

internal/executor/kubectl/builder/strings.go

@@ -1,6 +1,8 @@
 package builder
 
-import "strings"
+import (
+	"strings"
+)
 
 func overflowSentence(in []string) []string {
 	for idx := range in {

internal/executor/kubectl/options.go

@@ -1,6 +1,8 @@
 package kubectl
 
-import "github.com/MakeNowJust/heredoc"
+import (
+	"github.com/MakeNowJust/heredoc"
+)
 
 func optionsCommandOutput() string {
 	return heredoc.Doc(`

internal/executor/thread-mate/commands.go

@@ -1,6 +1,8 @@
 package thread_mate
 
-import "strings"
+import (
+	"strings"
+)
 
 type (
 	// Commands represents a collection of subcommands.

internal/ptr/ptr.go

@@ -1,6 +1,8 @@
 package ptr
 
-import "golang.org/x/exp/constraints"
+import (
+	"golang.org/x/exp/constraints"
+)
 
 // ToSlice converts a given slice of pointers to slice with non-nil elems.
 func ToSlice[T any](in []*T) []T {

pkg/bot/teams_cloud.go

@@ -254,13 +254,15 @@ func (b *CloudTeams) handleStreamMessage(ctx context.Context, data *pb.CloudActi
 	}
 	switch act.Type {
 	case schema.Message, schema.Invoke:
-		b.log.WithField("message", formatx.StructDumper().Sdump(act)).Debug("Processing Cloud message...")
+		b.log.WithFields(logrus.Fields{
+			"message":                 formatx.StructDumper().Sdump(act),
+			"conversationDisplayName": data.ConversationDisplayName,
+		}).Debug("Processing Cloud message...")
 		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)
+		msg := b.processMessage(ctx, act, channel, data.ConversationDisplayName, exists)
 		if msg.IsEmpty() {
 			b.log.WithField("activityID", act.ID).Debug("Empty message... Skipping sending response")
 			return nil, nil
@@ -287,7 +289,7 @@ func (b *CloudTeams) handleStreamMessage(ctx context.Context, data *pb.CloudActi
 	}
 }
 
-func (b *CloudTeams) processMessage(ctx context.Context, act schema.Activity, channel teamsCloudChannelConfigByID, exists bool) interactive.CoreMessage {
+func (b *CloudTeams) processMessage(ctx context.Context, act schema.Activity, channel teamsCloudChannelConfigByID, channelDisplayName string, exists bool) interactive.CoreMessage {
 	trimmedMsg := b.trimBotMention(act.Text)
 
 	e := b.executorFactory.NewDefault(execute.NewDefaultInput{
@@ -301,6 +303,7 @@ func (b *CloudTeams) processMessage(ctx context.Context, act schema.Activity, ch
 			ExecutorBindings: channel.Bindings.Executors,
 			SourceBindings:   channel.Bindings.Sources,
 			CommandOrigin:    command.TypedOrigin,
+			DisplayName:      channelDisplayName,
 		},
 		Message: trimmedMsg,
 		User: execute.UserInput{

pkg/conversation/normalize.go

@@ -1,6 +1,8 @@
 package conversation
 
-import "strings"
+import (
+	"strings"
+)
 
 // NormalizeChannelIdentifier removes leading and trailing spaces and # from the channel name.
 // this is platform-agnostic, as different platforms use different rules:

pkg/execute/plugin_executor.go

@@ -81,9 +81,16 @@ func (e *PluginExecutor) Execute(ctx context.Context, bindings []string, slackSt
 		return interactive.CoreMessage{}, fmt.Errorf("while collecting configs: %w", err)
 	}
 
+	channel := cmdCtx.Conversation.DisplayName
+	if channel == "" {
+		channel = cmdCtx.Conversation.ID
+	}
+
 	input := plugin.KubeConfigInput{
-		Channel: cmdCtx.Conversation.DisplayName,
+		Channel: channel,
 	}
+	e.log.WithField("input", input).Debug("Generating Kubeconfig...")
+
 	kubeconfig, err := plugin.GenerateKubeConfig(e.restCfg, e.cfg.Settings.ClusterName, plugins[0].Context, input)
 	if err != nil {
 		return interactive.CoreMessage{}, fmt.Errorf("while generating kube config: %w", err)

pkg/pluginx/command_opts.go

@@ -1,6 +1,8 @@
 package pluginx
 
-import "io"
+import (
+	"io"
+)
 
 // ExecuteCommandOptions represents the options for executing a command.
 type ExecuteCommandOptions struct {

proto/cloud_teams.proto

@@ -24,6 +24,7 @@ message Message {
 
 message CloudActivity {
   bytes event = 1;
+  string conversationDisplayName = 2;
 }
 
 service CloudTeams {