Skip to content

Commit

Permalink
Updates the Path variables in tests to use the new-style websocket en…
Browse files Browse the repository at this point in the history
…dpoints

These were missed in the initial PR: #37520
  • Loading branch information
Isaiah Becker-Mayer committed Feb 13, 2024
1 parent 98a7986 commit 364b687
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion integration/helpers/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -1539,7 +1539,7 @@ func (w *WebClient) SSH(termReq web.TerminalRequest) (*web.TerminalStream, error
u := url.URL{
Host: w.i.Web,
Scheme: client.WSS,
Path: fmt.Sprintf("/v1/webapi/sites/%v/connect", w.tc.SiteName),
Path: fmt.Sprintf("/v1/webapi/sites/%v/connect/ws", w.tc.SiteName),
}
data, err := json.Marshal(termReq)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion lib/benchmark/web.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func connectToHost(ctx context.Context, tc *client.TeleportClient, webSession *w
u := url.URL{
Host: tc.WebProxyAddr,
Scheme: client.WSS,
Path: fmt.Sprintf("/v1/webapi/sites/%v/connect", tc.SiteName),
Path: fmt.Sprintf("/v1/webapi/sites/%v/connect/ws", tc.SiteName),
RawQuery: url.Values{
"params": []string{string(data)},
roundtrip.AccessTokenQueryParam: []string{webSession.getToken()},
Expand Down
2 changes: 1 addition & 1 deletion lib/web/assistant_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ func (s *WebSuite) makeAssistant(_ *testing.T, pack *authPack, conversationID, a
u := url.URL{
Host: s.url().Host,
Scheme: client.WSS,
Path: fmt.Sprintf("/v1/webapi/sites/%s/assistant", currentSiteShortcut),
Path: fmt.Sprintf("/v1/webapi/sites/%s/assistant/ws", currentSiteShortcut),
}

q := u.Query()
Expand Down
2 changes: 1 addition & 1 deletion lib/web/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func (s *WebSuite) makeCommand(t *testing.T, pack *authPack, conversationID uuid
u := url.URL{
Host: s.url().Host,
Scheme: client.WSS,
Path: fmt.Sprintf("/v1/webapi/command/%v/execute", currentSiteShortcut),
Path: fmt.Sprintf("/v1/webapi/command/%v/execute/ws", currentSiteShortcut),
}
data, err := json.Marshal(req)
if err != nil {
Expand Down

0 comments on commit 364b687

Please sign in to comment.