lat minute fix to use a higher timeout and more memory

aws · Sep 6, 2023 · da2a7df · da2a7df
1 parent 4e0e725
commit da2a7df
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/...s-targets/test/aws-api/integ.aws-api.js.snapshot/aws-cdk-aws-api-target-integ.assets.json b/...s-targets/test/aws-api/integ.aws-api.js.snapshot/aws-cdk-aws-api-target-integ.assets.json
@@ -14,15 +14,15 @@
  }
  }
  },
- "d19afc04c0eb0a5a0b290bfc017b06fed4806017d03102aad8cd2d551a589804": {
+ "0aa39a2215da743f8b755eac76d55706c97c54008e0d316a8031873cbc137eab": {
  "source": {
  "path": "aws-cdk-aws-api-target-integ.template.json",
  "packaging": "file"
  },
  "destinations": {
  "current_account-current_region": {
  "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "d19afc04c0eb0a5a0b290bfc017b06fed4806017d03102aad8cd2d551a589804.json",
+ "objectKey": "0aa39a2215da743f8b755eac76d55706c97c54008e0d316a8031873cbc137eab.json",
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
  }
  }

diff --git a/...targets/test/aws-api/integ.aws-api.js.snapshot/aws-cdk-aws-api-target-integ.template.json b/...targets/test/aws-api/integ.aws-api.js.snapshot/aws-cdk-aws-api-target-integ.template.json
@@ -134,13 +134,15 @@
  "S3Key": "333b608679b1fd0bcebf74bb5053b8664245c5f7903d27c7f6604bdc3d5b88aa.zip"
  },
  "Handler": "index.handler",
+ "MemorySize": 256,
  "Role": {
  "Fn::GetAtt": [
  "AWSb4cf1abd4e4f4bc699441af7ccd9ec37ServiceRole9FFE9C50",
  "Arn"
  ]
  },
- "Runtime": "nodejs18.x"
+ "Runtime": "nodejs18.x",
+ "Timeout": 60
  },
  "DependsOn": [
  "AWSb4cf1abd4e4f4bc699441af7ccd9ec37ServiceRoleDefaultPolicy4D43A7C1",

diff --git a/.../aws-api/integ.aws-api.js.snapshot/awsapiintegDefaultTestDeployAssertBB35B14E.assets.json b/.../aws-api/integ.aws-api.js.snapshot/awsapiintegDefaultTestDeployAssertBB35B14E.assets.json
@@ -14,15 +14,15 @@
  }
  }
  },
- "a8d3cd8e8aac1b261747c42028b691c69aa1852eb2d0238d80ed59dbaeb9d4d7": {
+ "064cd42f1756c4eb6b0ca19ca585a010458d08dbbd483b3e4a0ae43754b5fc71": {
  "source": {
  "path": "awsapiintegDefaultTestDeployAssertBB35B14E.template.json",
  "packaging": "file"
  },
  "destinations": {
  "current_account-current_region": {
  "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "a8d3cd8e8aac1b261747c42028b691c69aa1852eb2d0238d80ed59dbaeb9d4d7.json",
+ "objectKey": "064cd42f1756c4eb6b0ca19ca585a010458d08dbbd483b3e4a0ae43754b5fc71.json",
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
  }
  }

diff --git a/...ws-api/integ.aws-api.js.snapshot/awsapiintegDefaultTestDeployAssertBB35B14E.template.json b/...ws-api/integ.aws-api.js.snapshot/awsapiintegDefaultTestDeployAssertBB35B14E.template.json
@@ -26,7 +26,7 @@
  }
  },
  "flattenResponse": "false",
- "salt": "1693915365417"
+ "salt": "1693996139325"
  },
  "UpdateReplacePolicy": "Delete",
  "DeletionPolicy": "Delete"
@@ -154,7 +154,7 @@
  "Parameter.Value",
  "Parameter.Value"
  ],
- "salt": "1693915365418"
+ "salt": "1693996139326"
  },
  "DependsOn": [
  "AwsApiCallEventBridgeputEvents930f27f5cac3888f90228bdb49e27c64"

diff --git a/...mework-integ/test/aws-events-targets/test/aws-api/integ.aws-api.js.snapshot/manifest.json b/...mework-integ/test/aws-events-targets/test/aws-api/integ.aws-api.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
  "validateOnSynth": false,
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
  "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d19afc04c0eb0a5a0b290bfc017b06fed4806017d03102aad8cd2d551a589804.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0aa39a2215da743f8b755eac76d55706c97c54008e0d316a8031873cbc137eab.json",
  "requiresBootstrapStackVersion": 6,
  "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
  "additionalDependencies": [
@@ -136,7 +136,7 @@
  "validateOnSynth": false,
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
  "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a8d3cd8e8aac1b261747c42028b691c69aa1852eb2d0238d80ed59dbaeb9d4d7.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/064cd42f1756c4eb6b0ca19ca585a010458d08dbbd483b3e4a0ae43754b5fc71.json",
  "requiresBootstrapStackVersion": 6,
  "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
  "additionalDependencies": [

diff --git a/.../framework-integ/test/aws-events-targets/test/aws-api/integ.aws-api.js.snapshot/tree.json b/.../framework-integ/test/aws-events-targets/test/aws-api/integ.aws-api.js.snapshot/tree.json
@@ -269,13 +269,15 @@
  "s3Key": "333b608679b1fd0bcebf74bb5053b8664245c5f7903d27c7f6604bdc3d5b88aa.zip"
  },
  "handler": "index.handler",
+ "memorySize": 256,
  "role": {
  "Fn::GetAtt": [
  "AWSb4cf1abd4e4f4bc699441af7ccd9ec37ServiceRole9FFE9C50",
  "Arn"
  ]
  },
- "runtime": "nodejs18.x"
+ "runtime": "nodejs18.x",
+ "timeout": 60
  }
  },
  "constructInfo": {

diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/aws-api.ts b/packages/aws-cdk-lib/aws-events-targets/lib/aws-api.ts
@@ -4,7 +4,7 @@ import { addLambdaPermission } from './util';
 import * as events from '../../aws-events';
 import * as iam from '../../aws-iam';
 import * as lambda from '../../aws-lambda';
-import { Annotations } from '../../core';
+import { Annotations, Duration } from '../../core';
 
 /**
  * AWS SDK service metadata.
@@ -84,6 +84,8 @@ export class AwsApi implements events.IRuleTarget {
  const handler = new lambda.SingletonFunction(rule as events.Rule, `${rule.node.id}${id}Handler`, {
  code: lambda.Code.fromAsset(path.join(__dirname, '..', '..', 'custom-resource-handlers', 'dist', 'aws-events-targets', 'aws-api-handler')),
  runtime: lambda.Runtime.NODEJS_18_X,
+ timeout: Duration.seconds(60),
+ memorySize: 256,
  handler: 'index.handler',
  uuid: 'b4cf1abd-4e4f-4bc6-9944-1af7ccd9ec37',
  lambdaPurpose: 'AWS',