feat: dashboard uri for cd event

cmd/api-server/main.go

@@ -392,6 +392,7 @@ func main() {
 		cfg.GraphqlPort,
 		artifactStorage,
 		cfg.CDEventsTarget,
+		cfg.TestkubeDashboardURI,
 	)
 
 	if mode == common.ModeAgent {

contrib/executor/playwright/pkg/runner/playwright_test.go

@@ -29,7 +29,7 @@ func TestRun_Integration(t *testing.T) {
 	ctx := context.Background()
 
 	params := envs.Params{DataDir: tempDir}
-	runner, err := NewPlaywrightRunner(ctx, "pnpm", params)
+	runner, err := NewPlaywrightRunner(ctx, "npm", params)
 	if err != nil {
 		t.Fail()
 	}

docs/docs/articles/helm-chart.md

@@ -112,6 +112,8 @@ The following Helm defaults are used in the `testkube` chart:
 | testkube-api.jobServiceAccountName   | yes         | ""                                   |
 | testkube-api.logs.storage            | no          | "minio"                              |
 | testkube-api.logs.bucket             | no          | "testkube-logs"                      |
+| testkube-api.cdeventsTarget          | yes         | ""                                   |
+| testkube-api.dashboardUri            | yes         | ""                                   |
 
 >For more configuration parameters of a `MongoDB` chart please visit: 
 <https://github.com/bitnami/charts/tree/master/bitnami/mongodb#parameters>

internal/app/api/v1/server.go

@@ -80,6 +80,7 @@ func NewTestkubeAPI(
 	graphqlPort string,
 	artifactsStorage storage.ArtifactsStorage,
 	cdeventsTarget string,
+	dashboardURI string,
 ) TestkubeAPI {
 
 	var httpConfig server.Config
@@ -129,7 +130,7 @@ func NewTestkubeAPI(
 	s.Events.Loader.Register(s.slackLoader)
 
 	if cdeventsTarget != "" {
-		cdeventLoader, err := cdevent.NewCDEventLoader(cdeventsTarget, clusterId, namespace, testkube.AllEventTypes)
+		cdeventLoader, err := cdevent.NewCDEventLoader(cdeventsTarget, clusterId, namespace, dashboardURI, testkube.AllEventTypes)
 		if err == nil {
 			s.Events.Loader.Register(cdeventLoader)
 		} else {

internal/config/config.go

@@ -59,6 +59,7 @@ type Config struct {
 	TestkubeRegistry                  string        `envconfig:"TESTKUBE_REGISTRY" default:""`
 	TestkubePodStartTimeout           time.Duration `envconfig:"TESTKUBE_POD_START_TIMEOUT" default:"30m"`
 	CDEventsTarget                    string        `envconfig:"CDEVENTS_TARGET" default:""`
+	TestkubeDashboardURI              string        `envconfig:"TESTKUBE_DASHBOARD_URI" default:""`
 }
 
 func Get() (*Config, error) {

pkg/api/v1/testkube/model_artifact_request.go

@@ -12,9 +12,9 @@ package testkube
 // artifact request body with test artifacts
 type ArtifactRequest struct {
 	// artifact storage class name for container executor
-	StorageClassName string `json:"storageClassName"`
+	StorageClassName string `json:"storageClassName,omitempty"`
 	// artifact volume mount path for container executor
-	VolumeMountPath string `json:"volumeMountPath"`
+	VolumeMountPath string `json:"volumeMountPath,omitempty"`
 	// artifact directories for scraping
 	Dirs []string `json:"dirs,omitempty"`
 }

pkg/api/v1/testkube/model_artifact_update_request.go

@@ -11,10 +11,10 @@ package testkube
 
 // artifact request update body
 type ArtifactUpdateRequest struct {
-	// artifact storage class name
-	StorageClassName *string `json:"storageClassName"`
-	// artifact volume mount path
-	VolumeMountPath *string `json:"volumeMountPath"`
-	// artifact directories
+	// artifact storage class name for container executor
+	StorageClassName *string `json:"storageClassName,omitempty"`
+	// artifact volume mount path for container executor
+	VolumeMountPath *string `json:"volumeMountPath,omitempty"`
+	// artifact directories for scraping
 	Dirs *[]string `json:"dirs,omitempty"`
 }

pkg/cloud/data/artifact/scraper_integration_test.go

@@ -96,7 +96,7 @@ func TestCloudScraper_ArchiveFilesystemExtractor_Integration(t *testing.T) {
 	client, err := cloudevents.NewClientHTTP(cloudevents.WithTarget(svr.URL))
 	assert.NoError(t, err)
 
-	s := scraper.NewExtractLoadScraper(extractor, cloudLoader, client, "")
+	s := scraper.NewExtractLoadScraper(extractor, cloudLoader, client, "", "")
 	execution := testkube.Execution{
 		Id:            "my-execution-id",
 		TestName:      "my-test",
@@ -195,7 +195,7 @@ func TestCloudScraper_RecursiveFilesystemExtractor_Integration(t *testing.T) {
 	client, err := cloudevents.NewClientHTTP(cloudevents.WithTarget(svr.URL))
 	assert.NoError(t, err)
 
-	s := scraper.NewExtractLoadScraper(extractor, cloudLoader, client, "")
+	s := scraper.NewExtractLoadScraper(extractor, cloudLoader, client, "", "")
 	execution := testkube.Execution{
 		Id:            "my-execution-id",
 		TestName:      "my-test",

pkg/envs/variables.go

@@ -24,6 +24,7 @@ type Params struct {
 	GitToken            string // RUNNER_GITTOKEN
 	ClusterID           string `envconfig:"RUNNER_CLUSTERID"`              // RUNNER_CLUSTERID
 	CDEventsTarget      string `envconfig:"RUNNER_CDEVENTS_TARGET"`        // RUNNER_CDEVENTS_TARGET
+	DashboardURI        string `envconfig:"RUNNER_DASHBOARD_URI"`          // RUNNER_DASHBOARD_URI
 	CloudMode           bool   `envconfig:"RUNNER_CLOUD_MODE"`             // RUNNER_CLOUD_MODE
 	CloudAPIKey         string `envconfig:"RUNNER_CLOUD_API_KEY"`          // RUNNER_CLOUD_API_KEY
 	CloudAPITLSInsecure bool   `envconfig:"RUNNER_CLOUD_API_TLS_INSECURE"` // RUNNER_CLOUD_API_TLS_INSECURE
@@ -60,6 +61,7 @@ func printParams(params Params) {
 	output.PrintLogf("RUNNER_DATADIR=\"%s\"", params.DataDir)
 	output.PrintLogf("RUNNER_CLUSTERID=\"%s\"", params.ClusterID)
 	output.PrintLogf("RUNNER_CDEVENTS_TARGET=\"%s\"", params.CDEventsTarget)
+	output.PrintLogf("RUNNER_DASHBOARD_URI=\"%s\"", params.DashboardURI)
 	output.PrintLogf("RUNNER_CLOUD_MODE=\"%t\"", params.CloudMode)
 	output.PrintLogf("RUNNER_CLOUD_API_TLS_INSECURE=\"%t\"", params.CloudAPITLSInsecure)
 	output.PrintLogf("RUNNER_CLOUD_API_URL=\"%s\"", params.CloudAPIURL)

pkg/event/kind/cdevent/listener.go

@@ -17,7 +17,7 @@ import (
 
 var _ common.Listener = (*CDEventListener)(nil)
 
-func NewCDEventListener(name, selector, clusterID, defaultNamespace string, events []testkube.EventType, client cloudevents.Client) *CDEventListener {
+func NewCDEventListener(name, selector, clusterID, defaultNamespace, dashboardURI string, events []testkube.EventType, client cloudevents.Client) *CDEventListener {
 	return &CDEventListener{
 		name:             name,
 		Log:              log.DefaultLogger,
@@ -26,6 +26,7 @@ func NewCDEventListener(name, selector, clusterID, defaultNamespace string, even
 		client:           client,
 		clusterID:        clusterID,
 		defaultNamespace: defaultNamespace,
+		dashboardURI:     dashboardURI,
 	}
 }
 
@@ -37,6 +38,7 @@ type CDEventListener struct {
 	client           cloudevents.Client
 	clusterID        string
 	defaultNamespace string
+	dashboardURI     string
 }
 
 func (l *CDEventListener) Name() string {
@@ -60,7 +62,7 @@ func (l *CDEventListener) Metadata() map[string]string {
 
 func (l *CDEventListener) Notify(event testkube.Event) (result testkube.EventResult) {
 	// Create the base event
-	ev, err := cde.MapTestkubeEventToCDEvent(event, l.clusterID, l.defaultNamespace)
+	ev, err := cde.MapTestkubeEventToCDEvent(event, l.clusterID, l.defaultNamespace, l.dashboardURI)
 	if err != nil {
 		return testkube.NewFailedEventResult(event.Id, err)
 	}

pkg/event/kind/cdevent/listener_test.go

@@ -32,7 +32,7 @@ func TestCDEventListener_Notify(t *testing.T) {
 		client, err := cloudevents.NewClientHTTP(cloudevents.WithTarget(svr.URL))
 		assert.NoError(t, err)
 
-		l := NewCDEventListener("cdeli", "", "clusterID", "", testEventTypes, client)
+		l := NewCDEventListener("cdeli", "", "clusterID", "", "", testEventTypes, client)
 
 		// when
 		r := l.Notify(testkube.Event{
@@ -57,7 +57,7 @@ func TestCDEventListener_Notify(t *testing.T) {
 		client, err := cloudevents.NewClientHTTP(cloudevents.WithTarget(svr.URL))
 		assert.NoError(t, err)
 
-		l := NewCDEventListener("cdeli", "", "clusterID", "", testEventTypes, client)
+		l := NewCDEventListener("cdeli", "", "clusterID", "", "", testEventTypes, client)
 
 		// when
 		r := l.Notify(testkube.Event{
@@ -77,7 +77,7 @@ func TestCDEventListener_Notify(t *testing.T) {
 		client, err := cloudevents.NewClientHTTP(cloudevents.WithTarget("abcdef"))
 		assert.NoError(t, err)
 
-		l := NewCDEventListener("cdeli", "", "clusterID", "", testEventTypes, client)
+		l := NewCDEventListener("cdeli", "", "clusterID", "", "", testEventTypes, client)
 
 		// when
 		r := l.Notify(testkube.Event{

pkg/event/kind/cdevent/loader.go

@@ -11,7 +11,7 @@ import (
 
 var _ common.ListenerLoader = (*CDEventLoader)(nil)
 
-func NewCDEventLoader(target, clusterID, defaultNamespace string, events []testkube.EventType) (*CDEventLoader, error) {
+func NewCDEventLoader(target, clusterID, defaultNamespace, dashboardURI string, events []testkube.EventType) (*CDEventLoader, error) {
 	c, err := cloudevents.NewClientHTTP(cloudevents.WithTarget(target))
 	if err != nil {
 		return nil, err
@@ -23,6 +23,7 @@ func NewCDEventLoader(target, clusterID, defaultNamespace string, events []testk
 		client:           c,
 		clusterID:        clusterID,
 		defaultNamespace: defaultNamespace,
+		dashboardURI:     dashboardURI,
 	}, nil
 }
 
@@ -33,6 +34,7 @@ type CDEventLoader struct {
 	client           cloudevents.Client
 	clusterID        string
 	defaultNamespace string
+	dashboardURI     string
 }
 
 func (r *CDEventLoader) Kind() string {
@@ -41,5 +43,5 @@ func (r *CDEventLoader) Kind() string {
 
 // Load returns single listener for cd eventt
 func (r *CDEventLoader) Load() (listeners common.Listeners, err error) {
-	return common.Listeners{NewCDEventListener("cdevent", "", r.clusterID, r.defaultNamespace, r.events, r.client)}, nil
+	return common.Listeners{NewCDEventListener("cdevent", "", r.clusterID, r.defaultNamespace, r.dashboardURI, r.events, r.client)}, nil
 }

pkg/event/kind/cdevent/loader_test.go

@@ -9,7 +9,7 @@ import (
 func TestWebhookLoader(t *testing.T) {
 	t.Parallel()
 
-	cdeventLoader, err := NewCDEventLoader("target", "", "", nil)
+	cdeventLoader, err := NewCDEventLoader("target", "", "", "", nil)
 	assert.NoError(t, err)
 
 	listeners, err := cdeventLoader.Load()

pkg/executor/common.go

@@ -96,6 +96,10 @@ var RunnerEnvVars = []corev1.EnvVar{
 		Name:  "RUNNER_CLOUD_API_URL",
 		Value: os.Getenv("TESTKUBE_CLOUD_URL"),
 	},
+	{
+		Name:  "RUNNER_DASHBOARD_URI",
+		Value: os.Getenv("TESTKUBE_DASHBOARD_URI"),
+	},
 }
 
 func getOr(key, defaultVal string) string {

pkg/executor/containerexecutor/containerexecutor_test.go

@@ -121,6 +121,7 @@ func TestNewExecutorJobSpecWithArgs(t *testing.T) {
 		{Name: "RUNNER_SCRAPPERENABLED", Value: "false"},
 		{Name: "RUNNER_DATADIR", Value: "/data"},
 		{Name: "RUNNER_CDEVENTS_TARGET", Value: ""},
+		{Name: "RUNNER_DASHBOARD_URI", Value: ""},
 		{Name: "RUNNER_CLOUD_MODE", Value: "false"},
 		{Name: "RUNNER_CLOUD_API_KEY", Value: ""},
 		{Name: "RUNNER_CLOUD_API_URL", Value: ""},

pkg/executor/output/parser_test.go

@@ -126,6 +126,7 @@ func TestParseRunnerOutput(t *testing.T) {
 {"type":"line","content":"RUNNER_GITTOKEN=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
 {"type":"line","content":"RUNNER_DATADIR=\"/data\"","time":"2023-01-17T15:29:17.921803138Z"}
 {"type":"line","content":"RUNNER_CDEVENTS_TARGET=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
+{"type":"line","content":"RUNNER_DASHBOARD_URI=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
 {"type":"line","content":"RUNNER_CLUSTERID=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
 {"type":"error","content":"❌ can't find branch or commit in params, repo:\u0026{Type_:git-file Uri:https://github.com/kubeshop/testkube.git Branch: Commit: Path:test/cypress/executor-smoke/cypress-11 Username: Token: UsernameSecret:\u003cnil\u003e TokenSecret:\u003cnil\u003e WorkingDir:}","time":"2023-01-17T15:29:17.921940304Z"}
 {"type":"error","content":"can't find branch or commit in params, repo:\u0026{Type_:git-file Uri:https://github.com/kubeshop/testkube.git Branch: Commit: Path:test/cypress/executor-smoke/cypress-11 Username: Token: UsernameSecret:\u003cnil\u003e TokenSecret:\u003cnil\u003e WorkingDir:}","time":"2023-01-17T15:29:17.921946638Z"}
@@ -146,6 +147,7 @@ RUNNER_GITUSERNAME=""
 RUNNER_GITTOKEN=""
 RUNNER_DATADIR="/data"
 RUNNER_CDEVENTS_TARGET=""
+RUNNER_DASHBOARD_URI=""
 RUNNER_CLUSTERID=""
 ❌ can't find branch or commit in params, repo:&{Type_:git-file Uri:https://github.com/kubeshop/testkube.git Branch: Commit: Path:test/cypress/executor-smoke/cypress-11 Username: Token: UsernameSecret:<nil> TokenSecret:<nil> WorkingDir:}
 can't find branch or commit in params, repo:&{Type_:git-file Uri:https://github.com/kubeshop/testkube.git Branch: Commit: Path:test/cypress/executor-smoke/cypress-11 Username: Token: UsernameSecret:<nil> TokenSecret:<nil> WorkingDir:}
@@ -196,6 +198,7 @@ could not start process: fork/exec ./zap-api-scan.py: no such file or directory
 {"type":"line","content":"RUNNER_GITTOKEN=\"\"","time":"2023-01-19T15:22:25.867986013Z"}
 {"type":"line","content":"RUNNER_DATADIR=\"/data\"","time":"2023-01-19T15:22:25.867987596Z"}
 {"type":"line","content":"RUNNER_CDEVENTS_TARGET=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
+{"type":"line","content":"RUNNER_DASHBOARD_URI=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
 {"type":"line","content":"RUNNER_CLUSTERID=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
 {"type":"event","content":"running test [63c960287104b0fa0b7a45ef]","time":"2023-01-19T15:22:25.868132888Z"}
 {"type":"line","content":"🚚 Preparing for test run","time":"2023-01-19T15:22:25.868161346Z"}
@@ -216,6 +219,7 @@ RUNNER_GITUSERNAME=""
 RUNNER_GITTOKEN=""
 RUNNER_DATADIR="/data"
 RUNNER_CDEVENTS_TARGET=""
+RUNNER_DASHBOARD_URI=""
 RUNNER_CLUSTERID=""
 running test [63c960287104b0fa0b7a45ef]
 🚚 Preparing for test run
@@ -249,6 +253,7 @@ can't find branch or commit in params, repo:&{Type_:git-file Uri:https://github.
 {"type":"line","content":"RUNNER_GITTOKEN=\"\"","time":"2023-01-19T15:22:25.867986013Z"}
 {"type":"line","content":"RUNNER_DATADIR=\"/data\"","time":"2023-01-19T15:22:25.867987596Z"}
 {"type":"line","content":"RUNNER_CDEVENTS_TARGET=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
+{"type":"line","content":"RUNNER_DASHBOARD_URI=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
 {"type":"line","content":"RUNNER_CLUSTERID=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
 {"type":"event","content":"running test [63c960287104b0fa0b7a45ef]","time":"2023-01-19T15:22:25.868132888Z"}
 {"type":"line","content":"🚚 Preparing for test run","time":"2023-01-19T15:22:25.868161346Z"}
@@ -275,6 +280,7 @@ RUNNER_GITUSERNAME=""
 RUNNER_GITTOKEN=""
 RUNNER_DATADIR="/data"
 RUNNER_CDEVENTS_TARGET=""
+RUNNER_DASHBOARD_URI=""
 RUNNER_CLUSTERID=""
 running test [63c960287104b0fa0b7a45ef]
 🚚 Preparing for test run
@@ -309,6 +315,7 @@ can't find branch or commit in params, repo:&{Type_:git-file Uri:https://github.
 {"type":"line","content":"RUNNER_GITTOKEN=\"\"","time":"2023-01-20T12:44:15.718986174Z"}
 {"type":"line","content":"RUNNER_DATADIR=\"/data\"","time":"2023-01-20T12:44:15.718989049Z"}
 {"type":"line","content":"RUNNER_CDEVENTS_TARGET=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
+{"type":"line","content":"RUNNER_DASHBOARD_URI=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
 {"type":"line","content":"RUNNER_CLUSTERID=\"\"","time":"2023-01-17T15:29:17.921801596Z"}
 {"type":"event","content":"running test [63ca8c8988564860327a16b5]","time":"2023-01-20T12:44:15.719276383Z"}
 {"type":"line","content":"🚚 Preparing for test run","time":"2023-01-20T12:44:15.719285633Z"}
@@ -329,6 +336,7 @@ RUNNER_GITUSERNAME=""
 RUNNER_GITTOKEN=""
 RUNNER_DATADIR="/data"
 RUNNER_CDEVENTS_TARGET=""
+RUNNER_DASHBOARD_URI=""
 RUNNER_CLUSTERID=""
 running test [63ca8c8988564860327a16b5]
 🚚 Preparing for test run

pkg/executor/scraper/factory/factory.go

@@ -85,7 +85,7 @@ func GetScraper(ctx context.Context, params envs.Params, extractorType Extractor
 		}
 	}
 
-	return scraper.NewExtractLoadScraper(extractor, loader, cdeventsClient, params.ClusterID), nil
+	return scraper.NewExtractLoadScraper(extractor, loader, cdeventsClient, params.ClusterID, params.DashboardURI), nil
 }
 
 func getCloudLoader(ctx context.Context, params envs.Params) (uploader *cloudscraper.CloudUploader, err error) {

pkg/executor/scraper/minio_scraper_integration_test.go

@@ -71,7 +71,7 @@ func TestMinIOScraper_Archive_Integration(t *testing.T) {
 	client, err := cloudevents.NewClientHTTP(cloudevents.WithTarget(svr.URL))
 	assert.NoError(t, err)
 
-	s := scraper.NewExtractLoadScraper(extractor, loader, client, "")
+	s := scraper.NewExtractLoadScraper(extractor, loader, client, "", "")
 	err = s.Scrape(context.Background(), []string{tempDir}, execution)
 	if err != nil {
 		t.Fatalf("error scraping: %v", err)
@@ -139,7 +139,7 @@ func TestMinIOScraper_Recursive_Integration(t *testing.T) {
 	client, err := cloudevents.NewClientHTTP(cloudevents.WithTarget(svr.URL))
 	assert.NoError(t, err)
 
-	s := scraper.NewExtractLoadScraper(extractor, loader, client, "")
+	s := scraper.NewExtractLoadScraper(extractor, loader, client, "", "")
 	err = s.Scrape(context.Background(), []string{tempDir}, execution)
 	if err != nil {
 		t.Fatalf("error scraping: %v", err)

pkg/executor/scraper/scraper.go

@@ -27,14 +27,17 @@ type ExtractLoadScraper struct {
 	loader         Uploader
 	cdeventsClient cloudevents.Client
 	clusterID      string
+	dashboardURI   string
 }
 
-func NewExtractLoadScraper(extractor Extractor, loader Uploader, cdeventsClient cloudevents.Client, clusterID string) *ExtractLoadScraper {
+func NewExtractLoadScraper(extractor Extractor, loader Uploader, cdeventsClient cloudevents.Client,
+	clusterID, dashboardURI string) *ExtractLoadScraper {
 	return &ExtractLoadScraper{
 		extractor:      extractor,
 		loader:         loader,
 		cdeventsClient: cdeventsClient,
 		clusterID:      clusterID,
+		dashboardURI:   dashboardURI,
 	}
 }
 
@@ -66,7 +69,7 @@ func (s *ExtractLoadScraper) sendCDEvent(execution testkube.Execution, path stri
 		log.DefaultLogger.Warnf("failed to detect mime type %w", err)
 	}
 
-	ev, err := cde.MapTestkubeArtifactToCDEvent(&execution, s.clusterID, mtype.String())
+	ev, err := cde.MapTestkubeArtifactToCDEvent(&execution, s.clusterID, path, mtype.String(), s.dashboardURI)
 	if err != nil {
 		return err
 	}