fix(scaletest/dashboard): fix early exit due to validate (#10212)

johnstcn · web-flow · commit e829cbf2dba1 · 2023-10-11T11:51:06.000Z
diff --git a/cli/exp_scaletest.go b/cli/exp_scaletest.go
@@ -1166,6 +1166,7 @@ func (r *RootCmd) scaletestDashboard() *clibase.Cmd {
 				//nolint:gocritic
 				logger.Info(ctx, "runner config", slog.F("interval", interval), slog.F("jitter", jitter), slog.F("headless", headless), slog.F("trace", tracingEnabled))
 				if err := config.Validate(); err != nil {
+					logger.Fatal(ctx, "validate config", slog.Error(err))
 					return err
 				}
 				var runner harness.Runnable = dashboard.NewRunner(userClient, metrics, config)
diff --git a/scaletest/dashboard/config.go b/scaletest/dashboard/config.go
@@ -39,13 +39,5 @@ func (c Config) Validate() error {
 		return xerrors.Errorf("validate jitter: must be less than interval")
 	}
 
-	if c.ActionFunc == nil {
-		return xerrors.Errorf("validate action func: must not be nil")
-	}
-
-	if c.RandIntn == nil {
-		return xerrors.Errorf("validate rand intn: must not be nil")
-	}
-
 	return nil
 }
diff --git a/scaletest/dashboard/run.go b/scaletest/dashboard/run.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"io"
+	"math/rand"
 	"time"
 
 	"golang.org/x/xerrors"
@@ -35,6 +36,9 @@ func NewRunner(client *codersdk.Client, metrics Metrics, cfg Config) *Runner {
 	if cfg.Screenshot == nil {
 		cfg.Screenshot = Screenshot
 	}
+	if cfg.RandIntn == nil {
+		cfg.RandIntn = rand.Intn
+	}
 	return &Runner{
 		client:  client,
 		cfg:     cfg,

Original file line number	Diff line number	Diff line change
`@@ -1166,6 +1166,7 @@ func (r RootCmd) scaletestDashboard() clibase.Cmd {`
`1166`	`1166`	`//nolint:gocritic`
`1167`	`1167`	`logger.Info(ctx, "runner config", slog.F("interval", interval), slog.F("jitter", jitter), slog.F("headless", headless), slog.F("trace", tracingEnabled))`
`1168`	`1168`	`if err := config.Validate(); err != nil {`
	`1169`	`+ logger.Fatal(ctx, "validate config", slog.Error(err))`
`1169`	`1170`	`return err`
`1170`	`1171`	`}`
`1171`	`1172`	`var runner harness.Runnable = dashboard.NewRunner(userClient, metrics, config)`
Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,5 @@ func (c Config) Validate() error {`
`39`	`39`	`return xerrors.Errorf("validate jitter: must be less than interval")`
`40`	`40`	`}`
`41`	`41`
`42`		`- if c.ActionFunc == nil {`
`43`		`- return xerrors.Errorf("validate action func: must not be nil")`
`44`		`- }`
`45`		`-`
`46`		`- if c.RandIntn == nil {`
`47`		`- return xerrors.Errorf("validate rand intn: must not be nil")`
`48`		`- }`
`49`		`-`
`50`	`42`	`return nil`
`51`	`43`	`}`