fix(custom-resources): default timeout of 2 minutes for AwsCustomReso…

…urce (#5658) 60 seconds turns out to be a bit on the short side when installing the latest SDK. Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
aws · Jan 6, 2020 · e0c41d4 · e0c41d4
1 parent 87befa6
commit e0c41d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/@aws-cdk/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts b/packages/@aws-cdk/custom-resources/lib/aws-custom-resource/aws-custom-resource.ts
@@ -156,7 +156,7 @@ export interface AwsCustomResourceProps {
   /**
    * The timeout for the Lambda function implementing this custom resource.
    *
-   * @default Duration.seconds(60)
+   * @default Duration.minutes(2)
    */
   readonly timeout?: cdk.Duration
 }
@@ -185,7 +185,7 @@ export class AwsCustomResource extends cdk.Construct implements iam.IGrantable {
       handler: 'index.handler',
       uuid: '679f53fa-c002-430c-b0da-5b7982bd2287',
       lambdaPurpose: 'AWS',
-      timeout: props.timeout || cdk.Duration.seconds(60),
+      timeout: props.timeout || cdk.Duration.minutes(2),
       role: props.role,
     });
     this.grantPrincipal = provider.grantPrincipal;

diff --git a/packages/@aws-cdk/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts b/packages/@aws-cdk/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts
@@ -208,7 +208,7 @@ test('encodes booleans', () => {
   });
 });
 
-test('timeout defaults to 30 seconds', () => {
+test('timeout defaults to 2 minutes', () => {
   // GIVEN
   const stack = new cdk.Stack();
 
@@ -223,7 +223,7 @@ test('timeout defaults to 30 seconds', () => {
 
   // THEN
   expect(stack).toHaveResource('AWS::Lambda::Function', {
-    Timeout: 60
+    Timeout: 120
   });
 });
 

diff --git a/...aws-cdk/custom-resources/test/aws-custom-resource/integ.aws-custom-resource.expected.json b/...aws-cdk/custom-resources/test/aws-custom-resource/integ.aws-custom-resource.expected.json
@@ -153,7 +153,7 @@
           ]
         },
         "Runtime": "nodejs12.x",
-        "Timeout": 60
+        "Timeout": 120
       },
       "DependsOn": [
         "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleDefaultPolicyD28E1A5E",