implement suggested changes from reviewer

aws · Jun 8, 2020 · d686dc8 · d686dc8
1 parent 77988c6
commit d686dc8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/packages/@aws-cdk/aws-eks/lib/helm-chart.ts b/packages/@aws-cdk/aws-eks/lib/helm-chart.ts
@@ -85,6 +85,11 @@ export class HelmChart extends Construct {
 
     const provider = props.cluster._kubectlProvider;
 
+    const timeout = props.timeout?.toSeconds();
+    if (timeout && timeout > 900) {
+      throw new Error('Helm chart timeout cannot be higher than 15 minutes.');
+    }
+
     new CustomResource(this, 'Resource', {
       serviceToken: provider.serviceToken,
       resourceType: HelmChart.RESOURCE_TYPE,
@@ -95,7 +100,7 @@ export class HelmChart extends Construct {
         Chart: props.chart,
         Version: props.version,
         Wait: props.wait || false,
-        Timeout: props.timeout && props.timeout.toSeconds(),
+        Timeout: timeout,
         Values: (props.values ? stack.toJsonString(props.values) : undefined),
         Namespace: props.namespace || 'default',
         Repository: props.repository,

diff --git a/packages/@aws-cdk/custom-resources/lib/provider-framework/runtime/outbound.ts b/packages/@aws-cdk/custom-resources/lib/provider-framework/runtime/outbound.ts
@@ -1,9 +1,18 @@
 /* istanbul ignore file */
 // eslint-disable-next-line import/no-extraneous-dependencies
 import * as AWS from 'aws-sdk';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { ConfigurationOptions } from 'aws-sdk/lib/config';
 import * as https from 'https';
 import * as consts from './consts';
 
+// In order to honor the overall maximum timeout set for the target process,
+// the default 2 minutes from AWS SDK has to be overriden:
+// https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Config.html#httpOptions-property
+const awsSdkConfig: ConfigurationOptions = {
+  httpOptions: { timeout: consts.FRAMEWORK_HANDLER_TIMEOUT },
+};
+
 async function defaultHttpRequest(options: https.RequestOptions, responseBody: string) {
   return new Promise((resolve, reject) => {
     try {
@@ -22,21 +31,17 @@ let lambda: AWS.Lambda;
 
 async function defaultStartExecution(req: AWS.StepFunctions.StartExecutionInput): Promise<AWS.StepFunctions.StartExecutionOutput> {
   if (!sfn) {
-    sfn = new AWS.StepFunctions();
+    sfn = new AWS.StepFunctions(awsSdkConfig);
   }
 
-  sfn.config.update({httpOptions: { timeout: consts.FRAMEWORK_HANDLER_TIMEOUT }});
-
   return await sfn.startExecution(req).promise();
 }
 
 async function defaultInvokeFunction(req: AWS.Lambda.InvocationRequest): Promise<AWS.Lambda.InvocationResponse> {
   if (!lambda) {
-    lambda = new AWS.Lambda();
+    lambda = new AWS.Lambda(awsSdkConfig);
   }
 
-  lambda.config.update({httpOptions: { timeout: consts.FRAMEWORK_HANDLER_TIMEOUT }});
-
   return await lambda.invoke(req).promise();
 }