From 3ad27b547f5992952728234ee95da58186ac01d3 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Fri, 7 Oct 2022 21:06:20 +0300 Subject: [PATCH] chore: Rename context in `cli/agent` (#4422) Rename context from common `ctx` to `retryCtx` to avoid later re-use. Also kind of a bug-fix since client post was using `cmd.Context()`. --- cli/agent.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/agent.go b/cli/agent.go index ff127325be..de1bd87352 100644 --- a/cli/agent.go +++ b/cli/agent.go @@ -168,15 +168,15 @@ func workspaceAgent() *cobra.Command { } } - ctx, cancelFunc := context.WithTimeout(cmd.Context(), time.Hour) - defer cancelFunc() - for retry.New(100*time.Millisecond, 5*time.Second).Wait(ctx) { - err := client.PostWorkspaceAgentVersion(cmd.Context(), version) + retryCtx, cancelRetry := context.WithTimeout(cmd.Context(), time.Hour) + defer cancelRetry() + for retrier := retry.New(100*time.Millisecond, 5*time.Second); retrier.Wait(retryCtx); { + err := client.PostWorkspaceAgentVersion(retryCtx, version) if err != nil { - logger.Warn(cmd.Context(), "post agent version: %w", slog.Error(err), slog.F("version", version)) + logger.Warn(retryCtx, "post agent version: %w", slog.Error(err), slog.F("version", version)) continue } - logger.Info(ctx, "updated agent version", slog.F("version", version)) + logger.Info(retryCtx, "updated agent version", slog.F("version", version)) break }