Skip to content

Commit 23fd85c

Browse files
committed
handle nullable domainName field
1 parent 5425f45 commit 23fd85c

12 files changed

+70
-0
lines changed

Diff for: packages/parser/src/schemas/appsync.ts

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ const AppSyncResolverSchema = z.object({
110110
identity: z.optional(AppSyncIdentity),
111111
source: z.record(z.any()).nullable(),
112112
request: z.object({
113+
domainName: z.string().nullable(),
113114
headers: z.record(z.string()),
114115
}),
115116
info: z.object({

Diff for: packages/parser/tests/events/appsync/cognito-identity-group.json

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"username": "jdoe"
3434
},
3535
"request": {
36+
"domainName": null,
3637
"headers": {
3738
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
3839
"cloudfront-viewer-country": "US",

Diff for: packages/parser/tests/events/appsync/cognito-identity-null-group.json

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"username": "jdoe"
3434
},
3535
"request": {
36+
"domainName": null,
3637
"headers": {
3738
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
3839
"cloudfront-viewer-country": "US",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"arguments": {
3+
"id": "my identifier"
4+
},
5+
"source": {
6+
"name": "Value",
7+
"nested": {
8+
"name": "value",
9+
"list": []
10+
}
11+
},
12+
"request": {
13+
"domainName": "mycustomdomain.example.com",
14+
"headers": {
15+
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
16+
"cloudfront-viewer-country": "US",
17+
"cloudfront-is-tablet-viewer": "false",
18+
"via": "2.0 xxxxxxxxxxxxxxxx.cloudfront.net (CloudFront)",
19+
"cloudfront-forwarded-proto": "https",
20+
"origin": "https://us-west-1.console.aws.amazon.com",
21+
"content-length": "217",
22+
"accept-language": "en-US,en;q=0.9",
23+
"host": "xxxxxxxxxxxxxxxx.appsync-api.us-west-1.amazonaws.com",
24+
"x-forwarded-proto": "https",
25+
"user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.83 Safari/537.36",
26+
"accept": "*/*",
27+
"cloudfront-is-mobile-viewer": "false",
28+
"cloudfront-is-smarttv-viewer": "false",
29+
"accept-encoding": "gzip, deflate, br",
30+
"referer": "https://us-west-1.console.aws.amazon.com/appsync/home?region=us-west-1",
31+
"content-type": "application/json",
32+
"sec-fetch-mode": "cors",
33+
"x-amz-cf-id": "3aykhqlUwQeANU-HGY7E_guV5EkNeMMtwyOgiA==",
34+
"x-amzn-trace-id": "Root=1-5f512f51-fac632066c5e848ae714",
35+
"authorization": "eyJraWQiOiJScWFCSlJqYVJlM0hrSnBTUFpIcVRXazNOW...",
36+
"sec-fetch-dest": "empty",
37+
"x-amz-user-agent": "AWS-Console-AppSync/",
38+
"cloudfront-is-desktop-viewer": "true",
39+
"sec-fetch-site": "cross-site",
40+
"x-forwarded-port": "443"
41+
}
42+
},
43+
"prev": {
44+
"result": {
45+
"field1": "value1"
46+
}
47+
},
48+
"info": {
49+
"selectionSetList": ["id", "field1", "field2"],
50+
"selectionSetGraphQL": "{\n id\n field1\n field2\n}",
51+
"parentTypeName": "Mutation",
52+
"fieldName": "createSomething",
53+
"variables": {}
54+
},
55+
"stash": {}
56+
}

Diff for: packages/parser/tests/events/appsync/iam-identity-cognito.json

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"username": "AROAXYKJUOW6FHGUSK5FA:username"
2121
},
2222
"request": {
23+
"domainName": null,
2324
"headers": {
2425
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
2526
"cloudfront-viewer-country": "US",

Diff for: packages/parser/tests/events/appsync/iam-identity-no-cognito.json

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"username": "AROAXYKJUOW6FHGUSK5FA:username"
2121
},
2222
"request": {
23+
"domainName": null,
2324
"headers": {
2425
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
2526
"cloudfront-viewer-country": "US",

Diff for: packages/parser/tests/events/appsync/lambda-identity.json

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
}
1616
},
1717
"request": {
18+
"domainName": null,
1819
"headers": {
1920
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
2021
"cloudfront-viewer-country": "US",

Diff for: packages/parser/tests/events/appsync/no-identity.json

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
}
1111
},
1212
"request": {
13+
"domainName": null,
1314
"headers": {
1415
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
1516
"cloudfront-viewer-country": "US",

Diff for: packages/parser/tests/events/appsync/null-prev.json

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
}
1111
},
1212
"request": {
13+
"domainName": null,
1314
"headers": {
1415
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
1516
"cloudfront-viewer-country": "US",

Diff for: packages/parser/tests/events/appsync/null-source.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
},
55
"source": null,
66
"request": {
7+
"domainName": null,
78
"headers": {
89
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
910
"cloudfront-viewer-country": "US",

Diff for: packages/parser/tests/events/appsync/oidc-identity.json

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"sub": "sub"
1818
},
1919
"request": {
20+
"domainName": null,
2021
"headers": {
2122
"x-forwarded-for": "1.1.1.1, 2.2.2.2",
2223
"cloudfront-viewer-country": "US",

Diff for: packages/parser/tests/unit/schema/appsync.test.ts

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ describe('AppSync Resolver Schemas', () => {
3333
name: 'should parse resolver event with null prev',
3434
filename: 'null-prev',
3535
},
36+
{
37+
name: 'should parse resolver event with custom domain name',
38+
filename: 'custom-domain-name',
39+
},
3640
{
3741
name: 'should parse resolver event with cognito identity and rbac groups',
3842
filename: 'cognito-identity-group',

0 commit comments

Comments
 (0)