From 1561e5e26b0c05de669981e681b55888dc0690a8 Mon Sep 17 00:00:00 2001 From: minhaj-shakeel Date: Tue, 16 Feb 2021 18:21:36 +0530 Subject: [PATCH 1/5] upgarde graphql-transport-ws module --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 366571db8c3..5ea21b2c350 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/google/uuid v1.0.0 github.com/gorilla/websocket v1.4.2 github.com/graph-gophers/graphql-go v0.0.0-20200309224638-dae41bde9ef9 - github.com/graph-gophers/graphql-transport-ws v0.0.0-20190611222414-40c048432299 // indirect + github.com/graph-gophers/graphql-transport-ws v0.0.0-20200904065757-c681d7e1b135 // indirect github.com/hashicorp/vault/api v1.0.4 github.com/minio/minio-go/v6 v6.0.55 github.com/mitchellh/panicwrap v1.0.0 diff --git a/go.sum b/go.sum index 195532d1645..71b874072bc 100644 --- a/go.sum +++ b/go.sum @@ -279,6 +279,8 @@ github.com/graph-gophers/graphql-go v0.0.0-20200309224638-dae41bde9ef9 h1:kLnsdu github.com/graph-gophers/graphql-go v0.0.0-20200309224638-dae41bde9ef9/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/graph-gophers/graphql-transport-ws v0.0.0-20190611222414-40c048432299 h1:BdXUpuP9yOGKcwD/mhhZ+6EeAmrPrAQA3yeq4YEOHL4= github.com/graph-gophers/graphql-transport-ws v0.0.0-20190611222414-40c048432299/go.mod h1:mA6VjyefgI7zd37tC3zopb51mW39gSfnEoWvtnxsqKQ= +github.com/graph-gophers/graphql-transport-ws v0.0.0-20200904065757-c681d7e1b135 h1:JlvvntG6+XH+46z0fDXzsiZUINvQNgG18fXQL/X/7Pg= +github.com/graph-gophers/graphql-transport-ws v0.0.0-20200904065757-c681d7e1b135/go.mod h1:NIGAcH2JJLkVA0X1qArIk2c4mvrvGzJDzzg09TTbc/w= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= From 490e22cf7d4837ff983e42ffa2971a3dd1fe07cd Mon Sep 17 00:00:00 2001 From: minhaj-shakeel Date: Wed, 17 Feb 2021 11:50:58 +0530 Subject: [PATCH 2/5] upgrade our forked lib --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 5ea21b2c350..b4894e84b59 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/dgraph-io/dgo/v200 v200.0.0-20210212152539-e0a5bde40ba2 github.com/dgraph-io/gqlgen v0.13.2 github.com/dgraph-io/gqlparser/v2 v2.1.5 - github.com/dgraph-io/graphql-transport-ws v0.0.0-20200916064635-48589439591b + github.com/dgraph-io/graphql-transport-ws v0.0.0-20210215165829-1ea6c958d0a3 github.com/dgraph-io/ristretto v0.0.4-0.20210205182321-f8e4908e34d1 github.com/dgraph-io/simdjson-go v0.3.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible @@ -40,7 +40,7 @@ require ( github.com/google/uuid v1.0.0 github.com/gorilla/websocket v1.4.2 github.com/graph-gophers/graphql-go v0.0.0-20200309224638-dae41bde9ef9 - github.com/graph-gophers/graphql-transport-ws v0.0.0-20200904065757-c681d7e1b135 // indirect + github.com/graph-gophers/graphql-transport-ws v0.0.0-20190611222414-40c048432299 // indirect github.com/hashicorp/vault/api v1.0.4 github.com/minio/minio-go/v6 v6.0.55 github.com/mitchellh/panicwrap v1.0.0 diff --git a/go.sum b/go.sum index 71b874072bc..df4d555646a 100644 --- a/go.sum +++ b/go.sum @@ -129,6 +129,8 @@ github.com/dgraph-io/gqlparser/v2 v2.1.5 h1:FNFSzyOEZ8gs97SLBtn2Pez9f12emvsQ6Vv6 github.com/dgraph-io/gqlparser/v2 v2.1.5/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= github.com/dgraph-io/graphql-transport-ws v0.0.0-20200916064635-48589439591b h1:PDEhlwHpkEQ5WBfOOKZCNZTXFDGyCEWTYDhxGQbyIpk= github.com/dgraph-io/graphql-transport-ws v0.0.0-20200916064635-48589439591b/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ= +github.com/dgraph-io/graphql-transport-ws v0.0.0-20210215165829-1ea6c958d0a3 h1:bHmdLryRGvs8VimcqmkKb24FBSlyjOF0dtPz8POdBbg= +github.com/dgraph-io/graphql-transport-ws v0.0.0-20210215165829-1ea6c958d0a3/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ= github.com/dgraph-io/ristretto v0.0.4-0.20210205182321-f8e4908e34d1 h1:E+NH1+aTO3vgP/t01DvYbX8qnwBC0bPgPwK7y+y0vaE= github.com/dgraph-io/ristretto v0.0.4-0.20210205182321-f8e4908e34d1/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ= github.com/dgraph-io/simdjson-go v0.3.0 h1:h71LO7vR4LHMPUhuoGN8bqGm1VNfGOlAG8BI6iDUKw0= @@ -279,8 +281,6 @@ github.com/graph-gophers/graphql-go v0.0.0-20200309224638-dae41bde9ef9 h1:kLnsdu github.com/graph-gophers/graphql-go v0.0.0-20200309224638-dae41bde9ef9/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/graph-gophers/graphql-transport-ws v0.0.0-20190611222414-40c048432299 h1:BdXUpuP9yOGKcwD/mhhZ+6EeAmrPrAQA3yeq4YEOHL4= github.com/graph-gophers/graphql-transport-ws v0.0.0-20190611222414-40c048432299/go.mod h1:mA6VjyefgI7zd37tC3zopb51mW39gSfnEoWvtnxsqKQ= -github.com/graph-gophers/graphql-transport-ws v0.0.0-20200904065757-c681d7e1b135 h1:JlvvntG6+XH+46z0fDXzsiZUINvQNgG18fXQL/X/7Pg= -github.com/graph-gophers/graphql-transport-ws v0.0.0-20200904065757-c681d7e1b135/go.mod h1:NIGAcH2JJLkVA0X1qArIk2c4mvrvGzJDzzg09TTbc/w= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= From 35e8e0caac39550c864db32d030e0b82ea421628 Mon Sep 17 00:00:00 2001 From: minhaj-shakeel Date: Fri, 19 Feb 2021 18:36:55 +0530 Subject: [PATCH 3/5] run go mod tidy --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index df4d555646a..a26252ff1e6 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,6 @@ github.com/dgraph-io/gqlgen v0.13.2/go.mod h1:iCOrOv9lngN7KAo+jMgvUPVDlYHdf7qDws github.com/dgraph-io/gqlparser/v2 v2.1.1/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= github.com/dgraph-io/gqlparser/v2 v2.1.5 h1:FNFSzyOEZ8gs97SLBtn2Pez9f12emvsQ6Vv6oNtg5rc= github.com/dgraph-io/gqlparser/v2 v2.1.5/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= -github.com/dgraph-io/graphql-transport-ws v0.0.0-20200916064635-48589439591b h1:PDEhlwHpkEQ5WBfOOKZCNZTXFDGyCEWTYDhxGQbyIpk= -github.com/dgraph-io/graphql-transport-ws v0.0.0-20200916064635-48589439591b/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ= github.com/dgraph-io/graphql-transport-ws v0.0.0-20210215165829-1ea6c958d0a3 h1:bHmdLryRGvs8VimcqmkKb24FBSlyjOF0dtPz8POdBbg= github.com/dgraph-io/graphql-transport-ws v0.0.0-20210215165829-1ea6c958d0a3/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ= github.com/dgraph-io/ristretto v0.0.4-0.20210205182321-f8e4908e34d1 h1:E+NH1+aTO3vgP/t01DvYbX8qnwBC0bPgPwK7y+y0vaE= From b21090580fa3c6dd1fa69e9c96d68d038cba86de Mon Sep 17 00:00:00 2001 From: minhaj-shakeel Date: Tue, 23 Feb 2021 13:22:45 +0530 Subject: [PATCH 4/5] enable compression in subscription client e2e tests --- go.sum | 4 ++-- graphql/e2e/common/subscription.go | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.sum b/go.sum index a26252ff1e6..91a59865fd1 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,8 @@ github.com/dgraph-io/gqlgen v0.13.2/go.mod h1:iCOrOv9lngN7KAo+jMgvUPVDlYHdf7qDws github.com/dgraph-io/gqlparser/v2 v2.1.1/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= github.com/dgraph-io/gqlparser/v2 v2.1.5 h1:FNFSzyOEZ8gs97SLBtn2Pez9f12emvsQ6Vv6oNtg5rc= github.com/dgraph-io/gqlparser/v2 v2.1.5/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= -github.com/dgraph-io/graphql-transport-ws v0.0.0-20210215165829-1ea6c958d0a3 h1:bHmdLryRGvs8VimcqmkKb24FBSlyjOF0dtPz8POdBbg= -github.com/dgraph-io/graphql-transport-ws v0.0.0-20210215165829-1ea6c958d0a3/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ= +github.com/dgraph-io/graphql-transport-ws v0.0.0-20210223074046-e5b8b80bb4ed h1:pgGMBoTtFhR+xkyzINaToLYRurHn+6pxMYffIGmmEPc= +github.com/dgraph-io/graphql-transport-ws v0.0.0-20210223074046-e5b8b80bb4ed/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ= github.com/dgraph-io/ristretto v0.0.4-0.20210205182321-f8e4908e34d1 h1:E+NH1+aTO3vgP/t01DvYbX8qnwBC0bPgPwK7y+y0vaE= github.com/dgraph-io/ristretto v0.0.4-0.20210205182321-f8e4908e34d1/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ= github.com/dgraph-io/simdjson-go v0.3.0 h1:h71LO7vR4LHMPUhuoGN8bqGm1VNfGOlAG8BI6iDUKw0= diff --git a/graphql/e2e/common/subscription.go b/graphql/e2e/common/subscription.go index c95ca5a8dbd..5c5dd1a3f33 100644 --- a/graphql/e2e/common/subscription.go +++ b/graphql/e2e/common/subscription.go @@ -62,7 +62,10 @@ func NewGraphQLSubscription(url string, req *schema.Request, subscriptionPayload header := http.Header{ "Sec-WebSocket-Protocol": []string{protocolGraphQLWS}, } - conn, _, err := websocket.DefaultDialer.Dial(url, header) + + dialer := websocket.DefaultDialer + dialer.EnableCompression = true + conn, _, err := dialer.Dial(url, header) if err != nil { return nil, err } From 53c906c04ee4c2aa952401d302342494b7c3f484 Mon Sep 17 00:00:00 2001 From: minhaj-shakeel Date: Tue, 23 Feb 2021 13:50:45 +0530 Subject: [PATCH 5/5] change go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b4894e84b59..56d512150ba 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/dgraph-io/dgo/v200 v200.0.0-20210212152539-e0a5bde40ba2 github.com/dgraph-io/gqlgen v0.13.2 github.com/dgraph-io/gqlparser/v2 v2.1.5 - github.com/dgraph-io/graphql-transport-ws v0.0.0-20210215165829-1ea6c958d0a3 + github.com/dgraph-io/graphql-transport-ws v0.0.0-20210223074046-e5b8b80bb4ed github.com/dgraph-io/ristretto v0.0.4-0.20210205182321-f8e4908e34d1 github.com/dgraph-io/simdjson-go v0.3.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible