From f8949dde3569965164615e2300a403e4be32da11 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Thu, 30 Jan 2020 12:59:04 -0600 Subject: [PATCH] client: PR cleanup - shadow context variable --- client/allocrunner/taskrunner/sids_hook.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/allocrunner/taskrunner/sids_hook.go b/client/allocrunner/taskrunner/sids_hook.go index 9b074a226..bf92d25ac 100644 --- a/client/allocrunner/taskrunner/sids_hook.go +++ b/client/allocrunner/taskrunner/sids_hook.go @@ -181,13 +181,13 @@ type siDerivationResult struct { // derive an SI token until a token is successfully created, or ctx is signaled // done. func (h *sidsHook) deriveSIToken(ctx context.Context) (string, error) { - ctx2, cancel := context.WithTimeout(ctx, h.derivationTimeout) + ctx, cancel := context.WithTimeout(ctx, h.derivationTimeout) defer cancel() resultCh := make(chan siDerivationResult) // keep trying to get the token in the background - go h.tryDerive(ctx2, resultCh) + go h.tryDerive(ctx, resultCh) // wait until we get a token, or we get a signal to quit for { @@ -198,8 +198,8 @@ func (h *sidsHook) deriveSIToken(ctx context.Context) (string, error) { return "", result.err } return result.token, nil - case <-ctx2.Done(): - return "", ctx2.Err() + case <-ctx.Done(): + return "", ctx.Err() } } }