Skip to content

Commit a30c307

Browse files
authored
chore: refactor cli and coderd to use ClientOptions (coder#19763)
Refactors CLI and coderd to use the ClientBuilder pattern rather than directly instantiating the Client.
1 parent e7d648f commit a30c307

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

cli/exp_scaletest.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,9 +1004,10 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *serpent.Command {
10041004
return xerrors.Errorf("parse workspace proxy URL: %w", err)
10051005
}
10061006

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+
)
10101011

10111012
appConfig, err = createWorkspaceAppConfig(webClient, appHost.Host, app, ws, agent)
10121013
if err != nil {
@@ -1240,8 +1241,9 @@ func (r *RootCmd) scaletestDashboard() *serpent.Command {
12401241
return xerrors.Errorf("create token for user: %w", err)
12411242
}
12421243

1243-
userClient := codersdk.New(client.URL)
1244-
userClient.SetSessionToken(userTokResp.Key)
1244+
userClient := codersdk.New(client.URL,
1245+
codersdk.WithSessionToken(userTokResp.Key),
1246+
)
12451247

12461248
config := dashboard.Config{
12471249
Interval: interval,

coderd/coderdtest/coderdtest.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -845,8 +845,7 @@ func createAnotherUserRetry(t testing.TB, client *codersdk.Client, organizationI
845845
require.NoError(t, err)
846846
}
847847

848-
other := codersdk.New(client.URL)
849-
other.SetSessionToken(sessionToken)
848+
other := codersdk.New(client.URL, codersdk.WithSessionToken(sessionToken))
850849
t.Cleanup(func() {
851850
other.HTTPClient.CloseIdleConnections()
852851
})

coderd/insights_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,8 +1467,7 @@ func TestUserActivityInsights_Golden(t *testing.T) {
14671467
TokenName: "no-password-user-token",
14681468
})
14691469
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))
14721471

14731472
coderUser, err := userClient.User(context.Background(), user.id.String())
14741473
require.NoError(t, err)

coderd/mcp_http.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ func (api *API) mcpHTTPHandler() http.Handler {
3232
})
3333
return
3434
}
35-
authenticatedClient := codersdk.New(api.AccessURL)
3635
// 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)))
3938
toolset := MCPToolset(r.URL.Query().Get("toolset"))
4039
// Default to standard toolset if no toolset is specified.
4140
if toolset == "" {

coderd/workspaceapps/apptest/setup.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ type Details struct {
137137
//
138138
// The client is authenticated as the first user by default.
139139
func (d *Details) AppClient(t *testing.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()))
142141
forceURLTransport(t, client)
143142
client.HTTPClient.CheckRedirect = func(_ *http.Request, _ []*http.Request) error {
144143
return http.ErrUseLastResponse

0 commit comments

Comments
 (0)