k6runner: prevent clearing ip denylist when calling WithLogger

grafana · Jun 19, 2024 · 76b0439 · 76b0439
1 parent bde75eb
commit 76b0439
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/internal/k6runner/k6runner.go b/internal/k6runner/k6runner.go
@@ -393,11 +393,8 @@ type LocalRunner struct {
 }
 
 func (r LocalRunner) WithLogger(logger *zerolog.Logger) Runner {
-	return LocalRunner{
-		k6path: r.k6path,
-		fs:     r.fs,
-		logger: logger,
-	}
+	r.logger = logger
+	return r
 }
 
 func (r LocalRunner) Run(ctx context.Context, script Script) (*RunResponse, error) {

diff --git a/internal/k6runner/k6runner_test.go b/internal/k6runner/k6runner_test.go
@@ -30,6 +30,10 @@ func TestNew(t *testing.T) {
 	r2 := New(RunnerOpts{Uri: "/usr/bin/k6", BlacklistedIP: "192.168.4.0/24"})
 	require.IsType(t, LocalRunner{}, r2)
 	require.Equal(t, "192.168.4.0/24", r2.(LocalRunner).blacklistedIP)
+	// Ensure WithLogger preserves config.
+	zl := zerolog.New(io.Discard)
+	r2 = r2.WithLogger(&zl)
+	require.Equal(t, "192.168.4.0/24", r2.(LocalRunner).blacklistedIP)
 
 	r3 := New(RunnerOpts{Uri: "http://localhost:6565"})
 	require.IsType(t, &HttpRunner{}, r3)