feat(GraphQL): Webhooks on add/update/delete mutations (GRAPHQL-1045) #7494

abhimanyusinghgaur · 2021-03-01T08:40:40Z

Please see the RFC for more details.

This change is

…ebhooks # Conflicts: # graphql/schema/wrappers.go

pawanrawal

Reviewed 74 of 74 files at r1.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @abhimanyusinghgaur, @manishrjain, @vmrajas, and @vvbalaji-dgraph)

graphql/resolve/mutation_rewriter.go, line 819 at r1 (raw file):

	uids := make([]uint64, 0, len(uidSlice))

	if len(uidSlice) > 0 {

this if block is not required

graphql/resolve/webhook.go, line 110 at r1 (raw file):

	b, err := json.Marshal(payload)
	if err != nil {
		// don't care to send the payload if there are JSON marshalling errors

We should log the error using glog.Error in V3 level

graphql/resolve/webhook.go, line 117 at r1 (raw file):

	headers.Set("Content-Type", "application/json")
	// don't care for the response/errors, if any.
	_, _ = schema.MakeHttpRequest(nil, http.MethodPost, x.Config.GraphQL.GetString("lambda-url"),

let's log the error if its non-nil or if response code is not a success

pawanrawal

Also add a way to override this behavior using a key that is part of extensions.

Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @abhimanyusinghgaur, @manishrjain, @vmrajas, and @vvbalaji-dgraph)

…ebhooks # Conflicts: # graphql/e2e/schema/apollo_service_response.graphql # graphql/resolve/mutation_rewriter.go # graphql/schema/dgraph_schemagen_test.yml # graphql/schema/gqlschema.go # graphql/schema/gqlschema_test.yml # graphql/schema/testdata/apolloservice/output/auth-directive.graphql # graphql/schema/testdata/apolloservice/output/custom-directive.graphql # graphql/schema/testdata/apolloservice/output/extended-types.graphql # graphql/schema/testdata/apolloservice/output/generate-directive.graphql # graphql/schema/wrappers.go

…ebhooks

vmrajas

LGTM
The mutation_rewriter.go part looks good to me.
Just added few nits.

vmrajas · 2021-03-18T18:15:33Z

graphql/e2e/common/common.go

-	t.Run("entitites Query on extended type with key field of type String", entitiesQueryWithKeyFieldOfTypeString)
-	t.Run("entitites Query on extended type with key field of type Int", entitiesQueryWithKeyFieldOfTypeInt)
+	t.Run("entities Query on extended type with key field of type String", entitiesQueryWithKeyFieldOfTypeString)
+	t.Run("entities Query on extended type with key field of type Int", entitiesQueryWithKeyFieldOfTypeInt)


vmrajas · 2021-03-18T18:17:38Z

graphql/e2e/directives/schema.graphql

@@ -341,7 +341,8 @@ type Region {
    district: District
 }

-type District {
+type District @lambdaOnMutate(add: true, update: true, delete: true) {
+	dgId: ID!


nit: Indentation seems off. Likely due to different tab spaces being used.

vmrajas · 2021-03-18T18:18:05Z

graphql/e2e/directives/script.js

+self.addWebHookResolvers({
+    "District.add": districtWebhook,
+    "District.update": districtWebhook,
+    "District.delete": districtWebhook,
 })


nit: Line at end of file.

vmrajas · 2021-03-18T18:18:51Z

graphql/e2e/normal/script.js

+self.addWebHookResolvers({
+    "District.add": districtWebhook,
+    "District.update": districtWebhook,
+    "District.delete": districtWebhook,
 })


nit: Extra line at end of file.

vmrajas · 2021-03-18T18:21:34Z

graphql/resolve/mutation.go

 			if err != nil {
-				glog.Errorf("Error occured while aborting transaction: %s", err)
+				glog.Errorf("Error occurred while aborting transaction: %s", err)


vmrajas · 2021-03-18T18:22:33Z

graphql/resolve/mutation_rewriter.go

@@ -263,12 +263,12 @@ func (xidMetadata *xidMetadata) isDuplicateXid(atTopLevel bool, xidVar string,
 // simply ignored.
 // If it is found out that the Person with id 0x123 does not exist, the corresponding
 // mutation will fail.
-func (mrw *AddRewriter) RewriteQueries(
+func (arw *AddRewriter) RewriteQueries(


vmrajas · 2021-03-18T18:27:04Z

graphql/schema/gqlschema_test.yml

+      type Question implements Post @lambdaOnMutate(add: true, update: true) {
+        id: ID!
+        questionText: String
+      }


nit: Line at end of file

abhimanyusinghgaur

Reviewable status: 54 of 91 files reviewed, 6 unresolved discussions (waiting on @manishrjain, @pawanrawal, @vmrajas, and @vvbalaji-dgraph)

graphql/resolve/mutation_rewriter.go, line 819 at r1 (raw file):

Previously, pawanrawal (Pawan Rawal) wrote…

this if block is not required

Done.

graphql/resolve/webhook.go, line 110 at r1 (raw file):

Previously, pawanrawal (Pawan Rawal) wrote…

We should log the error using glog.Error in V3 level

Done.

graphql/resolve/webhook.go, line 117 at r1 (raw file):

Previously, pawanrawal (Pawan Rawal) wrote…

let's log the error if its non-nil or if response code is not a success

Done.

…#7494) Please see the [RFC](https://discuss.dgraph.io/t/webhook-lambda-on-add-update-delete-mutations/12904) for more details. (cherry picked from commit 348119e) # Conflicts: # graphql/schema/testdata/schemagen/output/interface-with-id-directive-and-ID-field.graphql

…#7494) (#7616) Please see the [RFC](https://discuss.dgraph.io/t/webhook-lambda-on-add-update-delete-mutations/12904) for more details. (cherry picked from commit 348119e) # Conflicts: # graphql/schema/testdata/schemagen/output/interface-with-id-directive-and-ID-field.graphql

abhimanyusinghgaur added 4 commits February 24, 2021 19:04

add schema for @lambdaOnMutate

102eac0

build and send webhook events

6e78391

Merge branch 'master' of github.com:dgraph-io/dgraph into abhimanyu/w…

e90dd49

…ebhooks # Conflicts: # graphql/schema/wrappers.go

add a validation

6de9a0a

abhimanyusinghgaur requested review from pawanrawal and vmrajas March 1, 2021 08:40

abhimanyusinghgaur requested review from manishrjain and vvbalaji-dgraph as code owners March 1, 2021 08:40

github-actions bot added the area/graphql Issues related to GraphQL support on Dgraph. label Mar 1, 2021

abhimanyusinghgaur added 6 commits March 1, 2021 14:36

fix schema tests

a65793d

add some schema tests

cfc7e30

bit more validation

ea4d815

fix typename

1b6783b

add json header

b84d6e2

add commitTs

446a15f

pawanrawal approved these changes Mar 2, 2021

View reviewed changes

pawanrawal reviewed Mar 2, 2021

View reviewed changes

vardhanapoorv mentioned this pull request Mar 11, 2021

feat: Add support for webhook dgraph-io/dgraph-lambda#14

Merged

abhimanyusinghgaur added 8 commits March 16, 2021 14:46

fix merge

029885d

add test

ed982d8

fix test

3da5d9a

make lambda-url namespace aware

9cccc42

skip the test for now

ff9c91b

Merge branch 'master' of github.com:dgraph-io/dgraph into abhimanyu/w…

4ee96c4

…ebhooks

fix tests

629d0a4

vmrajas approved these changes Mar 18, 2021

View reviewed changes

address nits

4b34c44

abhimanyusinghgaur commented Mar 19, 2021

View reviewed changes

abhimanyusinghgaur merged commit 348119e into master Mar 19, 2021

abhimanyusinghgaur mentioned this pull request Mar 19, 2021

cherry-pick v21.03: feat(GraphQL): Webhooks on add/update/delete mutations (GRAPHQL-1045)… #7616

Merged

abhimanyusinghgaur deleted the abhimanyu/webhooks branch March 19, 2021 11:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(GraphQL): Webhooks on add/update/delete mutations (GRAPHQL-1045) #7494

feat(GraphQL): Webhooks on add/update/delete mutations (GRAPHQL-1045) #7494

abhimanyusinghgaur commented Mar 1, 2021 •

edited by manishrjain

Loading

pawanrawal left a comment

pawanrawal left a comment

vmrajas left a comment

vmrajas Mar 18, 2021

vmrajas Mar 18, 2021

vmrajas Mar 18, 2021

vmrajas Mar 18, 2021

vmrajas Mar 18, 2021

vmrajas Mar 18, 2021

vmrajas Mar 18, 2021

abhimanyusinghgaur left a comment

feat(GraphQL): Webhooks on add/update/delete mutations (GRAPHQL-1045) #7494

feat(GraphQL): Webhooks on add/update/delete mutations (GRAPHQL-1045) #7494

Conversation

abhimanyusinghgaur commented Mar 1, 2021 • edited by manishrjain Loading

pawanrawal left a comment

Choose a reason for hiding this comment

pawanrawal left a comment

Choose a reason for hiding this comment

vmrajas left a comment

Choose a reason for hiding this comment

vmrajas Mar 18, 2021

Choose a reason for hiding this comment

vmrajas Mar 18, 2021

Choose a reason for hiding this comment

vmrajas Mar 18, 2021

Choose a reason for hiding this comment

vmrajas Mar 18, 2021

Choose a reason for hiding this comment

vmrajas Mar 18, 2021

Choose a reason for hiding this comment

vmrajas Mar 18, 2021

Choose a reason for hiding this comment

vmrajas Mar 18, 2021

Choose a reason for hiding this comment

abhimanyusinghgaur left a comment

Choose a reason for hiding this comment

abhimanyusinghgaur commented Mar 1, 2021 •

edited by manishrjain

Loading