Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(appsync): support custom domain mappings #19368

Merged
merged 11 commits into from
Mar 18, 2022
Merged

feat(appsync): support custom domain mappings #19368

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8c82b2a
feat(aws-appsync): enable support for custom domain mappings
moofish32 Mar 12, 2022
1419f27
chore: update readme
moofish32 Mar 12, 2022
87a87c1
Apply suggestions from code review
cgarvis Mar 17, 2022
9bf500b
Merge branch 'master' into feat/aws-appsync-custom-domain
cgarvis Mar 17, 2022
60ca733
Fix linting warnings and errors
cgarvis Mar 17, 2022
42c379c
Fix whitespacing
cgarvis Mar 17, 2022
96ca54c
Fix documentation
cgarvis Mar 17, 2022
ed9cdb5
try to fix readme example
kaizencc Mar 17, 2022
831fcf7
another fix
kaizencc Mar 17, 2022
0856ecf
last minor changes
kaizencc Mar 17, 2022
64c1dd7
Merge branch 'master' into feat/aws-appsync-custom-domain
mergify[bot] Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix linting warnings and errors
  • Loading branch information
@cgarvis
cgarvis committed Mar 17, 2022
commit 60ca733358cd8ddf823db5d55b4b8bdd1f7201ca
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-appsync/lib/graphqlapi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,7 @@ export class GraphqlApi extends GraphqlApiBase {
certificateArn: props.domainName.certificate.certificateArn,
description: `domain for ${this.name} at ${this.graphqlUrl}`,
});

new CfnDomainNameApiAssociation(this, 'DomainAssociation', {
domainName: props.domainName.domainName,
apiId: this.apiId,
Expand Down
10 changes: 5 additions & 5 deletions packages/@aws-cdk/aws-appsync/test/appsync.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as path from 'path';
import { Template } from '@aws-cdk/assertions';
import { Certificate } from '@aws-cdk/aws-certificatemanager';
import * as iam from '@aws-cdk/aws-iam';
import * as cdk from '@aws-cdk/core';
import * as appsync from '../lib';
import { Certificate } from '@aws-cdk/aws-certificatemanager';

let stack: cdk.Stack;
let api: appsync.GraphqlApi;
Expand Down Expand Up @@ -178,16 +178,16 @@ test('appsync GraphqlApi should be configured with custom domain when specified'
// THEN
Template.fromStack(stack).hasResourceProperties('AWS::AppSync::DomainNameApiAssociation', {
ApiId: {
"Fn::GetAtt": [
"apicustomcwlogsrole508EAC74",
"ApiId",
'Fn::GetAtt': [
'apicustomcwlogsrole508EAC74',
'ApiId',
],
},
DomainName: domainName,
});

Template.fromStack(stack).hasResourceProperties('AWS::AppSync::DomainName', {
CertificateArn: { "Ref": "AcmCertificate49D3B5AF" },
CertificateArn: { Ref: 'AcmCertificate49D3B5AF' },
DomainName: domainName,
});
});