updating version

hypermodeinc · Mar 22, 2024 · 07328ba · 07328ba
1 parent 5ef9ae6
commit 07328ba
Show file tree

Hide file tree

Showing 7 changed files with 1,289 additions and 8 deletions.
diff --git a/dgraphtest/config.go b/dgraphtest/config.go
@@ -115,12 +115,18 @@ type ClusterConfig struct {
 	uidLease              int
 	portOffset            int // exposed port offset for grpc/http port for both alpha/zero
 	bulkOutDir            string
+	lambdaURL             string
 	featureFlags          []string
 	customPlugins         bool
 	snapShotAfterEntries  uint64
 	snapshotAfterDuration time.Duration
 }
 
+func (cc ClusterConfig) WithGraphqlLambdaURL(url string) ClusterConfig {
+	cc.lambdaURL = url
+	return cc
+}
+
 // NewClusterConfig generates a default ClusterConfig
 func NewClusterConfig() ClusterConfig {
 	prefix := fmt.Sprintf("dgraphtest-%d", rand.NewSource(time.Now().UnixNano()).Int63()%1000000)

diff --git a/dgraphtest/dgraph.go b/dgraphtest/dgraph.go
@@ -252,6 +252,10 @@ func (a *alpha) cmd(c *LocalCluster) []string {
 			"--telemetry=reports=false;sentry=false;")
 	}
 
+	if c.conf.lambdaURL != "" {
+		acmd = append(acmd, fmt.Sprintf(`--graphql=lambda-url=%s`, c.conf.lambdaURL))
+	}
+
 	if c.conf.acl {
 		if c.lowerThanV21 {
 			acmd = append(acmd, fmt.Sprintf(`--acl_secret_file=%s`, aclSecretMountPath),

diff --git a/dgraphtest/paths.go b/dgraphtest/paths.go
@@ -51,9 +51,9 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
-	if err := ensureDgraphClone(); err != nil {
-		panic(err)
-	}
+	//if err := ensureDgraphClone(); err != nil {
+	//	panic(err)
+	//}
 
 	log.Printf("[INFO] baseRepoDir: %v", baseRepoDir)
 	log.Printf("[INFO] repoDir: %v", repoDir)

diff --git a/go.mod b/go.mod
@@ -6,6 +6,8 @@ replace sourcegraph.com/sourcegraph/appdash => github.com/sourcegraph/appdash v0
 
 replace sourcegraph.com/sourcegraph/appdash-data => github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67
 
+replace github.com/dgraph-io/gqlparser/v2 => /home/harshil/Projects/gqlparser
+
 require (
 	contrib.go.opencensus.io/exporter/jaeger v0.1.0
 	contrib.go.opencensus.io/exporter/prometheus v0.1.0

diff --git a/go.sum b/go.sum
@@ -151,9 +151,6 @@ github.com/dgraph-io/dgo/v230 v230.0.2-0.20240314155021-7b8d289e37f3 h1:SmlpAiFh
 github.com/dgraph-io/dgo/v230 v230.0.2-0.20240314155021-7b8d289e37f3/go.mod h1:N63npbH9PPVitTNUW4xlT66LNsMhqjuz57ZvgUmgATI=
 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/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=

diff --git a/graphql/schema/rules.go b/graphql/schema/rules.go
@@ -32,8 +32,8 @@ import (
 )
 
 const (
-	baseRules         = 0
-	listCoercionRules = 1000
+	baseRules         = -2
+	listCoercionRules = -1
 )
 
 func init() {