fix(custom-resources): increase and expose timeout for AwsCustomResou…

…rce (#4623) * fix(custom-resources): increase and expose timeout for AwsCustomResource Default timeout is now 6 seconds. Closes #3272 * change default to 30s
aws · Oct 23, 2019 · f17f809 · f17f809
1 parent 8b598c4
commit f17f809
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 2 deletions.
diff --git a/packages/@aws-cdk/custom-resources/lib/aws-custom-resource.ts b/packages/@aws-cdk/custom-resources/lib/aws-custom-resource.ts
@@ -124,6 +124,13 @@ export interface AwsCustomResourceProps {
    * @default extract the permissions from the calls
    */
   readonly policyStatements?: iam.PolicyStatement[];
+
+  /**
+   * The timeout for the Lambda function implementing this custom resource.
+   *
+   * @default Duration.seconds(30)
+   */
+  readonly timeout?: cdk.Duration
 }
 
 export class AwsCustomResource extends cdk.Construct {
@@ -147,7 +154,8 @@ export class AwsCustomResource extends cdk.Construct {
       runtime: lambda.Runtime.NODEJS_10_X,
       handler: 'index.handler',
       uuid: '679f53fa-c002-430c-b0da-5b7982bd2287',
-      lambdaPurpose: 'AWS'
+      lambdaPurpose: 'AWS',
+      timeout: props.timeout || cdk.Duration.seconds(30),
     });
 
     if (props.policyStatements) {

diff --git a/packages/@aws-cdk/custom-resources/test/integ.aws-custom-resource.expected.json b/packages/@aws-cdk/custom-resources/test/integ.aws-custom-resource.expected.json
@@ -152,7 +152,8 @@
             "Arn"
           ]
         },
-        "Runtime": "nodejs10.x"
+        "Runtime": "nodejs10.x",
+        "Timeout": 30
       },
       "DependsOn": [
         "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleDefaultPolicyD28E1A5E",

diff --git a/packages/@aws-cdk/custom-resources/test/test.aws-custom-resource.ts b/packages/@aws-cdk/custom-resources/test/test.aws-custom-resource.ts
@@ -223,4 +223,47 @@ export = {
 
     test.done();
   },
+
+  'timeout defaults to 30 seconds'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+
+    // WHEN
+    new AwsCustomResource(stack, 'AwsSdk', {
+      onCreate: {
+        service: 'service',
+        action: 'action',
+        physicalResourceId: 'id'
+      }
+    });
+
+    // THEN
+    expect(stack).to(haveResource('AWS::Lambda::Function', {
+      Timeout: 30
+    }));
+
+    test.done();
+  },
+
+  'can specify timeout'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+
+    // WHEN
+    new AwsCustomResource(stack, 'AwsSdk', {
+      onCreate: {
+        service: 'service',
+        action: 'action',
+        physicalResourceId: 'id'
+      },
+      timeout: cdk.Duration.minutes(15)
+    });
+
+    // THEN
+    expect(stack).to(haveResource('AWS::Lambda::Function', {
+      Timeout: 900
+    }));
+
+    test.done();
+  }
 };