Fix Cloud Slack Dev E2E test after recent changes

.github/workflows/branch-build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - fix-cloud-slack-tests # TODO:
   repository_dispatch:
     types: [ trigger-e2e-tests ]
 
@@ -119,10 +120,28 @@ jobs:
         env:
           # we hardcode plugins version, so it's predictable in e2e tests
           GORELEASER_CURRENT_TAG: "v0.0.0-latest"
-          OUTPUT_MODE: "archive"
+          OUTPUT_MODE: "binary"
+          SINGLE_PLATFORM: "true"
+          PLUGIN_TARGETS: "kubernetes,kubectl,cm-watcher,echo,helm"
         run: |
           make build-plugins
 
+      - name: CLI Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+            dist/botkube-cli_linux_amd64_v1/botkube
+          key: ${{ runner.os }}-botkube-cli
+
+      - name: Build CLI
+        run: make release-snapshot-cli
+
+      - name: Add Botkube CLI to env
+        run: |
+          echo CONFIG_PROVIDER_BOTKUBE_CLI_BINARY_PATH="$PWD/dist/botkube-cli_linux_amd64_v1/botkube" >> $GITHUB_ENV
+
       - name: Run ${{ matrix.integration }} tests
         env:
           SLACK_TESTER_APP_TOKEN: ${{ secrets.SLACK_TESTER_APP_TOKEN }}
@@ -132,6 +151,12 @@ jobs:
           DISCORD_GUILD_ID: ${{ secrets.DISCORD_GUILD_ID }}
           DISCORD_ADDITIONAL_CONTEXT_MESSAGE: "Branch test - commit SHA: ${{github.sha}} - https://github.com/kubeshop/botkube/commit/${{github.sha}}"
           PLUGINS_BINARIES_DIRECTORY: ${{ github.workspace }}/plugin-dist
+          CONFIG_PROVIDER_API_KEY: ${{ secrets.CONFIG_PROVIDER_API_KEY }}
+          CONFIG_PROVIDER_ENDPOINT: ${{ secrets.CONFIG_PROVIDER_ENDPOINT }}
+          CONFIG_PROVIDER_SLACK_WORKSPACE_TEAM_ID: ${{ secrets.CONFIG_PROVIDER_SLACK_WORKSPACE_TEAM_ID }}
+          CONFIG_PROVIDER_IMAGE_REPOSITORY: ${{ env.IMAGE_REPOSITORY }}
+          CONFIG_PROVIDER_IMAGE_TAG: ${{ env.IMAGE_TAG }}
+          CONFIG_PROVIDER_HELM_REPO_DIRECTORY: ${{ github.workspace }}/helm
         run: |
           KUBECONFIG=$(k3d kubeconfig write ${{ matrix.integration }}-test-cluster) \
             make test-integration-${{ matrix.integration }}

test/cloud-slack-dev-e2e/cloud_slack_dev_e2e_test.go

@@ -88,6 +88,8 @@ func TestCloudSlackE2E(t *testing.T) {
 	err := envconfig.Init(&cfg)
 	require.NoError(t, err)
 
+	cfg.Slack.Tester.CloudBasedTestEnabled = false // override property used only in the Cloud Slack E2E tests
+
 	authHeaderValue := ""
 	firstPageClosed := false
 	helmChartUninstalled := false
@@ -267,7 +269,7 @@ func TestCloudSlackE2E(t *testing.T) {
 		require.NotEmpty(t, authHeaderValue, "Previous subtest needs to pass to get authorization header value")
 
 		t.Log("Initializing Slack...")
-		tester, err := commplatform.NewSlackTester(cfg.Slack.Tester)
+		tester, err := commplatform.NewSlackTester(cfg.Slack.Tester, nil)
 		require.NoError(t, err)
 
 		t.Log("Initializing users...")

test/commplatform/slack_tester.go

@@ -16,6 +16,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/util/wait"
 
+	"github.com/kubeshop/botkube/internal/ptr"
 	"github.com/kubeshop/botkube/pkg/api"
 	"github.com/kubeshop/botkube/pkg/bot"
 	"github.com/kubeshop/botkube/pkg/bot/interactive"
@@ -75,18 +76,19 @@ func (s *SlackTester) ReplaceBotNamePlaceholder(msg *interactive.CoreMessage, cl
 	msg.ReplaceBotNamePlaceholder(s.BotName(), api.BotNameWithClusterName(clusterName))
 }
 
-func NewSlackTester(slackCfg SlackConfig, apiKey string) (BotDriver, error) {
+func NewSlackTester(slackCfg SlackConfig, apiKey *string) (BotDriver, error) {
 	var token string
 	if slackCfg.TesterAppToken == "" && slackCfg.TesterBotToken == "" && slackCfg.CloudTesterAppToken == "" {
 		return nil, errors.New("slack tester tokens are not set")
 	}
+
 	if slackCfg.TesterAppToken != "" {
 		token = slackCfg.TesterAppToken
 	}
 	if slackCfg.TesterBotToken != "" {
 		token = slackCfg.TesterBotToken
 	}
-	if slackCfg.CloudBasedTestEnabled {
+	if slackCfg.CloudBasedTestEnabled && slackCfg.CloudTesterAppToken != "" {
 		token = slackCfg.CloudTesterAppToken
 	}
 
@@ -98,7 +100,7 @@ func NewSlackTester(slackCfg SlackConfig, apiKey string) (BotDriver, error) {
 	mdFormatter := interactive.NewMDFormatter(interactive.NewlineFormatter, func(msg string) string {
 		return fmt.Sprintf("*%s*", msg)
 	})
-	return &SlackTester{cli: slackCli, cfg: slackCfg, mdFormatter: mdFormatter, configProviderApiKey: apiKey}, nil
+	return &SlackTester{cli: slackCli, cfg: slackCfg, mdFormatter: mdFormatter, configProviderApiKey: ptr.ToValue(apiKey)}, nil
 }
 
 func (s *SlackTester) InitUsers(t *testing.T) {

test/e2e/bots_test.go

@@ -30,6 +30,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/kubeshop/botkube/internal/httpx"
+	"github.com/kubeshop/botkube/internal/ptr"
 	"github.com/kubeshop/botkube/internal/source/kubernetes/filterengine/filters"
 	"github.com/kubeshop/botkube/pkg/api"
 	"github.com/kubeshop/botkube/pkg/bot/interactive"
@@ -151,7 +152,7 @@ func TestDiscord(t *testing.T) {
 func newBotDriver(cfg Config, driverType commplatform.DriverType) (commplatform.BotDriver, error) {
 	switch driverType {
 	case commplatform.SlackBot:
-		return commplatform.NewSlackTester(cfg.Slack, cfg.ConfigProvider.ApiKey)
+		return commplatform.NewSlackTester(cfg.Slack, ptr.FromType(cfg.ConfigProvider.ApiKey))
 	case commplatform.DiscordBot:
 		return commplatform.NewDiscordTester(cfg.Discord)
 	}