From 76b0439ddf95656d52db7b7c36d786dba55218c4 Mon Sep 17 00:00:00 2001 From: Ro Santalla Date: Tue, 18 Jun 2024 12:34:39 +0200 Subject: [PATCH] k6runner: prevent clearing ip denylist when calling WithLogger --- internal/k6runner/k6runner.go | 7 ++----- internal/k6runner/k6runner_test.go | 4 ++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/k6runner/k6runner.go b/internal/k6runner/k6runner.go index 6a4bd686..0f743107 100644 --- 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 index 0bed670a..2db3fb3e 100644 --- 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)