chore(graphql): upgrade gqlparser to v2.2.2 (#8917)

Seems like there was a race condition that was fixed in v2.2.2 from v2.2.1. This change upgrades gqlparser to the fixed version. CLOSES: DGRAPHCORE-329 CLOSES: DGRAPHCORE-341
hypermodeinc · Aug 1, 2023 · 5a0e0f8 · 5a0e0f8
1 parent fd6c0be
commit 5a0e0f8
Show file tree

Hide file tree

Showing 5 changed files with 1,265 additions and 3 deletions.
diff --git a/dgraphtest/config.go b/dgraphtest/config.go
@@ -94,6 +94,7 @@ type ClusterConfig struct {
 	// exposed port offset for grpc/http port for both alpha/zero
 	portOffset int
 	bulkOutDir string
+	lambdaURL  string
 }
 
 func NewClusterConfig() ClusterConfig {
@@ -180,3 +181,8 @@ func (cc ClusterConfig) WithBulkLoadOutDir(dir string) ClusterConfig {
 	cc.bulkOutDir = dir
 	return cc
 }
+
+func (cc ClusterConfig) WithGraphqlLambdaURL(url string) ClusterConfig {
+	cc.lambdaURL = url
+	return cc
+}
diff --git a/dgraphtest/dgraph.go b/dgraphtest/dgraph.go
@@ -243,6 +243,10 @@ func (a *alpha) cmd(c *LocalCluster) []string {
 	}
 	acmd = append(acmd, zeroAddrsArg)
 
+	if c.conf.lambdaURL != "" {
+		acmd = append(acmd, fmt.Sprintf(`--graphql=lambda-url=%s`, c.conf.lambdaURL))
+	}
+
 	return acmd
 }
 

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/dgraph-io/badger/v4 v4.1.0
 	github.com/dgraph-io/dgo/v230 v230.0.1
 	github.com/dgraph-io/gqlgen v0.13.2
-	github.com/dgraph-io/gqlparser/v2 v2.2.1
+	github.com/dgraph-io/gqlparser/v2 v2.2.2
 	github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15
 	github.com/dgraph-io/ristretto v0.1.1
 	github.com/dgraph-io/simdjson-go v0.3.0

diff --git a/go.sum b/go.sum
@@ -152,8 +152,8 @@ github.com/dgraph-io/dgo/v230 v230.0.1/go.mod h1:5FerO2h4LPOxR2XTkOAtqUUPaFdQ+5a
 github.com/dgraph-io/gqlgen v0.13.2 h1:TNhndk+eHKj5qE7BenKKSYdSIdOGhLqxR1rCiMso9KM=
 github.com/dgraph-io/gqlgen v0.13.2/go.mod h1:iCOrOv9lngN7KAo+jMgvUPVDlYHdf7qDwsTkQby2Sis=
 github.com/dgraph-io/gqlparser/v2 v2.1.1/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU=
-github.com/dgraph-io/gqlparser/v2 v2.2.1 h1:15msK9XEHOSrRqQO48UU+2ZTf1R1U8+tfL9H5D5/eQQ=
-github.com/dgraph-io/gqlparser/v2 v2.2.1/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU=
+github.com/dgraph-io/gqlparser/v2 v2.2.2 h1:CnxXOKL4EPguKqcGV/z4u4VoW5izUkOTIsNM6xF+0f4=
+github.com/dgraph-io/gqlparser/v2 v2.2.2/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU=
 github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15 h1:X2NRsgAtVUAp2nmTPCq+x+wTcRRrj74CEpy7E0Unsl4=
 github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ=
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=