fix: check for trigger cloud mode

Signed-off-by: Vladislav Sukhin <[email protected]>
kubeshop · Oct 22, 2024 · 34ceae9 · 34ceae9
1 parent 9c841e4
commit 34ceae9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/cmd/api-server/main.go b/cmd/api-server/main.go
@@ -495,6 +495,7 @@ func main() {
 			triggers.WithTestkubeNamespace(cfg.TestkubeNamespace),
 			triggers.WithWatcherNamespaces(cfg.TestkubeWatcherNamespaces),
 			triggers.WithDisableSecretCreation(!secretConfig.AutoCreate),
+			triggers.WithProContext(&proContext),
 		)
 		log.DefaultLogger.Info("starting trigger service")
 		g.Go(func() error {

diff --git a/pkg/triggers/executor.go b/pkg/triggers/executor.go
@@ -136,8 +136,11 @@ func (s *Service) execute(ctx context.Context, e *watcherEvent, t *testtriggersv
 
 		request := testkube.TestWorkflowExecutionRequest{
 			Config: make(map[string]string, len(variables)),
-			// Pro edition only (tcl protected code)
-			RunningContext: triggerstcl.GetRunningContext(t.Name),
+		}
+
+		// Pro edition only (tcl protected code)
+		if s.proContext != nil && s.proContext.APIKey != "" {
+			request.RunningContext = triggerstcl.GetRunningContext(t.Name)
 		}
 
 		for _, variable := range variables {

diff --git a/pkg/triggers/service.go b/pkg/triggers/service.go
@@ -18,6 +18,7 @@ import (
 	testkubeclientsetv1 "github.com/kubeshop/testkube-operator/pkg/clientset/versioned"
 	"github.com/kubeshop/testkube/cmd/api-server/commons"
 	"github.com/kubeshop/testkube/internal/app/api/metrics"
+	intconfig "github.com/kubeshop/testkube/internal/config"
 	"github.com/kubeshop/testkube/pkg/api/v1/testkube"
 	"github.com/kubeshop/testkube/pkg/event/bus"
 	"github.com/kubeshop/testkube/pkg/executor/client"
@@ -77,6 +78,7 @@ type Service struct {
 	testkubeNamespace             string
 	watcherNamespaces             []string
 	disableSecretCreation         bool
+	proContext                    *intconfig.ProContext
 }
 
 type Option func(*Service)
@@ -210,6 +212,12 @@ func WithDisableSecretCreation(disableSecretCreation bool) Option {
 	}
 }
 
+func WithProContext(proContext *intconfig.ProContext) Option {
+	return func(s *Service) {
+		s.proContext = proContext
+	}
+}
+
 func (s *Service) Run(ctx context.Context) {
 	leaseChan := make(chan bool)