diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2022-03-17 02:08:41 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2022-03-17 02:08:41 +0300 |
| commit | cc02518188beef74f9cc64c2411e7afe1c163491 (patch) | |
| tree | 2905d09592c83c6a95a4901a899403573b46bf14 | |
| parent | 8d0041e051d16bb44208a5992e88ff7cd33a14e8 (diff) | |
| parent | fd98b8268a7c7eb6eee49366845723cfb242dae0 (diff) | |
Merge branch 'update-go-proxyproto' into 'master'
Update go-proxyproto library
Closes #699
See merge request gitlab-org/gitlab-pages!709
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 | ||||
| -rw-r--r-- | test/acceptance/helpers_test.go | 18 |
3 files changed, 14 insertions, 10 deletions
@@ -17,7 +17,7 @@ require ( github.com/karlseguin/ccache/v2 v2.0.6 github.com/namsral/flag v1.7.4-pre github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/pires/go-proxyproto v0.2.0 + github.com/pires/go-proxyproto v0.6.2 github.com/prometheus/client_golang v1.11.0 github.com/rs/cors v1.7.0 github.com/sirupsen/logrus v1.8.1 @@ -345,8 +345,8 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9 github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= -github.com/pires/go-proxyproto v0.2.0 h1:WyYKlv9pkt77b+LjMvPfwrsAxviaGCFhG4KDIy1ofLY= -github.com/pires/go-proxyproto v0.2.0/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY= +github.com/pires/go-proxyproto v0.6.2 h1:KAZ7UteSOt6urjme6ZldyFm4wDe/z0ZUP0Yv0Dos0d8= +github.com/pires/go-proxyproto v0.6.2/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go index 1b514a85..8a81553d 100644 --- a/test/acceptance/helpers_test.go +++ b/test/acceptance/helpers_test.go @@ -123,13 +123,17 @@ func (l ListenSpec) proxyV2DialContext() dialContext { } header := &proxyproto.Header{ - Version: 2, - Command: proxyproto.PROXY, - TransportProtocol: proxyproto.TCPv4, - SourceAddress: net.ParseIP("10.1.1.1"), - SourcePort: 1000, - DestinationAddress: net.ParseIP("20.2.2.2"), - DestinationPort: 2000, + Version: 2, + Command: proxyproto.PROXY, + TransportProtocol: proxyproto.TCPv4, + SourceAddr: &net.TCPAddr{ + IP: net.ParseIP("10.1.1.1"), + Port: 1000, + }, + DestinationAddr: &net.TCPAddr{ + IP: net.ParseIP("20.2.2.2"), + Port: 2000, + }, } _, err = header.WriteTo(conn) |