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(aws-certificatemanager): allow users to specify region for DNS certificates #2626

Merged
merged 1 commit into from
May 28, 2019
Merged

feat(aws-certificatemanager): allow users to specify region for DNS certificates #2626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions ...cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ let report = function (event, context, responseStatus, physicalResourceId, respo
* @param {string} hostedZoneId the Route53 Hosted Zone ID
* @returns {string} Validated certificate ARN
*/
const requestCertificate = async function (requestId, domainName, subjectAlternativeNames, hostedZoneId) {
const requestCertificate = async function (requestId, domainName, subjectAlternativeNames, hostedZoneId, region) {
const crypto = require('crypto');
const acm = new aws.ACM();
const acm = new aws.ACM({region});
CaerusKaru marked this conversation as resolved.
Show resolved Hide resolved
const route53 = new aws.Route53();
if (waiter) {
// Used by the test suite, since waiters aren't mockable yet
Expand Down Expand Up @@ -157,8 +157,8 @@ const requestCertificate = async function (requestId, domainName, subjectAlterna
*
* @param {string} arn The certificate ARN
*/
const deleteCertificate = async function (arn) {
const acm = new aws.ACM();
const deleteCertificate = async function (arn, region) {
const acm = new aws.ACM({region});

console.log(`Deleting certificate ${arn}`);

Expand Down Expand Up @@ -189,7 +189,8 @@ exports.certificateRequestHandler = async function (event, context) {
event.RequestId,
event.ResourceProperties.DomainName,
event.ResourceProperties.SubjectAlternativeNames,
event.ResourceProperties.HostedZoneId
event.ResourceProperties.HostedZoneId,
event.ResourceProperties.Region,
);
responseData.Arn = physicalResourceId = certificateArn;
break;
Expand All @@ -198,7 +199,7 @@ exports.certificateRequestHandler = async function (event, context) {
// If the resource didn't create correctly, the physical resource ID won't be the
// certificate ARN, so don't try to delete it in that case.
if (physicalResourceId.startsWith('arn:')) {
await deleteCertificate(physicalResourceId);
await deleteCertificate(physicalResourceId, event.ResourceProperties.Region);
}
break;
default:
Expand Down
18 changes: 14 additions & 4 deletions ...certificatemanager/lambda-packages/dns_validated_certificate_handler/test/handler.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ describe('DNS Validated Certificate Handler', () => {
ResourceProperties: {
DomainName: testDomainName,
SubjectAlternativeNames: [],
HostedZoneId: testHostedZoneId
HostedZoneId: testHostedZoneId,
Region: 'us-east-1',
}
})
.expectResolve(() => {
Expand Down Expand Up @@ -138,7 +139,10 @@ describe('DNS Validated Certificate Handler', () => {
.event({
RequestType: 'Delete',
RequestId: testRequestId,
PhysicalResourceId: testCertificateArn
PhysicalResourceId: testCertificateArn,
ResourceProperties: {
Region: 'us-east-1',
}
})
.expectResolve(() => {
sinon.assert.calledWith(deleteCertificateFake, sinon.match({
Expand All @@ -162,7 +166,10 @@ describe('DNS Validated Certificate Handler', () => {
.event({
RequestType: 'Delete',
RequestId: testRequestId,
PhysicalResourceId: testCertificateArn
PhysicalResourceId: testCertificateArn,
ResourceProperties: {
Region: 'us-east-1',
}
})
.expectResolve(() => {
sinon.assert.calledWith(deleteCertificateFake, sinon.match({
Expand All @@ -186,7 +193,10 @@ describe('DNS Validated Certificate Handler', () => {
.event({
RequestType: 'Delete',
RequestId: testRequestId,
PhysicalResourceId: testCertificateArn
PhysicalResourceId: testCertificateArn,
ResourceProperties: {
Region: 'us-east-1',
}
})
.expectResolve(() => {
sinon.assert.calledWith(deleteCertificateFake, sinon.match({
Expand Down
11 changes: 10 additions & 1 deletion packages/@aws-cdk/aws-certificatemanager/lib/dns-validated-certificate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ export interface DnsValidatedCertificateProps extends CertificateProps {
* must be authoritative for the domain name specified in the Certificate Request.
*/
readonly hostedZone: route53.IHostedZone;
/**
* AWS region that will host the certificate. This is needed especially
* for certificates used for CloudFront distributions, which require the region
* to be us-east-1.
*
* @default the region the stack is deployed in.
*/
readonly region?: string;
}

/**
Expand Down Expand Up @@ -64,7 +72,8 @@ export class DnsValidatedCertificate extends cdk.Construct implements ICertifica
properties: {
DomainName: props.domainName,
SubjectAlternativeNames: props.subjectAlternativeNames,
HostedZoneId: this.hostedZoneId
HostedZoneId: this.hostedZoneId,
Region: props.region,
}
});

Expand Down