Skip to content

Commit 9f61acb

Browse files
coadlercoadler
committed
remove all workspace prefixes from workspacesdk 
1 parent 796fef0 commit 9f61acb

40 files changed

+198
-198
lines changed

‎agent/agent.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ func (a *agent) wireguardAddresses(agentID uuid.UUID) []netip.Prefix {
11071107
netip.PrefixFrom(tailnet.IPFromUUID(agentID), 128),
11081108
// We also listen on the legacy codersdk.WorkspaceAgentIP. This
11091109
// allows for a transition away from wsconncache.
1110-
netip.PrefixFrom(workspacesdk.WorkspaceAgentIP, 128),
1110+
netip.PrefixFrom(workspacesdk.AgentIP, 128),
11111111
}
11121112
}
11131113

@@ -1147,7 +1147,7 @@ func (a *agent) createTailnet(ctx context.Context, agentID uuid.UUID, derpMap *t
11471147
}
11481148
}()
11491149

1150-
sshListener, err := network.Listen("tcp", ":"+strconv.Itoa(workspacesdk.WorkspaceAgentSSHPort))
1150+
sshListener, err := network.Listen("tcp", ":"+strconv.Itoa(workspacesdk.AgentSSHPort))
11511151
if err != nil {
11521152
return nil, xerrors.Errorf("listen on the ssh port: %w", err)
11531153
}
@@ -1162,7 +1162,7 @@ func (a *agent) createTailnet(ctx context.Context, agentID uuid.UUID, derpMap *t
11621162
return nil, err
11631163
}
11641164

1165-
reconnectingPTYListener, err := network.Listen("tcp", ":"+strconv.Itoa(workspacesdk.WorkspaceAgentReconnectingPTYPort))
1165+
reconnectingPTYListener, err := network.Listen("tcp", ":"+strconv.Itoa(workspacesdk.AgentReconnectingPTYPort))
11661166
if err != nil {
11671167
return nil, xerrors.Errorf("listen for reconnecting pty: %w", err)
11681168
}
@@ -1211,7 +1211,7 @@ func (a *agent) createTailnet(ctx context.Context, agentID uuid.UUID, derpMap *t
12111211
if err != nil {
12121212
return
12131213
}
1214-
var msg workspacesdk.WorkspaceAgentReconnectingPTYInit
1214+
var msg workspacesdk.AgentReconnectingPTYInit
12151215
err = json.Unmarshal(data, &msg)
12161216
if err != nil {
12171217
logger.Warn(ctx, "failed to unmarshal init", slog.F("raw", data))
@@ -1225,7 +1225,7 @@ func (a *agent) createTailnet(ctx context.Context, agentID uuid.UUID, derpMap *t
12251225
return nil, err
12261226
}
12271227

1228-
speedtestListener, err := network.Listen("tcp", ":"+strconv.Itoa(workspacesdk.WorkspaceAgentSpeedtestPort))
1228+
speedtestListener, err := network.Listen("tcp", ":"+strconv.Itoa(workspacesdk.AgentSpeedtestPort))
12291229
if err != nil {
12301230
return nil, xerrors.Errorf("listen for speedtest: %w", err)
12311231
}
@@ -1273,7 +1273,7 @@ func (a *agent) createTailnet(ctx context.Context, agentID uuid.UUID, derpMap *t
12731273
return nil, err
12741274
}
12751275

1276-
apiListener, err := network.Listen("tcp", ":"+strconv.Itoa(workspacesdk.WorkspaceAgentHTTPAPIServerPort))
1276+
apiListener, err := network.Listen("tcp", ":"+strconv.Itoa(workspacesdk.AgentHTTPAPIServerPort))
12771277
if err != nil {
12781278
return nil, xerrors.Errorf("api listener: %w", err)
12791279
}
@@ -1386,7 +1386,7 @@ func (a *agent) runDERPMapSubscriber(ctx context.Context, conn drpc.Conn, networ
13861386
}
13871387
}
13881388

1389-
func (a *agent) handleReconnectingPTY(ctx context.Context, logger slog.Logger, msg workspacesdk.WorkspaceAgentReconnectingPTYInit, conn net.Conn) (retErr error) {
1389+
func (a *agent) handleReconnectingPTY(ctx context.Context, logger slog.Logger, msg workspacesdk.AgentReconnectingPTYInit, conn net.Conn) (retErr error) {
13901390
defer conn.Close()
13911391
a.metrics.connectionsTotal.Add(1)
13921392

‎agent/agent_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1783,7 +1783,7 @@ func TestAgent_UpdatedDERP(t *testing.T) {
17831783
})
17841784

17851785
// Setup a client connection.
1786-
newClientConn := func(derpMap *tailcfg.DERPMap, name string) *workspacesdk.WorkspaceAgentConn {
1786+
newClientConn := func(derpMap *tailcfg.DERPMap, name string) *workspacesdk.AgentConn {
17871787
conn, err := tailnet.NewConn(&tailnet.Options{
17881788
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(), 128)},
17891789
DERPMap: derpMap,
@@ -1812,7 +1812,7 @@ func TestAgent_UpdatedDERP(t *testing.T) {
18121812
// Force DERP.
18131813
conn.SetBlockEndpoints(true)
18141814

1815-
sdkConn := workspacesdk.NewWorkspaceAgentConn(conn, workspacesdk.WorkspaceAgentConnOptions{
1815+
sdkConn := workspacesdk.NewAgentConn(conn, workspacesdk.AgentConnOptions{
18161816
AgentID: agentID,
18171817
CloseFunc: func() error { return workspacesdk.ErrSkipClose },
18181818
})
@@ -2223,7 +2223,7 @@ func setupSSHSession(
22232223
}
22242224

22252225
func setupAgent(t *testing.T, metadata agentsdk.Manifest, ptyTimeout time.Duration, opts ...func(*agenttest.Client, *agent.Options)) (
2226-
*workspacesdk.WorkspaceAgentConn,
2226+
*workspacesdk.AgentConn,
22272227
*agenttest.Client,
22282228
<-chan *proto.Stats,
22292229
afero.Fs,
@@ -2296,7 +2296,7 @@ func setupAgent(t *testing.T, metadata agentsdk.Manifest, ptyTimeout time.Durati
22962296
t.Logf("error closing in-mem coordination: %s", err.Error())
22972297
}
22982298
})
2299-
agentConn := workspacesdk.NewWorkspaceAgentConn(conn, workspacesdk.WorkspaceAgentConnOptions{
2299+
agentConn := workspacesdk.NewAgentConn(conn, workspacesdk.AgentConnOptions{
23002300
AgentID: metadata.AgentID,
23012301
})
23022302
t.Cleanup(func() {

‎agent/ports_supported.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (lp *listeningPortsHandler) getListeningPorts() ([]codersdk.WorkspaceAgentL
3333
seen := make(map[uint16]struct{}, len(tabs))
3434
ports := []codersdk.WorkspaceAgentListeningPort{}
3535
for _, tab := range tabs {
36-
if tab.LocalAddr == nil || tab.LocalAddr.Port < workspacesdk.WorkspaceAgentMinimumListeningPort {
36+
if tab.LocalAddr == nil || tab.LocalAddr.Port < workspacesdk.AgentMinimumListeningPort {
3737
continue
3838
}
3939

‎cli/agent_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ func TestWorkspaceAgent(t *testing.T) {
9292
if assert.NotEmpty(t, workspace.LatestBuild.Resources) && assert.NotEmpty(t, resources[0].Agents) {
9393
assert.NotEmpty(t, resources[0].Agents[0].Version)
9494
}
95-
dialer, err := workspacesdk.NewWorkspaceClient(client).
96-
DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, nil)
95+
dialer, err := workspacesdk.NewClient(client).
96+
DialAgent(ctx, resources[0].Agents[0].ID, nil)
9797
require.NoError(t, err)
9898
defer dialer.Close()
9999
require.True(t, dialer.AwaitReachable(ctx))
@@ -132,8 +132,8 @@ func TestWorkspaceAgent(t *testing.T) {
132132
if assert.NotEmpty(t, resources) && assert.NotEmpty(t, resources[0].Agents) {
133133
assert.NotEmpty(t, resources[0].Agents[0].Version)
134134
}
135-
dialer, err := workspacesdk.NewWorkspaceClient(client).
136-
DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, nil)
135+
dialer, err := workspacesdk.NewClient(client).
136+
DialAgent(ctx, resources[0].Agents[0].ID, nil)
137137
require.NoError(t, err)
138138
defer dialer.Close()
139139
require.True(t, dialer.AwaitReachable(ctx))
@@ -176,7 +176,7 @@ func TestWorkspaceAgent(t *testing.T) {
176176
if assert.NotEmpty(t, resources) && assert.NotEmpty(t, resources[0].Agents) {
177177
assert.NotEmpty(t, resources[0].Agents[0].Version)
178178
}
179-
dialer, err := workspacesdk.NewWorkspaceClient(client).DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, nil)
179+
dialer, err := workspacesdk.NewClient(client).DialAgent(ctx, resources[0].Agents[0].ID, nil)
180180
require.NoError(t, err)
181181
defer dialer.Close()
182182
require.True(t, dialer.AwaitReachable(ctx))

‎cli/configssh_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ func TestConfigSSH(t *testing.T) {
8484
}).WithAgent().Do()
8585
_ = agenttest.New(t, client.URL, r.AgentToken)
8686
resources := coderdtest.AwaitWorkspaceAgents(t, client, r.Workspace.ID)
87-
agentConn, err := workspacesdk.NewWorkspaceClient(client).
88-
DialWorkspaceAgent(context.Background(), resources[0].Agents[0].ID, nil)
87+
agentConn, err := workspacesdk.NewClient(client).
88+
DialAgent(context.Background(), resources[0].Agents[0].ID, nil)
8989
require.NoError(t, err)
9090
defer agentConn.Close()
9191

‎cli/exp_scaletest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ func (r *RootCmd) scaletestCreateWorkspaces() *serpent.Command {
668668
if runCommand != "" {
669669
config.ReconnectingPTY = &reconnectingpty.Config{
670670
// AgentID is set by the test automatically.
671-
Init: workspacesdk.WorkspaceAgentReconnectingPTYInit{
671+
Init: workspacesdk.AgentReconnectingPTYInit{
672672
ID: uuid.Nil,
673673
Height: 24,
674674
Width: 80,

‎cli/netcheck.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (r *RootCmd) netcheck() *serpent.Command {
2727
ctx, cancel := context.WithTimeout(inv.Context(), 30*time.Second)
2828
defer cancel()
2929

30-
connInfo, err := workspacesdk.NewWorkspaceClient(client).WorkspaceAgentConnectionInfoGeneric(ctx)
30+
connInfo, err := workspacesdk.NewClient(client).AgentConnectionInfoGeneric(ctx)
3131
if err != nil {
3232
return err
3333
}

‎cli/ping.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ func (r *RootCmd) ping() *serpent.Command {
5656
if r.disableDirect {
5757
_, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.")
5858
}
59-
conn, err := workspacesdk.NewWorkspaceClient(client).
60-
DialWorkspaceAgent(ctx, workspaceAgent.ID, &workspacesdk.DialWorkspaceAgentOptions{
59+
conn, err := workspacesdk.NewClient(client).
60+
DialAgent(ctx, workspaceAgent.ID, &workspacesdk.DialAgentOptions{
6161
Logger: logger,
6262
BlockEndpoints: r.disableDirect,
6363
})

‎cli/portforward.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ func (r *RootCmd) portForward() *serpent.Command {
103103
if r.disableDirect {
104104
_, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.")
105105
}
106-
conn, err := workspacesdk.NewWorkspaceClient(client).
107-
DialWorkspaceAgent(ctx, workspaceAgent.ID, &workspacesdk.DialWorkspaceAgentOptions{
106+
conn, err := workspacesdk.NewClient(client).
107+
DialAgent(ctx, workspaceAgent.ID, &workspacesdk.DialAgentOptions{
108108
Logger: logger,
109109
BlockEndpoints: r.disableDirect,
110110
})
@@ -195,7 +195,7 @@ func (r *RootCmd) portForward() *serpent.Command {
195195
func listenAndPortForward(
196196
ctx context.Context,
197197
inv *serpent.Invocation,
198-
conn *workspacesdk.WorkspaceAgentConn,
198+
conn *workspacesdk.AgentConn,
199199
wg *sync.WaitGroup,
200200
spec portForwardSpec,
201201
logger slog.Logger,

‎cli/speedtest.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ func (r *RootCmd) speedtest() *serpent.Command {
6060
if r.disableDirect {
6161
_, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.")
6262
}
63-
conn, err := workspacesdk.NewWorkspaceClient(client).
64-
DialWorkspaceAgent(ctx, workspaceAgent.ID, &workspacesdk.DialWorkspaceAgentOptions{
63+
conn, err := workspacesdk.NewClient(client).
64+
DialAgent(ctx, workspaceAgent.ID, &workspacesdk.DialAgentOptions{
6565
Logger: logger,
6666
})
6767
if err != nil {

‎cli/ssh.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ func (r *RootCmd) ssh() *serpent.Command {
223223
if r.disableDirect {
224224
_, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.")
225225
}
226-
conn, err := workspacesdk.NewWorkspaceClient(client).
227-
DialWorkspaceAgent(ctx, workspaceAgent.ID, &workspacesdk.DialWorkspaceAgentOptions{
226+
conn, err := workspacesdk.NewClient(client).
227+
DialAgent(ctx, workspaceAgent.ID, &workspacesdk.DialAgentOptions{
228228
Logger: logger,
229229
BlockEndpoints: r.disableDirect,
230230
})

‎cli/support_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func assertBundleContents(t *testing.T, path string, badValues ...string) {
171171
bs := readBytesFromZip(t, f)
172172
require.NotEmpty(t, bs, "tailnet debug should not be empty")
173173
case "network/netcheck.json":
174-
var v workspacesdk.WorkspaceAgentConnectionInfo
174+
var v workspacesdk.AgentConnectionInfo
175175
decodeJSONFromZip(t, f, &v)
176176
require.NotEmpty(t, v, "connection info should not be empty")
177177
case "workspace/workspace.json":

‎cli/vscodessh.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ func (r *RootCmd) vscodeSSH() *serpent.Command {
165165
if r.disableDirect {
166166
logger.Info(ctx, "direct connections disabled")
167167
}
168-
agentConn, err := workspacesdk.NewWorkspaceClient(client).
169-
DialWorkspaceAgent(ctx, workspaceAgent.ID, &workspacesdk.DialWorkspaceAgentOptions{
168+
agentConn, err := workspacesdk.NewClient(client).
169+
DialAgent(ctx, workspaceAgent.ID, &workspacesdk.DialAgentOptions{
170170
Logger: logger,
171171
BlockEndpoints: r.disableDirect,
172172
})
@@ -282,7 +282,7 @@ type sshNetworkStats struct {
282282
DownloadBytesSec int64 `json:"download_bytes_sec"`
283283
}
284284

285-
func collectNetworkStats(ctx context.Context, agentConn *workspacesdk.WorkspaceAgentConn, start, end time.Time, counts map[netlogtype.Connection]netlogtype.Counts) (*sshNetworkStats, error) {
285+
func collectNetworkStats(ctx context.Context, agentConn *workspacesdk.AgentConn, start, end time.Time, counts map[netlogtype.Connection]netlogtype.Counts) (*sshNetworkStats, error) {
286286
latency, p2p, pingResult, err := agentConn.Ping(ctx)
287287
if err != nil {
288288
return nil, err

‎coderd/activitybump_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ func TestWorkspaceActivityBump(t *testing.T) {
166166
client, workspace, assertBumped := setupActivityTest(t)
167167

168168
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
169-
conn, err := workspacesdk.NewWorkspaceClient(client).
170-
DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialWorkspaceAgentOptions{
169+
conn, err := workspacesdk.NewClient(client).
170+
DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
171171
Logger: slogtest.Make(t, nil),
172172
})
173173
require.NoError(t, err)
@@ -204,8 +204,8 @@ func TestWorkspaceActivityBump(t *testing.T) {
204204

205205
// Bump by dialing the workspace and sending traffic.
206206
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
207-
conn, err := workspacesdk.NewWorkspaceClient(client).
208-
DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialWorkspaceAgentOptions{
207+
conn, err := workspacesdk.NewClient(client).
208+
DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
209209
Logger: slogtest.Make(t, nil),
210210
})
211211
require.NoError(t, err)

‎coderd/coderd_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ func TestDERPForceWebSockets(t *testing.T) {
190190
t.Cleanup(func() {
191191
client.HTTPClient.CloseIdleConnections()
192192
})
193-
wsclient := workspacesdk.NewWorkspaceClient(client)
193+
wsclient := workspacesdk.NewClient(client)
194194
user := coderdtest.CreateFirstUser(t, client)
195195

196-
gen, err := wsclient.WorkspaceAgentConnectionInfoGeneric(context.Background())
196+
gen, err := wsclient.AgentConnectionInfoGeneric(context.Background())
197197
require.NoError(t, err)
198198
t.Log(spew.Sdump(gen))
199199

@@ -215,8 +215,8 @@ func TestDERPForceWebSockets(t *testing.T) {
215215
defer cancel()
216216

217217
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
218-
conn, err := wsclient.DialWorkspaceAgent(ctx, resources[0].Agents[0].ID,
219-
&workspacesdk.DialWorkspaceAgentOptions{
218+
conn, err := wsclient.DialAgent(ctx, resources[0].Agents[0].ID,
219+
&workspacesdk.DialAgentOptions{
220220
Logger: slogtest.Make(t, nil).Leveled(slog.LevelDebug).Named("client"),
221221
},
222222
)

‎coderd/insights_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ func TestDeploymentInsights(t *testing.T) {
8787
require.NoError(t, err)
8888
assert.NotZero(t, res.Workspaces[0].LastUsedAt)
8989

90-
conn, err := workspacesdk.NewWorkspaceClient(client).
91-
DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialWorkspaceAgentOptions{
90+
conn, err := workspacesdk.NewClient(client).
91+
DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
9292
Logger: slogtest.Make(t, nil).Named("tailnet"),
9393
})
9494
require.NoError(t, err)
@@ -176,8 +176,8 @@ func TestUserActivityInsights_SanityCheck(t *testing.T) {
176176
defer cancel()
177177

178178
// Connect to the agent to generate usage/latency stats.
179-
conn, err := workspacesdk.NewWorkspaceClient(client).
180-
DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialWorkspaceAgentOptions{
179+
conn, err := workspacesdk.NewClient(client).
180+
DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
181181
Logger: logger.Named("client"),
182182
})
183183
require.NoError(t, err)
@@ -274,8 +274,8 @@ func TestUserLatencyInsights(t *testing.T) {
274274
defer cancel()
275275

276276
// Connect to the agent to generate usage/latency stats.
277-
conn, err := workspacesdk.NewWorkspaceClient(client).
278-
DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialWorkspaceAgentOptions{
277+
conn, err := workspacesdk.NewClient(client).
278+
DialAgent(ctx, resources[0].Agents[0].ID, &workspacesdk.DialAgentOptions{
279279
Logger: logger.Named("client"),
280280
})
281281
require.NoError(t, err)

‎coderd/tailnet.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,9 @@ func (s *ServerTailnet) acquireTicket(agentID uuid.UUID) (release func()) {
427427
}
428428
}
429429

430-
func (s *ServerTailnet) AgentConn(ctx context.Context, agentID uuid.UUID) (*workspacesdk.WorkspaceAgentConn, func(), error) {
430+
func (s *ServerTailnet) AgentConn(ctx context.Context, agentID uuid.UUID) (*workspacesdk.AgentConn, func(), error) {
431431
var (
432-
conn *workspacesdk.WorkspaceAgentConn
432+
conn *workspacesdk.AgentConn
433433
ret func()
434434
)
435435

@@ -440,7 +440,7 @@ func (s *ServerTailnet) AgentConn(ctx context.Context, agentID uuid.UUID) (*work
440440
}
441441
ret = s.acquireTicket(agentID)
442442

443-
conn = workspacesdk.NewWorkspaceAgentConn(s.conn, workspacesdk.WorkspaceAgentConnOptions{
443+
conn = workspacesdk.NewAgentConn(s.conn, workspacesdk.AgentConnOptions{
444444
AgentID: agentID,
445445
CloseFunc: func() error { return workspacesdk.ErrSkipClose },
446446
})

‎coderd/tailnet_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
8080
agents, serverTailnet := setupServerTailnetAgent(t, 1)
8181
a := agents[0]
8282

83-
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.WorkspaceAgentHTTPAPIServerPort))
83+
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.AgentHTTPAPIServerPort))
8484
require.NoError(t, err)
8585

8686
rp := serverTailnet.ReverseProxy(u, u, a.id)
@@ -111,7 +111,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
111111
registry := prometheus.NewRegistry()
112112
require.NoError(t, registry.Register(serverTailnet))
113113

114-
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.WorkspaceAgentHTTPAPIServerPort))
114+
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.AgentHTTPAPIServerPort))
115115
require.NoError(t, err)
116116

117117
rp := serverTailnet.ReverseProxy(u, u, a.id)
@@ -145,7 +145,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
145145
agents, serverTailnet := setupServerTailnetAgent(t, 1)
146146
a := agents[0]
147147

148-
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.WorkspaceAgentHTTPAPIServerPort))
148+
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.AgentHTTPAPIServerPort))
149149
require.NoError(t, err)
150150

151151
rp := serverTailnet.ReverseProxy(u, u, a.id)
@@ -156,7 +156,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
156156
// Ensure the reverse proxy director rewrites the url host to the agent's IP.
157157
rp.Director(req)
158158
assert.Equal(t,
159-
fmt.Sprintf("[%s]:%d", tailnet.IPFromUUID(a.id).String(), workspacesdk.WorkspaceAgentHTTPAPIServerPort),
159+
fmt.Sprintf("[%s]:%d", tailnet.IPFromUUID(a.id).String(), workspacesdk.AgentHTTPAPIServerPort),
160160
req.URL.Host,
161161
)
162162
})
@@ -315,7 +315,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
315315

316316
require.True(t, serverTailnet.Conn().GetBlockEndpoints(), "expected BlockEndpoints to be set")
317317

318-
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.WorkspaceAgentHTTPAPIServerPort))
318+
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.AgentHTTPAPIServerPort))
319319
require.NoError(t, err)
320320

321321
rp := serverTailnet.ReverseProxy(u, u, a.id)

0 commit comments

Comments
 (0)