-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(graphql): upgrade gqlparser to v2.2.2
CLOSES DGRAPHCORE-329 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.
- Loading branch information
1 parent
fd6c0be
commit 5c3e251
Showing
5 changed files
with
88 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| //go:build integration2 | ||
|
|
||
| /* | ||
| * Copyright 2023 Dgraph Labs, Inc. and Contributors * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/dgraph-io/dgraph/dgraphtest" | ||
| "github.com/dgraph-io/dgraph/x" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestGraphqlSchema(t *testing.T) { | ||
| conf := dgraphtest.NewClusterConfig().WithNumAlphas(2).WithNumZeros(1). | ||
| WithACL(time.Hour).WithReplicas(1). | ||
| WithGraphqlLambdaURL("http://127.0.0.1/lambda") // dummy URL | ||
| c, err := dgraphtest.NewLocalCluster(conf) | ||
| require.NoError(t, err) | ||
| defer func() { c.Cleanup(t.Failed()) }() | ||
| require.NoError(t, c.Start()) | ||
|
|
||
| hc, err := c.HTTPClient() | ||
| require.NoError(t, err) | ||
| require.NoError(t, hc.LoginIntoNamespace(dgraphtest.DefaultUser, | ||
| dgraphtest.DefaultPassword, x.GalaxyNamespace)) | ||
|
|
||
| //nolint:lll | ||
| sch := `type City @auth( | ||
| query: { or: [ | ||
| { rule: "{$Role: { eq: \"ADMIN\" }}"}, | ||
| { rule: """ | ||
| query($CITYID: String!) { | ||
| queryCity (filter: { | ||
| id: { eq: $CITYID } | ||
| }){ | ||
| name | ||
| } | ||
| }""" | ||
| }] | ||
| }, | ||
| add: { rule: "{$Role: { eq: \"ADMIN\" }}"}, | ||
| update: { rule: "{$Role: { eq: \"ADMIN\" }}"}, | ||
| ){ | ||
| id: ID! | ||
| name: String! @search(by: [hash, trigram]) | ||
| state: String! | ||
| country: String! @search(by: [hash, trigram]) | ||
| current_weather: String! @lambda | ||
| desc: String! @lambda | ||
| } | ||
| type Query { | ||
| citiesByName(name: String!): [City] @lambda | ||
| } | ||
| # Dgraph.Authorization {"VerificationKey":"secretkey","Header":"X-Test-Auth","Namespace":"https://xyz.io/jwt/claims","Algo":"HS256","Audience":["aud"]}` | ||
| require.NoError(t, hc.UpdateGQLSchema(sch)) | ||
| } |