Merge v2.10 into v3.0

2023-11-29 12:20:57 +01:00 · 2023-11-29 12:20:57 +01:00 · e29a142f6a
commit e29a142f6a
parent 35c704ace3 dae0491b61
118 changed files with 1324 additions and 1290 deletions
--- a/pkg/server/service/proxy_websocket_test.go
+++ b/pkg/server/service/proxy_websocket_test.go
@ -51,7 +51,7 @@ func TestWebSocketTCPClose(t *testing.T) {
 	serverErr := <-errChan

 	var wsErr *gorillawebsocket.CloseError
-	require.True(t, errors.As(serverErr, &wsErr))
+	require.ErrorAs(t, serverErr, &wsErr)
 	assert.Equal(t, 1006, wsErr.Code)
 }