File tree 4 files changed +20
-7
lines changed
dask-gateway-server/dask-gateway-proxy
4 files changed +20
-7
lines changed Original file line number Diff line number Diff line change 68
68
- uses : actions/checkout@v4
69
69
- uses : actions/setup-go@v5
70
70
with :
71
- go-version : " 1.21 "
71
+ go-version : " 1.23 "
72
72
cache-dependency-path : " **/*.sum"
73
73
- uses : actions/setup-python@v5
74
74
with :
Original file line number Diff line number Diff line change @@ -58,13 +58,13 @@ jobs:
58
58
# that would be fine.
59
59
#
60
60
- python-version : " 3.10"
61
- go-version : " 1.20 "
61
+ go-version : " 1.22 "
62
62
- python-version : " 3.11"
63
- go-version : " 1.20 "
63
+ go-version : " 1.22 "
64
64
- python-version : " 3.12"
65
- go-version : " 1.21 "
65
+ go-version : " 1.23 "
66
66
- python-version : " 3.13"
67
- go-version : " 1.21 "
67
+ go-version : " 1.23 "
68
68
69
69
steps :
70
70
- uses : actions/checkout@v4
Original file line number Diff line number Diff line change 1
1
module github.com/dask/dask-gateway/dask-gateway-proxy
2
2
3
- go 1.21
3
+ go 1.22
4
4
5
- require github.com/stretchr/testify v1.8.4
5
+ require github.com/stretchr/testify v1.10.0
6
6
7
7
require (
8
8
github.com/davecgh/go-spew v1.1.1 // indirect
Original file line number Diff line number Diff line change @@ -8,6 +8,18 @@ import (
8
8
"net"
9
9
)
10
10
11
+ // hideWriteTo is a workaround introduced to make the code functional in 1.22+,
12
+ // where io.Copy would no longer make use of peekedTCPConn.Read after
13
+ // net.TCPConn.WriteTo was added, so the workaround is to hide it again.
14
+ //
15
+ // The workaround was developed inspecting:
16
+ // https://github.com/golang/go/commit/f664031bc17629080332a1c7bede38d67fd32e47
17
+ //
18
+ type hideWriteTo struct {}
19
+ func (hideWriteTo ) WriteTo (io.Writer ) (int64 , error ) {
20
+ panic ("can't happen" )
21
+ }
22
+
11
23
type TcpConn interface {
12
24
net.Conn
13
25
CloseWrite () error
@@ -16,6 +28,7 @@ type TcpConn interface {
16
28
17
29
type peekedTCPConn struct {
18
30
peeked []byte
31
+ hideWriteTo
19
32
* net.TCPConn
20
33
}
21
34
You can’t perform that action at this time.
0 commit comments