coder
diff --git a/‎coderd/apidoc/docs.go
Lines changed: 3 additions & 0 deletions b/‎coderd/apidoc/docs.go
Lines changed: 3 additions & 0 deletions
diff --git a/‎coderd/apidoc/swagger.json
Lines changed: 3 additions & 0 deletions b/‎coderd/apidoc/swagger.json
Lines changed: 3 additions & 0 deletions
diff --git a/‎coderd/workspaceagents.go
Lines changed: 2 additions & 0 deletions b/‎coderd/workspaceagents.go
Lines changed: 2 additions & 0 deletions
diff --git a/‎coderd/workspaceagents_test.go
Lines changed: 31 additions & 0 deletions b/‎coderd/workspaceagents_test.go
Lines changed: 31 additions & 0 deletions
diff --git a/‎codersdk/workspacesdk/workspacesdk.go
Lines changed: 1 addition & 0 deletions b/‎codersdk/workspacesdk/workspacesdk.go
Lines changed: 1 addition & 0 deletions
diff --git a/‎docs/reference/api/agents.md
Lines changed: 2 additions & 1 deletion b/‎docs/reference/api/agents.md
Lines changed: 2 additions & 1 deletion
diff --git a/‎docs/reference/api/schemas.md
Lines changed: 3 additions & 1 deletion b/‎docs/reference/api/schemas.md
Lines changed: 3 additions & 1 deletion
@@ -882,6 +882,7 @@ func (api *API) workspaceAgentConnection(rw http.ResponseWriter, r *http.Request
 		DERPMap:                  api.DERPMap(),
 		DERPForceWebSockets:      api.DeploymentValues.DERP.Config.ForceWebSockets.Value(),
 		DisableDirectConnections: api.DeploymentValues.DERP.Config.BlockDirect.Value(),
+		HostnameSuffix:           api.DeploymentValues.WorkspaceHostnameSuffix.Value(),
 	})
 }
 
@@ -903,6 +904,7 @@ func (api *API) workspaceAgentConnectionGeneric(rw http.ResponseWriter, r *http.
 		DERPMap:                  api.DERPMap(),
 		DERPForceWebSockets:      api.DeploymentValues.DERP.Config.ForceWebSockets.Value(),
 		DisableDirectConnections: api.DeploymentValues.DERP.Config.BlockDirect.Value(),
+		HostnameSuffix:           api.DeploymentValues.WorkspaceHostnameSuffix.Value(),
 	})
 }
 
 
@@ -2560,3 +2560,34 @@ func requireEqualOrBothNil[T any](t testing.TB, a, b *T) {
 	}
 	require.Equal(t, a, b)
 }
+
+func TestAgentConnectionInfo(t *testing.T) {
+	t.Parallel()
+	ctx := testutil.Context(t, testutil.WaitShort)
+
+	dv := coderdtest.DeploymentValues(t)
+	dv.WorkspaceHostnameSuffix = "yallah"
+	dv.DERP.Config.BlockDirect = true
+	dv.DERP.Config.ForceWebSockets = true
+	client, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{DeploymentValues: dv})
+	user := coderdtest.CreateFirstUser(t, client)
+	r := dbfake.WorkspaceBuild(t, db, database.WorkspaceTable{
+		OrganizationID: user.OrganizationID,
+		OwnerID:        user.UserID,
+	}).WithAgent().Do()
+
+	info, err := workspacesdk.New(client).AgentConnectionInfoGeneric(ctx)
+	require.NoError(t, err)
+	require.Equal(t, "yallah", info.HostnameSuffix)
+	require.True(t, info.DisableDirectConnections)
+	require.True(t, info.DERPForceWebSockets)
+
+	ws, err := client.Workspace(ctx, r.Workspace.ID)
+	require.NoError(t, err)
+	agnt := ws.LatestBuild.Resources[0].Agents[0]
+	info, err = workspacesdk.New(client).AgentConnectionInfo(ctx, agnt.ID)
+	require.NoError(t, err)
+	require.Equal(t, "yallah", info.HostnameSuffix)
+	require.True(t, info.DisableDirectConnections)
+	require.True(t, info.DERPForceWebSockets)
+}
@@ -143,6 +143,7 @@ type AgentConnectionInfo struct {
 	DERPMap                  *tailcfg.DERPMap `json:"derp_map"`
 	DERPForceWebSockets      bool             `json:"derp_force_websockets"`
 	DisableDirectConnections bool             `json:"disable_direct_connections"`
+	HostnameSuffix           string           `json:"hostname_suffix"`
 }
 
 func (c *Client) AgentConnectionInfoGeneric(ctx context.Context) (AgentConnectionInfo, error) {
Original file line number	Diff line number	Diff line change
`@@ -882,6 +882,7 @@ func (api API) workspaceAgentConnection(rw http.ResponseWriter, r http.Request`
`882`	`882`	`DERPMap: api.DERPMap(),`
`883`	`883`	`DERPForceWebSockets: api.DeploymentValues.DERP.Config.ForceWebSockets.Value(),`
`884`	`884`	`DisableDirectConnections: api.DeploymentValues.DERP.Config.BlockDirect.Value(),`
	`885`	`+ HostnameSuffix: api.DeploymentValues.WorkspaceHostnameSuffix.Value(),`
`885`	`886`	`})`
`886`	`887`	`}`
`887`	`888`
`@@ -903,6 +904,7 @@ func (api API) workspaceAgentConnectionGeneric(rw http.ResponseWriter, r http.`
`903`	`904`	`DERPMap: api.DERPMap(),`
`904`	`905`	`DERPForceWebSockets: api.DeploymentValues.DERP.Config.ForceWebSockets.Value(),`
`905`	`906`	`DisableDirectConnections: api.DeploymentValues.DERP.Config.BlockDirect.Value(),`
	`907`	`+ HostnameSuffix: api.DeploymentValues.WorkspaceHostnameSuffix.Value(),`
`906`	`908`	`})`
`907`	`909`	`}`
`908`	`910`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ type AgentConnectionInfo struct {`
`143`	`143`	DERPMap *tailcfg.DERPMap `json:"derp_map"`
`144`	`144`	DERPForceWebSockets bool `json:"derp_force_websockets"`
`145`	`145`	DisableDirectConnections bool `json:"disable_direct_connections"`
	`146`	+ HostnameSuffix string `json:"hostname_suffix"`
`146`	`147`	`}`
`147`	`148`
`148`	`149`	`func (c *Client) AgentConnectionInfoGeneric(ctx context.Context) (AgentConnectionInfo, error) {`