From 518f89e32f50dae98d325a7ebe8e06c1ff5cd7eb Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 14:44:37 +0000 Subject: [PATCH 1/2] refactor(bedrock): replace context.TODO with context.Background Replaced context.TODO() with context.Background() in ensureLoadConfigDeadline for production fallback handling when a nil context is passed. Added tests to verify nil context handling. Co-authored-by: matdev83 <211248003+matdev83@users.noreply.github.com> --- internal/plugins/backends/bedrock/plugin.go | 2 +- .../plugins/backends/bedrock/plugin_deadline_test.go | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/internal/plugins/backends/bedrock/plugin.go b/internal/plugins/backends/bedrock/plugin.go index 79a70bfa..39e07c3b 100644 --- a/internal/plugins/backends/bedrock/plugin.go +++ b/internal/plugins/backends/bedrock/plugin.go @@ -40,7 +40,7 @@ func New(cfg Config) execbackend.Backend { // indefinitely. The caller must invoke the returned CancelFunc. func ensureLoadConfigDeadline(ctx context.Context) (context.Context, context.CancelFunc) { if ctx == nil { - return context.WithTimeout(context.TODO(), DefaultLoadConfigTimeout) + return context.WithTimeout(context.Background(), DefaultLoadConfigTimeout) } if _, ok := ctx.Deadline(); ok { return ctx, func() {} diff --git a/internal/plugins/backends/bedrock/plugin_deadline_test.go b/internal/plugins/backends/bedrock/plugin_deadline_test.go index 358c8d6a..f8ef4f61 100644 --- a/internal/plugins/backends/bedrock/plugin_deadline_test.go +++ b/internal/plugins/backends/bedrock/plugin_deadline_test.go @@ -15,6 +15,15 @@ func TestEnsureLoadConfigDeadline_todoYieldsDeadline(t *testing.T) { } } +func TestEnsureLoadConfigDeadline_nilYieldsDeadline(t *testing.T) { + t.Parallel() + c, cancel := ensureLoadConfigDeadline(nil) + defer cancel() + if _, ok := c.Deadline(); !ok { + t.Fatal("expected child deadline when parent is nil") + } +} + func TestEnsureLoadConfigDeadline_backgroundYieldsDeadline(t *testing.T) { t.Parallel() c, cancel := ensureLoadConfigDeadline(context.Background()) From a962a2f0a4dcba499f564b983b1660451fffc61c Mon Sep 17 00:00:00 2001 From: Mateusz Date: Wed, 1 Jul 2026 18:50:32 +0200 Subject: [PATCH 2/2] fix(bedrock): suppress SA1012 on nil-context deadline test ensureLoadConfigDeadline explicitly handles a nil context (coercing it to context.Background()+WithTimeout), so TestEnsureLoadConfigDeadline_nilYieldsDeadline must pass nil to exercise that branch. staticcheck SA1012 flags passing a nil context; suppress it with //nolint:staticcheck, matching the repo convention for deliberate nil-context contract tests (e.g. extensiontrace, continuity stores, executor). Co-authored-by: Cursor --- internal/plugins/backends/bedrock/plugin_deadline_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/plugins/backends/bedrock/plugin_deadline_test.go b/internal/plugins/backends/bedrock/plugin_deadline_test.go index f8ef4f61..b3803b03 100644 --- a/internal/plugins/backends/bedrock/plugin_deadline_test.go +++ b/internal/plugins/backends/bedrock/plugin_deadline_test.go @@ -17,7 +17,7 @@ func TestEnsureLoadConfigDeadline_todoYieldsDeadline(t *testing.T) { func TestEnsureLoadConfigDeadline_nilYieldsDeadline(t *testing.T) { t.Parallel() - c, cancel := ensureLoadConfigDeadline(nil) + c, cancel := ensureLoadConfigDeadline(nil) //nolint:staticcheck // nil ctx: ensureLoadConfigDeadline must coerce to a usable deadline context defer cancel() if _, ok := c.Deadline(); !ok { t.Fatal("expected child deadline when parent is nil")