Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/plugins/backends/bedrock/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const DefaultLoadConfigTimeout = 30 * time.Second
// 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() {}
Expand Down
9 changes: 9 additions & 0 deletions internal/plugins/backends/bedrock/plugin_deadline_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ func TestEnsureLoadConfigDeadline_todoYieldsDeadline(t *testing.T) {
}
}

func TestEnsureLoadConfigDeadline_nilYieldsDeadline(t *testing.T) {
t.Parallel()
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")
}
}

func TestEnsureLoadConfigDeadline_backgroundYieldsDeadline(t *testing.T) {
t.Parallel()
c, cancel := ensureLoadConfigDeadline(context.Background())
Expand Down