chore: Rename context in cli/agent (#4422)

mafredri · web-flow · commit 3ad27b547f59 · 2022-10-07T18:06:20.000Z
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()`.
diff --git 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
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -168,15 +168,15 @@ func workspaceAgent() *cobra.Command {`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
`171`		`- ctx, cancelFunc := context.WithTimeout(cmd.Context(), time.Hour)`
`172`		`- defer cancelFunc()`
`173`		`- for retry.New(100time.Millisecond, 5time.Second).Wait(ctx) {`
`174`		`- err := client.PostWorkspaceAgentVersion(cmd.Context(), version)`
	`171`	`+ retryCtx, cancelRetry := context.WithTimeout(cmd.Context(), time.Hour)`
	`172`	`+ defer cancelRetry()`
	`173`	`+ for retrier := retry.New(100time.Millisecond, 5time.Second); retrier.Wait(retryCtx); {`
	`174`	`+ err := client.PostWorkspaceAgentVersion(retryCtx, version)`
`175`	`175`	`if err != nil {`
`176`		`- logger.Warn(cmd.Context(), "post agent version: %w", slog.Error(err), slog.F("version", version))`
	`176`	`+ logger.Warn(retryCtx, "post agent version: %w", slog.Error(err), slog.F("version", version))`
`177`	`177`	`continue`
`178`	`178`	`}`
`179`		`- logger.Info(ctx, "updated agent version", slog.F("version", version))`
	`179`	`+ logger.Info(retryCtx, "updated agent version", slog.F("version", version))`
`180`	`180`	`break`
`181`	`181`	`}`
`182`	`182`