Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: use http client without timeout like we do in connectRPCVersion #17680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2025
Merged

fix: use http client without timeout like we do in connectRPCVersion #17680

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 24 additions & 12 deletions codersdk/agentsdk/agentsdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,18 +710,30 @@ func PrebuildClaimedChannel(id uuid.UUID) string {
// - ping: ignored, keepalive
// - prebuild claimed: a prebuilt workspace is claimed, so the agent must reinitialize.
func (c *Client) WaitForReinit(ctx context.Context) (*ReinitializationEvent, error) {
// TODO: allow configuring httpclient
c.SDK.HTTPClient.Timeout = time.Hour * 24

// TODO (sasswart): tried the following to fix the above, it won't work. The shorter timeout wins.
// I also considered cloning c.SDK.HTTPClient and setting the timeout on the cloned client.
// That won't work because we can't pass the cloned HTTPClient into s.SDK.Request.
// Looks like we're going to need a separate client to be able to have a longer timeout.
//
// timeoutCtx, cancelTimeoutCtx := context.WithTimeout(ctx, 24*time.Hour)
// defer cancelTimeoutCtx()

res, err := c.SDK.Request(ctx, http.MethodGet, "/api/v2/workspaceagents/me/reinit", nil)
rpcURL, err := c.SDK.URL.Parse("/api/v2/workspaceagents/me/reinit")
if err != nil {
return nil, xerrors.Errorf("parse url: %w", err)
}

jar, err := cookiejar.New(nil)
if err != nil {
return nil, xerrors.Errorf("create cookie jar: %w", err)
}
jar.SetCookies(rpcURL, []*http.Cookie{{
Name: codersdk.SessionTokenCookie,
Value: c.SDK.SessionToken(),
}})
httpClient := &http.Client{
Jar: jar,
Transport: c.SDK.HTTPClient.Transport,
}

req, err := http.NewRequestWithContext(ctx, http.MethodGet, rpcURL.String(), nil)
if err != nil {
return nil, xerrors.Errorf("build request: %w", err)
}

res, err := httpClient.Do(req)
if err != nil {
return nil, xerrors.Errorf("execute request: %w", err)
}
Expand Down
Loading