diff --git a/packages/aws-rfdk/lib/core/lib/imported-acm-certificate.ts b/packages/aws-rfdk/lib/core/lib/imported-acm-certificate.ts index 541653b41..c8855e1e1 100644 --- a/packages/aws-rfdk/lib/core/lib/imported-acm-certificate.ts +++ b/packages/aws-rfdk/lib/core/lib/imported-acm-certificate.ts @@ -139,7 +139,7 @@ export class ImportedAcmCertificate extends Construct implements ICertificate { layers: [ openSslLayer ], retryAttempts: 0, runtime: Runtime.NODEJS_12_X, - timeout: Duration.seconds(30), + timeout: Duration.minutes(5), }); this.database.grantReadWriteData(lambda); diff --git a/packages/aws-rfdk/lib/lambdas/nodejs/x509-certificate/acm-handlers.ts b/packages/aws-rfdk/lib/lambdas/nodejs/x509-certificate/acm-handlers.ts index a61f26816..8d5078bf3 100644 --- a/packages/aws-rfdk/lib/lambdas/nodejs/x509-certificate/acm-handlers.ts +++ b/packages/aws-rfdk/lib/lambdas/nodejs/x509-certificate/acm-handlers.ts @@ -84,9 +84,10 @@ export class AcmCertificateImporter extends DynamoBackedCustomResource { const arn: string = resource.ARN; let inUseByResources = []; const backoffGenerator = new BackoffGenerator({ - base: 200, + base: 1000, jitterDivisor: 4, maxAttempts, + maxIntervalMs: 30000, }); do { @@ -97,6 +98,7 @@ export class AcmCertificateImporter extends DynamoBackedCustomResource { inUseByResources = cert!.InUseBy || []; if (inUseByResources.length) { + console.log(`Sleeping -- Resource ${arn} in use by ${inUseByResources.join(', ')}`); await backoffGenerator.backoff(); } else { break;