Add missing envs

kubeshop · Sep 21, 2023 · eaa46ae · eaa46ae
1 parent e4d3e7f
commit eaa46ae
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/.github/workflows/cl-migration-e2e.yaml b/.github/workflows/cl-migration-e2e.yaml
@@ -12,6 +12,13 @@ on:
   repository_dispatch:
     types: [ trigger-e2e-tests ]
 
+env:
+  HELM_VERSION: v3.9.0
+  K3D_VERSION: v5.4.6
+  IMAGE_REGISTRY: "ghcr.io"
+  IMAGE_REPOSITORY: "kubeshop/botkube"
+  IMAGE_TAG: v9.99.9-dev # TODO: Use commit hash tag to make the predictable builds for each commit on branch
+
 jobs:
   migration-e2e-test:
     name: Migration e2e test

diff --git a/test/commplatform/slack_tester.go b/test/commplatform/slack_tester.go
@@ -22,11 +22,12 @@ import (
 )
 
 type SlackConfig struct {
-	BotName                  string `envconfig:"default=botkube"`
-	TesterName               string `envconfig:"default=tester"`
-	AdditionalContextMessage string `envconfig:"optional"`
-	TesterAppToken           string
-	CloudTesterAppToken      string
+	BotName                  string        `envconfig:"default=botkube"`
+	TesterName               string        `envconfig:"default=tester"`
+	AdditionalContextMessage string        `envconfig:"optional"`
+	TesterAppToken           string        `envconfig:"optional"`
+	TesterBotToken           string        `envconfig:"optional"`
+	CloudTesterAppToken      string        `envconfig:"optional"`
 	RecentMessagesLimit      int           `envconfig:"default=6"`
 	MessageWaitTimeout       time.Duration `envconfig:"default=30s"`
 }
@@ -57,7 +58,18 @@ type SlackTester struct {
 }
 
 func NewSlackTester(slackCfg SlackConfig) (BotDriver, error) {
-	slackCli := slack.New(slackCfg.TesterAppToken)
+	var token string
+	if slackCfg.TesterAppToken == "" && slackCfg.TesterBotToken == "" {
+		return nil, errors.New("slack tester token is not set")
+	}
+	if slackCfg.TesterAppToken != "" {
+		token = slackCfg.TesterAppToken
+	}
+	if slackCfg.TesterBotToken != "" {
+		token = slackCfg.TesterBotToken
+	}
+
+	slackCli := slack.New(token)
 	_, err := slackCli.AuthTest()
 	if err != nil {
 		return nil, err