Commit434f5d5

committed

chore: refactor cli and coderd to use ClientBuilder

1 parent7c7f61b commit434f5d5Copy full SHA for 434f5d5

File tree

+12

-14

lines changed

+12

-14

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1004,9 +1004,10 @@ func (r RootCmd) scaletestWorkspaceTraffic() serpent.Command {`
`1004`	`1004`	`returnxerrors.Errorf("parse workspace proxy URL: %w",err)`
`1005`	`1005`	`}`
`1006`	`1006`
`1007`		`-webClient=codersdk.New(u)`
`1008`		`-webClient.HTTPClient=client.HTTPClient`
`1009`		`-webClient.SetSessionToken(client.SessionToken())`
	`1007`	`+webClient=codersdk.New(u,`
	`1008`	`+codersdk.WithHTTPClient(client.HTTPClient),`
	`1009`	`+codersdk.WithSessionToken(client.SessionToken()),`
	`1010`	`+)`
`1010`	`1011`
`1011`	`1012`	`appConfig,err=createWorkspaceAppConfig(webClient,appHost.Host,app,ws,agent)`
`1012`	`1013`	`iferr!=nil {`
`@@ -1240,8 +1241,9 @@ func (r RootCmd) scaletestDashboard() serpent.Command {`
`1240`	`1241`	`returnxerrors.Errorf("create token for user: %w",err)`
`1241`	`1242`	`}`
`1242`	`1243`
`1243`		`-userClient:=codersdk.New(client.URL)`
`1244`		`-userClient.SetSessionToken(userTokResp.Key)`
	`1244`	`+userClient:=codersdk.New(client.URL,`
	`1245`	`+codersdk.WithSessionToken(userTokResp.Key),`
	`1246`	`+)`
`1245`	`1247`
`1246`	`1248`	`config:= dashboard.Config{`
`1247`	`1249`	`Interval:interval,`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -845,8 +845,7 @@ func createAnotherUserRetry(t testing.TB, client *codersdk.Client, organizationI`
`845`	`845`	`require.NoError(t,err)`
`846`	`846`	`}`
`847`	`847`
`848`		`-other:=codersdk.New(client.URL)`
`849`		`-other.SetSessionToken(sessionToken)`
	`848`	`+other:=codersdk.New(client.URL,codersdk.WithSessionToken(sessionToken))`
`850`	`849`	`t.Cleanup(func() {`
`851`	`850`	`other.HTTPClient.CloseIdleConnections()`
`852`	`851`	`})`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1467,8 +1467,7 @@ func TestUserActivityInsights_Golden(t *testing.T) {`
`1467`	`1467`	`TokenName:"no-password-user-token",`
`1468`	`1468`	`})`
`1469`	`1469`	`require.NoError(t,err)`
`1470`		`-userClient:=codersdk.New(client.URL)`
`1471`		`-userClient.SetSessionToken(token.Key)`
	`1470`	`+userClient:=codersdk.New(client.URL,codersdk.WithSessionToken(token.Key))`
`1472`	`1471`
`1473`	`1472`	`coderUser,err:=userClient.User(context.Background(),user.id.String())`
`1474`	`1473`	`require.NoError(t,err)`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,9 @@ func (api *API) mcpHTTPHandler() http.Handler {`
`32`	`32`	`})`
`33`	`33`	`return`
`34`	`34`	`}`
`35`		`-authenticatedClient:=codersdk.New(api.AccessURL)`
`36`	`35`	`// Extract the original session token from the request`
`37`		`-authenticatedClient.SetSessionToken(httpmw.APITokenFromRequest(r))`
`38`		`-`
	`36`	`+authenticatedClient:=codersdk.New(api.AccessURL,`
	`37`	`+codersdk.WithSessionToken(httpmw.APITokenFromRequest(r)))`
`39`	`38`	`toolset:=MCPToolset(r.URL.Query().Get("toolset"))`
`40`	`39`	`// Default to standard toolset if no toolset is specified.`
`41`	`40`	`iftoolset=="" {`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,7 @@ type Details struct {`
`137`	`137`	`//`
`138`	`138`	`// The client is authenticated as the first user by default.`
`139`	`139`	`func (dDetails)AppClient(ttesting.T)*codersdk.Client {`
`140`		`-client:=codersdk.New(d.PathAppBaseURL)`
`141`		`-client.SetSessionToken(d.SDKClient.SessionToken())`
	`140`	`+client:=codersdk.New(d.PathAppBaseURL,codersdk.WithSessionToken(d.SDKClient.SessionToken()))`
`142`	`141`	`forceURLTransport(t,client)`
`143`	`142`	`client.HTTPClient.CheckRedirect=func(_http.Request,_ []http.Request)error {`
`144`	`143`	`returnhttp.ErrUseLastResponse`

Comments

(0)