Commit4b8fa78

committed

chore: refactor cli and coderd to use ClientBuilder

1 parent85affd4 commit4b8fa78Copy full SHA for 4b8fa78

File tree

+16

-12

lines changed

+16

-12

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1014,9 +1014,10 @@ func (r RootCmd) scaletestWorkspaceTraffic() serpent.Command {`
`1014`	`1014`	`returnxerrors.Errorf("parse workspace proxy URL: %w",err)`
`1015`	`1015`	`}`
`1016`	`1016`
`1017`		`-webClient=codersdk.New(u)`
`1018`		`-webClient.HTTPClient=client.HTTPClient`
`1019`		`-webClient.SetSessionToken(client.SessionToken())`
	`1017`	`+webClient=codersdk.NewClientBuilder(u).`
	`1018`	`+HTTPClient(client.HTTPClient).`
	`1019`	`+SessionToken(client.SessionToken()).`
	`1020`	`+Build()`
`1020`	`1021`
`1021`	`1022`	`appConfig,err=createWorkspaceAppConfig(webClient,appHost.Host,app,ws,agent)`
`1022`	`1023`	`iferr!=nil {`
`@@ -1250,8 +1251,9 @@ func (r RootCmd) scaletestDashboard() serpent.Command {`
`1250`	`1251`	`returnxerrors.Errorf("create token for user: %w",err)`
`1251`	`1252`	`}`
`1252`	`1253`
`1253`		`-userClient:=codersdk.New(client.URL)`
`1254`		`-userClient.SetSessionToken(userTokResp.Key)`
	`1254`	`+userClient:=codersdk.NewClientBuilder(client.URL).`
	`1255`	`+SessionToken(userTokResp.Key).`
	`1256`	`+Build()`
`1255`	`1257`
`1256`	`1258`	`config:= dashboard.Config{`
`1257`	`1259`	`Interval:interval,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ func TestTaskCreate(t *testing.T) {`
`308`	`308`	`var (`
`309`	`309`	`ctx=testutil.Context(t,testutil.WaitShort)`
`310`	`310`	`srv=httptest.NewServer(tt.handler(t,ctx))`
`311`		`-client=codersdk.New(testutil.MustURL(t,srv.URL))`
	`311`	`+client=codersdk.NewClientBuilder(testutil.MustURL(t,srv.URL)).Build()`
`312`	`312`	`args= []string{"exp","task","create"}`
`313`	`313`	`sb strings.Builder`
`314`	`314`	`errerror`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func TestExpTaskDelete(t *testing.T) {`
`184`	`184`	`srv:=httptest.NewServer(tc.buildHandler(&counters))`
`185`	`185`	`t.Cleanup(srv.Close)`
`186`	`186`
`187`		`-client:=codersdk.New(testutil.MustURL(t,srv.URL))`
	`187`	`+client:=codersdk.NewClientBuilder(testutil.MustURL(t,srv.URL)).Build()`
`188`	`188`
`189`	`189`	`args:=append([]string{"exp","task","delete"},tc.args...)`
`190`	`190`	`inv,root:=clitest.New(t,args...)`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ func NewWithAPI(t testing.TB, options Options) (codersdk.Client, io.Closer, *c`
`632`	`632`	`ifoptions.IncludeProvisionerDaemon {`
`633`	`633`	`provisionerCloser=NewTaggedProvisionerDaemon(t,coderAPI,defaultTestDaemonName,options.ProvisionerDaemonTags,coderd.MemoryProvisionerWithVersionOverride(options.ProvisionerDaemonVersion))`
`634`	`634`	`}`
`635`		`-client:=codersdk.New(serverURL)`
	`635`	`+client:=codersdk.NewClientBuilder(serverURL).Build()`
`636`	`636`	`t.Cleanup(func() {`
`637`	`637`	`cancelFunc()`
`638`	`638`	`_=provisionerCloser.Close()`
`@@ -845,8 +845,9 @@ 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.NewClientBuilder(client.URL).`
	`849`	`+SessionToken(sessionToken).`
	`850`	`+Build()`
`850`	`851`	`t.Cleanup(func() {`
`851`	`852`	`other.HTTPClient.CloseIdleConnections()`
`852`	`853`	`})`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,10 @@ 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))`
	`36`	`+authenticatedClient:=codersdk.NewClientBuilder(api.AccessURL).`
	`37`	`+SessionToken(httpmw.APITokenFromRequest(r)).`
	`38`	`+Build()`
`38`	`39`
`39`	`40`	`toolset:=MCPToolset(r.URL.Query().Get("toolset"))`
`40`	`41`	`// Default to standard toolset if no toolset is specified.`

Comments

(0)