@aws-solutions-constructs/aws-lambda-elasticachememcached 2.44.0 → 2.46.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/.jsii +106 -15
  2. package/README.md +1 -1
  3. package/lib/index.js +4 -3
  4. package/package.json +5 -5
  5. package/test/{integ.existingResources.expected.json → integ.lammem-existingResources.expected.json} +55 -55
  6. package/test/integ.lammem-existingResources.js +46 -0
  7. package/test/{integ.newResources.expected.json → integ.lammem-newResources.expected.json} +54 -54
  8. package/test/integ.lammem-newResources.js +35 -0
  9. package/test/{integ.withClientProps.expected.json → integ.lammem-withClientProps.expected.json} +54 -54
  10. package/test/integ.lammem-withClientProps.js +42 -0
  11. package/test/lambda-elasticachememcached.test.js +42 -2
  12. package/test/integ.existingResources.js +0 -46
  13. package/test/integ.newResources.js +0 -35
  14. package/test/integ.withClientProps.js +0 -42
  15. /package/test/{integ.existingResources.d.ts → integ.lammem-existingResources.d.ts} +0 -0
  16. /package/test/{integ.newResources.d.ts → integ.lammem-newResources.d.ts} +0 -0
  17. /package/test/{integ.withClientProps.d.ts → integ.lammem-withClientProps.d.ts} +0 -0
package/test/integ.lammem-existingResources.js ADDED
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+ /**
3
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4
+ *
5
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
6
+ * with the License. A copy of the License is located at
7
+ *
8
+ * http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
11
+ * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
12
+ * and limitations under the License.
13
+ */
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ // Imports
16
+ const aws_cdk_lib_1 = require("aws-cdk-lib");
17
+ const lib_1 = require("../lib");
18
+ const lambda = require("aws-cdk-lib/aws-lambda");
19
+ // import * as ec2 from '@aws-cdk/aws-ec2';
20
+ const core_1 = require("@aws-solutions-constructs/core");
21
+ // Setup
22
+ const app = new aws_cdk_lib_1.App();
23
+ const stack = new aws_cdk_lib_1.Stack(app, core_1.generateIntegStackName(__filename));
24
+ stack.templateOptions.description = 'Integration Test with existing vpc, Lambda function and cache';
25
+ const testVpc = core_1.getTestVpc(stack, false);
26
+ const testSG = core_1.buildSecurityGroup(stack, 'test-sg', { vpc: testVpc }, [], []);
27
+ const testFunction = new lambda.Function(stack, 'test-function', {
28
+ runtime: lambda.Runtime.NODEJS_16_X,
29
+ handler: 'index.handler',
30
+ code: lambda.Code.fromAsset(`${__dirname}/lambda`),
31
+ vpc: testVpc,
32
+ securityGroups: [testSG],
33
+ });
34
+ core_1.addCfnSuppressRules(testFunction, [{ id: "W58", reason: "Test Resource" }]);
35
+ core_1.addCfnSuppressRules(testFunction, [{ id: "W92", reason: "Test Resource" }]);
36
+ const testCache = core_1.CreateTestCache(stack, 'test-cache', testVpc);
37
+ // Definitions
38
+ const props = {
39
+ existingVpc: testVpc,
40
+ existingLambdaObj: testFunction,
41
+ existingCache: testCache,
42
+ };
43
+ new lib_1.LambdaToElasticachememcached(stack, 'test', props);
44
+ // Synth
45
+ app.synth();
46
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcubGFtbWVtLWV4aXN0aW5nUmVzb3VyY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW50ZWcubGFtbWVtLWV4aXN0aW5nUmVzb3VyY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7QUFFSCxVQUFVO0FBQ1YsNkNBQXlDO0FBQ3pDLGdDQUF5RjtBQUN6RixpREFBaUQ7QUFDakQsMkNBQTJDO0FBQzNDLHlEQUE4STtBQUU5SSxRQUFRO0FBQ1IsTUFBTSxHQUFHLEdBQUcsSUFBSSxpQkFBRyxFQUFFLENBQUM7QUFDdEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxtQkFBSyxDQUFDLEdBQUcsRUFBRSw2QkFBc0IsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQ2pFLEtBQUssQ0FBQyxlQUFlLENBQUMsV0FBVyxHQUFHLCtEQUErRCxDQUFDO0FBRXBHLE1BQU0sT0FBTyxHQUFHLGlCQUFVLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBRXpDLE1BQU0sTUFBTSxHQUFHLHlCQUFrQixDQUFDLEtBQUssRUFBRSxTQUFTLEVBQUUsRUFBRSxHQUFHLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBRTlFLE1BQU0sWUFBWSxHQUFHLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsZUFBZSxFQUFFO0lBQy9ELE9BQU8sRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVc7SUFDbkMsT0FBTyxFQUFFLGVBQWU7SUFDeEIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsU0FBUyxTQUFTLENBQUM7SUFDbEQsR0FBRyxFQUFFLE9BQU87SUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLENBQUM7Q0FDekIsQ0FBQyxDQUFDO0FBQ0gsMEJBQW1CLENBQUMsWUFBWSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxlQUFlLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDNUUsMEJBQW1CLENBQUMsWUFBWSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxlQUFlLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFFNUUsTUFBTSxTQUFTLEdBQUcsc0JBQWUsQ0FBQyxLQUFLLEVBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBRWhFLGNBQWM7QUFDZCxNQUFNLEtBQUssR0FBc0M7SUFDL0MsV0FBVyxFQUFFLE9BQU87SUFDcEIsaUJBQWlCLEVBQUUsWUFBWTtJQUMvQixhQUFhLEVBQUUsU0FBUztDQUN6QixDQUFDO0FBRUYsSUFBSSxrQ0FBNEIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBRXZELFFBQVE7QUFDUixHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiAgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKS4gWW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZVxuICogIHdpdGggdGhlIExpY2Vuc2UuIEEgY29weSBvZiB0aGUgTGljZW5zZSBpcyBsb2NhdGVkIGF0XG4gKlxuICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiAgb3IgaW4gdGhlICdsaWNlbnNlJyBmaWxlIGFjY29tcGFueWluZyB0aGlzIGZpbGUuIFRoaXMgZmlsZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAnQVMgSVMnIEJBU0lTLCBXSVRIT1VUIFdBUlJBTlRJRVNcbiAqICBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBleHByZXNzIG9yIGltcGxpZWQuIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9uc1xuICogIGFuZCBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS5cbiAqL1xuXG4vLyBJbXBvcnRzXG5pbXBvcnQgeyBBcHAsIFN0YWNrIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBMYW1iZGFUb0VsYXN0aWNhY2hlbWVtY2FjaGVkLCBMYW1iZGFUb0VsYXN0aWNhY2hlbWVtY2FjaGVkUHJvcHMgfSBmcm9tIFwiLi4vbGliXCI7XG5pbXBvcnQgKiBhcyBsYW1iZGEgZnJvbSAnYXdzLWNkay1saWIvYXdzLWxhbWJkYSc7XG4vLyBpbXBvcnQgKiBhcyBlYzIgZnJvbSAnQGF3cy1jZGsvYXdzLWVjMic7XG5pbXBvcnQgeyBnZW5lcmF0ZUludGVnU3RhY2tOYW1lLCBnZXRUZXN0VnBjLCBDcmVhdGVUZXN0Q2FjaGUsIGFkZENmblN1cHByZXNzUnVsZXMsIGJ1aWxkU2VjdXJpdHlHcm91cCB9IGZyb20gJ0Bhd3Mtc29sdXRpb25zLWNvbnN0cnVjdHMvY29yZSc7XG5cbi8vIFNldHVwXG5jb25zdCBhcHAgPSBuZXcgQXBwKCk7XG5jb25zdCBzdGFjayA9IG5ldyBTdGFjayhhcHAsIGdlbmVyYXRlSW50ZWdTdGFja05hbWUoX19maWxlbmFtZSkpO1xuc3RhY2sudGVtcGxhdGVPcHRpb25zLmRlc2NyaXB0aW9uID0gJ0ludGVncmF0aW9uIFRlc3Qgd2l0aCBleGlzdGluZyB2cGMsIExhbWJkYSBmdW5jdGlvbiBhbmQgY2FjaGUnO1xuXG5jb25zdCB0ZXN0VnBjID0gZ2V0VGVzdFZwYyhzdGFjaywgZmFsc2UpO1xuXG5jb25zdCB0ZXN0U0cgPSBidWlsZFNlY3VyaXR5R3JvdXAoc3RhY2ssICd0ZXN0LXNnJywgeyB2cGM6IHRlc3RWcGMgfSwgW10sIFtdKTtcblxuY29uc3QgdGVzdEZ1bmN0aW9uID0gbmV3IGxhbWJkYS5GdW5jdGlvbihzdGFjaywgJ3Rlc3QtZnVuY3Rpb24nLCB7XG4gIHJ1bnRpbWU6IGxhbWJkYS5SdW50aW1lLk5PREVKU18xNl9YLFxuICBoYW5kbGVyOiAnaW5kZXguaGFuZGxlcicsXG4gIGNvZGU6IGxhbWJkYS5Db2RlLmZyb21Bc3NldChgJHtfX2Rpcm5hbWV9L2xhbWJkYWApLFxuICB2cGM6IHRlc3RWcGMsXG4gIHNlY3VyaXR5R3JvdXBzOiBbdGVzdFNHXSxcbn0pO1xuYWRkQ2ZuU3VwcHJlc3NSdWxlcyh0ZXN0RnVuY3Rpb24sIFt7IGlkOiBcIlc1OFwiLCByZWFzb246IFwiVGVzdCBSZXNvdXJjZVwiIH1dKTtcbmFkZENmblN1cHByZXNzUnVsZXModGVzdEZ1bmN0aW9uLCBbeyBpZDogXCJXOTJcIiwgcmVhc29uOiBcIlRlc3QgUmVzb3VyY2VcIiB9XSk7XG5cbmNvbnN0IHRlc3RDYWNoZSA9IENyZWF0ZVRlc3RDYWNoZShzdGFjaywgJ3Rlc3QtY2FjaGUnLCB0ZXN0VnBjKTtcblxuLy8gRGVmaW5pdGlvbnNcbmNvbnN0IHByb3BzOiBMYW1iZGFUb0VsYXN0aWNhY2hlbWVtY2FjaGVkUHJvcHMgPSB7XG4gIGV4aXN0aW5nVnBjOiB0ZXN0VnBjLFxuICBleGlzdGluZ0xhbWJkYU9iajogdGVzdEZ1bmN0aW9uLFxuICBleGlzdGluZ0NhY2hlOiB0ZXN0Q2FjaGUsXG59O1xuXG5uZXcgTGFtYmRhVG9FbGFzdGljYWNoZW1lbWNhY2hlZChzdGFjaywgJ3Rlc3QnLCBwcm9wcyk7XG5cbi8vIFN5bnRoXG5hcHAuc3ludGgoKTsiXX0=
package/test/{integ.newResources.expected.json → integ.lammem-newResources.expected.json} RENAMED
@@ -4,7 +4,7 @@
4
4
  "testtestcachesg9F6CF9E2": {
5
5
  "Type": "AWS::EC2::SecurityGroup",
6
6
  "Properties": {
7
- "GroupDescription": "newResources/test/test-cachesg",
7
+ "GroupDescription": "lammem-newResources/test/test-cachesg",
8
8
  "SecurityGroupEgress": [
9
9
  {
10
10
  "CidrIp": "0.0.0.0/0",
@@ -34,7 +34,6 @@
34
34
  "testtestingress291C0179": {
35
35
  "Type": "AWS::EC2::SecurityGroupIngress",
36
36
  "Properties": {
37
- "IpProtocol": "TCP",
38
37
  "Description": "Self referencing rule to control access to Elasticache memcached cluster",
39
38
  "FromPort": 11222,
40
39
  "GroupId": {
@@ -43,6 +42,7 @@
43
42
  "GroupId"
44
43
  ]
45
44
  },
45
+ "IpProtocol": "TCP",
46
46
  "SourceSecurityGroupId": {
47
47
  "Fn::GetAtt": [
48
48
  "testtestcachesg9F6CF9E2",
@@ -58,6 +58,7 @@
58
58
  "testecsubnetgrouptest868C53AE": {
59
59
  "Type": "AWS::ElastiCache::SubnetGroup",
60
60
  "Properties": {
61
+ "CacheSubnetGroupName": "test-subnet-group",
61
62
  "Description": "Solutions Constructs generated Cache Subnet Group",
62
63
  "SubnetIds": [
63
64
  {
@@ -69,19 +70,18 @@
69
70
  {
70
71
  "Ref": "VpcisolatedSubnet3Subnet44F2537D"
71
72
  }
72
- ],
73
- "CacheSubnetGroupName": "test-subnet-group"
73
+ ]
74
74
  }
75
75
  },
76
76
  "testtestcluster57FB8D14": {
77
77
  "Type": "AWS::ElastiCache::CacheCluster",
78
78
  "Properties": {
79
- "CacheNodeType": "cache.t3.medium",
80
- "Engine": "memcached",
81
- "NumCacheNodes": 2,
82
79
  "AZMode": "cross-az",
80
+ "CacheNodeType": "cache.t3.medium",
83
81
  "CacheSubnetGroupName": "test-subnet-group",
84
82
  "ClusterName": "test-cdk-cluster",
83
+ "Engine": "memcached",
84
+ "NumCacheNodes": 2,
85
85
  "Port": 11222,
86
86
  "VpcSecurityGroupIds": [
87
87
  {
@@ -199,7 +199,7 @@
199
199
  "testReplaceDefaultSecurityGroupsecuritygroupAC4F969B": {
200
200
  "Type": "AWS::EC2::SecurityGroup",
201
201
  "Properties": {
202
- "GroupDescription": "newResources/test/ReplaceDefaultSecurityGroup-security-group",
202
+ "GroupDescription": "lammem-newResources/test/ReplaceDefaultSecurityGroup-security-group",
203
203
  "SecurityGroupEgress": [
204
204
  {
205
205
  "CidrIp": "0.0.0.0/0",
@@ -235,12 +235,6 @@
235
235
  },
236
236
  "S3Key": "c1b23d6af38c04acb744bda25a3dc7f4394daea942c67eaff40911a707a3c37a.zip"
237
237
  },
238
- "Role": {
239
- "Fn::GetAtt": [
240
- "testLambdaFunctionServiceRoleA03EDA2B",
241
- "Arn"
242
- ]
243
- },
244
238
  "Environment": {
245
239
  "Variables": {
246
240
  "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1",
@@ -267,6 +261,12 @@
267
261
  }
268
262
  },
269
263
  "Handler": "index.handler",
264
+ "Role": {
265
+ "Fn::GetAtt": [
266
+ "testLambdaFunctionServiceRoleA03EDA2B",
267
+ "Arn"
268
+ ]
269
+ },
270
270
  "Runtime": "nodejs16.x",
271
271
  "TracingConfig": {
272
272
  "Mode": "Active"
@@ -335,7 +335,7 @@
335
335
  "Tags": [
336
336
  {
337
337
  "Key": "Name",
338
- "Value": "newResources/Vpc"
338
+ "Value": "lammem-newResources/Vpc"
339
339
  }
340
340
  ]
341
341
  }
@@ -343,9 +343,6 @@
343
343
  "VpcisolatedSubnet1SubnetE62B1B9B": {
344
344
  "Type": "AWS::EC2::Subnet",
345
345
  "Properties": {
346
- "VpcId": {
347
- "Ref": "Vpc8378EB38"
348
- },
349
346
  "AvailabilityZone": "test-region-1a",
350
347
  "CidrBlock": "10.0.0.0/18",
351
348
  "MapPublicIpOnLaunch": false,
@@ -360,23 +357,26 @@
360
357
  },
361
358
  {
362
359
  "Key": "Name",
363
- "Value": "newResources/Vpc/isolatedSubnet1"
360
+ "Value": "lammem-newResources/Vpc/isolatedSubnet1"
364
361
  }
365
- ]
362
+ ],
363
+ "VpcId": {
364
+ "Ref": "Vpc8378EB38"
365
+ }
366
366
  }
367
367
  },
368
368
  "VpcisolatedSubnet1RouteTableE442650B": {
369
369
  "Type": "AWS::EC2::RouteTable",
370
370
  "Properties": {
371
- "VpcId": {
372
- "Ref": "Vpc8378EB38"
373
- },
374
371
  "Tags": [
375
372
  {
376
373
  "Key": "Name",
377
- "Value": "newResources/Vpc/isolatedSubnet1"
374
+ "Value": "lammem-newResources/Vpc/isolatedSubnet1"
378
375
  }
379
- ]
376
+ ],
377
+ "VpcId": {
378
+ "Ref": "Vpc8378EB38"
379
+ }
380
380
  }
381
381
  },
382
382
  "VpcisolatedSubnet1RouteTableAssociationD259E31A": {
@@ -393,9 +393,6 @@
393
393
  "VpcisolatedSubnet2Subnet39217055": {
394
394
  "Type": "AWS::EC2::Subnet",
395
395
  "Properties": {
396
- "VpcId": {
397
- "Ref": "Vpc8378EB38"
398
- },
399
396
  "AvailabilityZone": "test-region-1b",
400
397
  "CidrBlock": "10.0.64.0/18",
401
398
  "MapPublicIpOnLaunch": false,
@@ -410,23 +407,26 @@
410
407
  },
411
408
  {
412
409
  "Key": "Name",
413
- "Value": "newResources/Vpc/isolatedSubnet2"
410
+ "Value": "lammem-newResources/Vpc/isolatedSubnet2"
414
411
  }
415
- ]
412
+ ],
413
+ "VpcId": {
414
+ "Ref": "Vpc8378EB38"
415
+ }
416
416
  }
417
417
  },
418
418
  "VpcisolatedSubnet2RouteTable334F9764": {
419
419
  "Type": "AWS::EC2::RouteTable",
420
420
  "Properties": {
421
- "VpcId": {
422
- "Ref": "Vpc8378EB38"
423
- },
424
421
  "Tags": [
425
422
  {
426
423
  "Key": "Name",
427
- "Value": "newResources/Vpc/isolatedSubnet2"
424
+ "Value": "lammem-newResources/Vpc/isolatedSubnet2"
428
425
  }
429
- ]
426
+ ],
427
+ "VpcId": {
428
+ "Ref": "Vpc8378EB38"
429
+ }
430
430
  }
431
431
  },
432
432
  "VpcisolatedSubnet2RouteTableAssociation25A4716F": {
@@ -443,9 +443,6 @@
443
443
  "VpcisolatedSubnet3Subnet44F2537D": {
444
444
  "Type": "AWS::EC2::Subnet",
445
445
  "Properties": {
446
- "VpcId": {
447
- "Ref": "Vpc8378EB38"
448
- },
449
446
  "AvailabilityZone": "test-region-1c",
450
447
  "CidrBlock": "10.0.128.0/18",
451
448
  "MapPublicIpOnLaunch": false,
@@ -460,23 +457,26 @@
460
457
  },
461
458
  {
462
459
  "Key": "Name",
463
- "Value": "newResources/Vpc/isolatedSubnet3"
460
+ "Value": "lammem-newResources/Vpc/isolatedSubnet3"
464
461
  }
465
- ]
462
+ ],
463
+ "VpcId": {
464
+ "Ref": "Vpc8378EB38"
465
+ }
466
466
  }
467
467
  },
468
468
  "VpcisolatedSubnet3RouteTableA2F6BBC0": {
469
469
  "Type": "AWS::EC2::RouteTable",
470
470
  "Properties": {
471
- "VpcId": {
472
- "Ref": "Vpc8378EB38"
473
- },
474
471
  "Tags": [
475
472
  {
476
473
  "Key": "Name",
477
- "Value": "newResources/Vpc/isolatedSubnet3"
474
+ "Value": "lammem-newResources/Vpc/isolatedSubnet3"
478
475
  }
479
- ]
476
+ ],
477
+ "VpcId": {
478
+ "Ref": "Vpc8378EB38"
479
+ }
480
480
  }
481
481
  },
482
482
  "VpcisolatedSubnet3RouteTableAssociationDC010BEB": {
@@ -508,7 +508,7 @@
508
508
  "Tags": [
509
509
  {
510
510
  "Key": "Name",
511
- "Value": "newResources/Vpc"
511
+ "Value": "lammem-newResources/Vpc/FlowLog"
512
512
  }
513
513
  ]
514
514
  }
@@ -560,7 +560,7 @@
560
560
  "Tags": [
561
561
  {
562
562
  "Key": "Name",
563
- "Value": "newResources/Vpc"
563
+ "Value": "lammem-newResources/Vpc/FlowLog"
564
564
  }
565
565
  ]
566
566
  },
@@ -580,11 +580,6 @@
580
580
  "VpcFlowLog8FF33A73": {
581
581
  "Type": "AWS::EC2::FlowLog",
582
582
  "Properties": {
583
- "ResourceId": {
584
- "Ref": "Vpc8378EB38"
585
- },
586
- "ResourceType": "VPC",
587
- "TrafficType": "ALL",
588
583
  "DeliverLogsPermissionArn": {
589
584
  "Fn::GetAtt": [
590
585
  "VpcFlowLogIAMRole6A475D41",
@@ -595,12 +590,17 @@
595
590
  "LogGroupName": {
596
591
  "Ref": "VpcFlowLogLogGroup7B5C56B9"
597
592
  },
593
+ "ResourceId": {
594
+ "Ref": "Vpc8378EB38"
595
+ },
596
+ "ResourceType": "VPC",
598
597
  "Tags": [
599
598
  {
600
599
  "Key": "Name",
601
- "Value": "newResources/Vpc"
600
+ "Value": "lammem-newResources/Vpc/FlowLog"
602
601
  }
603
- ]
602
+ ],
603
+ "TrafficType": "ALL"
604
604
  }
605
605
  }
606
606
  },
package/test/integ.lammem-newResources.js ADDED
@@ -0,0 +1,35 @@
1
+ "use strict";
2
+ /**
3
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4
+ *
5
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
6
+ * with the License. A copy of the License is located at
7
+ *
8
+ * http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
11
+ * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
12
+ * and limitations under the License.
13
+ */
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ // Imports
16
+ const aws_cdk_lib_1 = require("aws-cdk-lib");
17
+ const lib_1 = require("../lib");
18
+ const lambda = require("aws-cdk-lib/aws-lambda");
19
+ const core_1 = require("@aws-solutions-constructs/core");
20
+ // Setup
21
+ const app = new aws_cdk_lib_1.App();
22
+ const stack = new aws_cdk_lib_1.Stack(app, core_1.generateIntegStackName(__filename));
23
+ stack.templateOptions.description = 'Integration Test with new resourcesfor aws-lambda-elasticachememcached';
24
+ // Definitions
25
+ const props = {
26
+ lambdaFunctionProps: {
27
+ runtime: lambda.Runtime.NODEJS_16_X,
28
+ handler: 'index.handler',
29
+ code: lambda.Code.fromAsset(`${__dirname}/lambda`)
30
+ }
31
+ };
32
+ new lib_1.LambdaToElasticachememcached(stack, 'test', props);
33
+ // Synth
34
+ app.synth();
35
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWcubGFtbWVtLW5ld1Jlc291cmNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImludGVnLmxhbW1lbS1uZXdSZXNvdXJjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOztBQUVILFVBQVU7QUFDViw2Q0FBeUM7QUFDekMsZ0NBQXlGO0FBQ3pGLGlEQUFpRDtBQUNqRCx5REFBd0U7QUFFeEUsUUFBUTtBQUNSLE1BQU0sR0FBRyxHQUFHLElBQUksaUJBQUcsRUFBRSxDQUFDO0FBQ3RCLE1BQU0sS0FBSyxHQUFHLElBQUksbUJBQUssQ0FBQyxHQUFHLEVBQUUsNkJBQXNCLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztBQUNqRSxLQUFLLENBQUMsZUFBZSxDQUFDLFdBQVcsR0FBRyx3RUFBd0UsQ0FBQztBQUU3RyxjQUFjO0FBQ2QsTUFBTSxLQUFLLEdBQXNDO0lBQy9DLG1CQUFtQixFQUFFO1FBQ25CLE9BQU8sRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVc7UUFDbkMsT0FBTyxFQUFFLGVBQWU7UUFDeEIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsU0FBUyxTQUFTLENBQUM7S0FDbkQ7Q0FDRixDQUFDO0FBRUYsSUFBSSxrQ0FBNEIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBRXZELFFBQVE7QUFDUixHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiAgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKS4gWW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZVxuICogIHdpdGggdGhlIExpY2Vuc2UuIEEgY29weSBvZiB0aGUgTGljZW5zZSBpcyBsb2NhdGVkIGF0XG4gKlxuICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiAgb3IgaW4gdGhlICdsaWNlbnNlJyBmaWxlIGFjY29tcGFueWluZyB0aGlzIGZpbGUuIFRoaXMgZmlsZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAnQVMgSVMnIEJBU0lTLCBXSVRIT1VUIFdBUlJBTlRJRVNcbiAqICBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBleHByZXNzIG9yIGltcGxpZWQuIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9uc1xuICogIGFuZCBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS5cbiAqL1xuXG4vLyBJbXBvcnRzXG5pbXBvcnQgeyBBcHAsIFN0YWNrIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBMYW1iZGFUb0VsYXN0aWNhY2hlbWVtY2FjaGVkLCBMYW1iZGFUb0VsYXN0aWNhY2hlbWVtY2FjaGVkUHJvcHMgfSBmcm9tIFwiLi4vbGliXCI7XG5pbXBvcnQgKiBhcyBsYW1iZGEgZnJvbSAnYXdzLWNkay1saWIvYXdzLWxhbWJkYSc7XG5pbXBvcnQgeyBnZW5lcmF0ZUludGVnU3RhY2tOYW1lIH0gZnJvbSAnQGF3cy1zb2x1dGlvbnMtY29uc3RydWN0cy9jb3JlJztcblxuLy8gU2V0dXBcbmNvbnN0IGFwcCA9IG5ldyBBcHAoKTtcbmNvbnN0IHN0YWNrID0gbmV3IFN0YWNrKGFwcCwgZ2VuZXJhdGVJbnRlZ1N0YWNrTmFtZShfX2ZpbGVuYW1lKSk7XG5zdGFjay50ZW1wbGF0ZU9wdGlvbnMuZGVzY3JpcHRpb24gPSAnSW50ZWdyYXRpb24gVGVzdCB3aXRoIG5ldyByZXNvdXJjZXNmb3IgYXdzLWxhbWJkYS1lbGFzdGljYWNoZW1lbWNhY2hlZCc7XG5cbi8vIERlZmluaXRpb25zXG5jb25zdCBwcm9wczogTGFtYmRhVG9FbGFzdGljYWNoZW1lbWNhY2hlZFByb3BzID0ge1xuICBsYW1iZGFGdW5jdGlvblByb3BzOiB7XG4gICAgcnVudGltZTogbGFtYmRhLlJ1bnRpbWUuTk9ERUpTXzE2X1gsXG4gICAgaGFuZGxlcjogJ2luZGV4LmhhbmRsZXInLFxuICAgIGNvZGU6IGxhbWJkYS5Db2RlLmZyb21Bc3NldChgJHtfX2Rpcm5hbWV9L2xhbWJkYWApXG4gIH1cbn07XG5cbm5ldyBMYW1iZGFUb0VsYXN0aWNhY2hlbWVtY2FjaGVkKHN0YWNrLCAndGVzdCcsIHByb3BzKTtcblxuLy8gU3ludGhcbmFwcC5zeW50aCgpOyJdfQ==
package/test/{integ.withClientProps.expected.json → integ.lammem-withClientProps.expected.json} RENAMED
@@ -4,7 +4,7 @@
4
4
  "testtestcachesg9F6CF9E2": {
5
5
  "Type": "AWS::EC2::SecurityGroup",
6
6
  "Properties": {
7
- "GroupDescription": "withClientProps/test/test-cachesg",
7
+ "GroupDescription": "lammem-withClientProps/test/test-cachesg",
8
8
  "SecurityGroupEgress": [
9
9
  {
10
10
  "CidrIp": "0.0.0.0/0",
@@ -34,7 +34,6 @@
34
34
  "testtestingress291C0179": {
35
35
  "Type": "AWS::EC2::SecurityGroupIngress",
36
36
  "Properties": {
37
- "IpProtocol": "TCP",
38
37
  "Description": "Self referencing rule to control access to Elasticache memcached cluster",
39
38
  "FromPort": 11222,
40
39
  "GroupId": {
@@ -43,6 +42,7 @@
43
42
  "GroupId"
44
43
  ]
45
44
  },
45
+ "IpProtocol": "TCP",
46
46
  "SourceSecurityGroupId": {
47
47
  "Fn::GetAtt": [
48
48
  "testtestcachesg9F6CF9E2",
@@ -58,6 +58,7 @@
58
58
  "testecsubnetgrouptest868C53AE": {
59
59
  "Type": "AWS::ElastiCache::SubnetGroup",
60
60
  "Properties": {
61
+ "CacheSubnetGroupName": "test-subnet-group",
61
62
  "Description": "Solutions Constructs generated Cache Subnet Group",
62
63
  "SubnetIds": [
63
64
  {
@@ -69,19 +70,18 @@
69
70
  {
70
71
  "Ref": "VpcisolatedSubnet3Subnet44F2537D"
71
72
  }
72
- ],
73
- "CacheSubnetGroupName": "test-subnet-group"
73
+ ]
74
74
  }
75
75
  },
76
76
  "testtestcluster57FB8D14": {
77
77
  "Type": "AWS::ElastiCache::CacheCluster",
78
78
  "Properties": {
79
- "CacheNodeType": "cache.t3.medium",
80
- "Engine": "memcached",
81
- "NumCacheNodes": 2,
82
79
  "AZMode": "single-az",
80
+ "CacheNodeType": "cache.t3.medium",
83
81
  "CacheSubnetGroupName": "test-subnet-group",
84
82
  "ClusterName": "test-cdk-cluster",
83
+ "Engine": "memcached",
84
+ "NumCacheNodes": 2,
85
85
  "Port": 11222,
86
86
  "VpcSecurityGroupIds": [
87
87
  {
@@ -199,7 +199,7 @@
199
199
  "testReplaceDefaultSecurityGroupsecuritygroupAC4F969B": {
200
200
  "Type": "AWS::EC2::SecurityGroup",
201
201
  "Properties": {
202
- "GroupDescription": "withClientProps/test/ReplaceDefaultSecurityGroup-security-group",
202
+ "GroupDescription": "lammem-withClientProps/test/ReplaceDefaultSecurityGroup-security-group",
203
203
  "SecurityGroupEgress": [
204
204
  {
205
205
  "CidrIp": "0.0.0.0/0",
@@ -235,12 +235,6 @@
235
235
  },
236
236
  "S3Key": "c1b23d6af38c04acb744bda25a3dc7f4394daea942c67eaff40911a707a3c37a.zip"
237
237
  },
238
- "Role": {
239
- "Fn::GetAtt": [
240
- "testLambdaFunctionServiceRoleA03EDA2B",
241
- "Arn"
242
- ]
243
- },
244
238
  "Environment": {
245
239
  "Variables": {
246
240
  "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1",
@@ -267,6 +261,12 @@
267
261
  }
268
262
  },
269
263
  "Handler": "index.handler",
264
+ "Role": {
265
+ "Fn::GetAtt": [
266
+ "testLambdaFunctionServiceRoleA03EDA2B",
267
+ "Arn"
268
+ ]
269
+ },
270
270
  "Runtime": "nodejs16.x",
271
271
  "TracingConfig": {
272
272
  "Mode": "Active"
@@ -335,7 +335,7 @@
335
335
  "Tags": [
336
336
  {
337
337
  "Key": "Name",
338
- "Value": "withClientProps/Vpc"
338
+ "Value": "lammem-withClientProps/Vpc"
339
339
  }
340
340
  ]
341
341
  }
@@ -343,9 +343,6 @@
343
343
  "VpcisolatedSubnet1SubnetE62B1B9B": {
344
344
  "Type": "AWS::EC2::Subnet",
345
345
  "Properties": {
346
- "VpcId": {
347
- "Ref": "Vpc8378EB38"
348
- },
349
346
  "AvailabilityZone": "test-region-1a",
350
347
  "CidrBlock": "192.68.0.0/18",
351
348
  "MapPublicIpOnLaunch": false,
@@ -360,23 +357,26 @@
360
357
  },
361
358
  {
362
359
  "Key": "Name",
363
- "Value": "withClientProps/Vpc/isolatedSubnet1"
360
+ "Value": "lammem-withClientProps/Vpc/isolatedSubnet1"
364
361
  }
365
- ]
362
+ ],
363
+ "VpcId": {
364
+ "Ref": "Vpc8378EB38"
365
+ }
366
366
  }
367
367
  },
368
368
  "VpcisolatedSubnet1RouteTableE442650B": {
369
369
  "Type": "AWS::EC2::RouteTable",
370
370
  "Properties": {
371
- "VpcId": {
372
- "Ref": "Vpc8378EB38"
373
- },
374
371
  "Tags": [
375
372
  {
376
373
  "Key": "Name",
377
- "Value": "withClientProps/Vpc/isolatedSubnet1"
374
+ "Value": "lammem-withClientProps/Vpc/isolatedSubnet1"
378
375
  }
379
- ]
376
+ ],
377
+ "VpcId": {
378
+ "Ref": "Vpc8378EB38"
379
+ }
380
380
  }
381
381
  },
382
382
  "VpcisolatedSubnet1RouteTableAssociationD259E31A": {
@@ -393,9 +393,6 @@
393
393
  "VpcisolatedSubnet2Subnet39217055": {
394
394
  "Type": "AWS::EC2::Subnet",
395
395
  "Properties": {
396
- "VpcId": {
397
- "Ref": "Vpc8378EB38"
398
- },
399
396
  "AvailabilityZone": "test-region-1b",
400
397
  "CidrBlock": "192.68.64.0/18",
401
398
  "MapPublicIpOnLaunch": false,
@@ -410,23 +407,26 @@
410
407
  },
411
408
  {
412
409
  "Key": "Name",
413
- "Value": "withClientProps/Vpc/isolatedSubnet2"
410
+ "Value": "lammem-withClientProps/Vpc/isolatedSubnet2"
414
411
  }
415
- ]
412
+ ],
413
+ "VpcId": {
414
+ "Ref": "Vpc8378EB38"
415
+ }
416
416
  }
417
417
  },
418
418
  "VpcisolatedSubnet2RouteTable334F9764": {
419
419
  "Type": "AWS::EC2::RouteTable",
420
420
  "Properties": {
421
- "VpcId": {
422
- "Ref": "Vpc8378EB38"
423
- },
424
421
  "Tags": [
425
422
  {
426
423
  "Key": "Name",
427
- "Value": "withClientProps/Vpc/isolatedSubnet2"
424
+ "Value": "lammem-withClientProps/Vpc/isolatedSubnet2"
428
425
  }
429
- ]
426
+ ],
427
+ "VpcId": {
428
+ "Ref": "Vpc8378EB38"
429
+ }
430
430
  }
431
431
  },
432
432
  "VpcisolatedSubnet2RouteTableAssociation25A4716F": {
@@ -443,9 +443,6 @@
443
443
  "VpcisolatedSubnet3Subnet44F2537D": {
444
444
  "Type": "AWS::EC2::Subnet",
445
445
  "Properties": {
446
- "VpcId": {
447
- "Ref": "Vpc8378EB38"
448
- },
449
446
  "AvailabilityZone": "test-region-1c",
450
447
  "CidrBlock": "192.68.128.0/18",
451
448
  "MapPublicIpOnLaunch": false,
@@ -460,23 +457,26 @@
460
457
  },
461
458
  {
462
459
  "Key": "Name",
463
- "Value": "withClientProps/Vpc/isolatedSubnet3"
460
+ "Value": "lammem-withClientProps/Vpc/isolatedSubnet3"
464
461
  }
465
- ]
462
+ ],
463
+ "VpcId": {
464
+ "Ref": "Vpc8378EB38"
465
+ }
466
466
  }
467
467
  },
468
468
  "VpcisolatedSubnet3RouteTableA2F6BBC0": {
469
469
  "Type": "AWS::EC2::RouteTable",
470
470
  "Properties": {
471
- "VpcId": {
472
- "Ref": "Vpc8378EB38"
473
- },
474
471
  "Tags": [
475
472
  {
476
473
  "Key": "Name",
477
- "Value": "withClientProps/Vpc/isolatedSubnet3"
474
+ "Value": "lammem-withClientProps/Vpc/isolatedSubnet3"
478
475
  }
479
- ]
476
+ ],
477
+ "VpcId": {
478
+ "Ref": "Vpc8378EB38"
479
+ }
480
480
  }
481
481
  },
482
482
  "VpcisolatedSubnet3RouteTableAssociationDC010BEB": {
@@ -508,7 +508,7 @@
508
508
  "Tags": [
509
509
  {
510
510
  "Key": "Name",
511
- "Value": "withClientProps/Vpc"
511
+ "Value": "lammem-withClientProps/Vpc/FlowLog"
512
512
  }
513
513
  ]
514
514
  }
@@ -560,7 +560,7 @@
560
560
  "Tags": [
561
561
  {
562
562
  "Key": "Name",
563
- "Value": "withClientProps/Vpc"
563
+ "Value": "lammem-withClientProps/Vpc/FlowLog"
564
564
  }
565
565
  ]
566
566
  },
@@ -580,11 +580,6 @@
580
580
  "VpcFlowLog8FF33A73": {
581
581
  "Type": "AWS::EC2::FlowLog",
582
582
  "Properties": {
583
- "ResourceId": {
584
- "Ref": "Vpc8378EB38"
585
- },
586
- "ResourceType": "VPC",
587
- "TrafficType": "ALL",
588
583
  "DeliverLogsPermissionArn": {
589
584
  "Fn::GetAtt": [
590
585
  "VpcFlowLogIAMRole6A475D41",
@@ -595,12 +590,17 @@
595
590
  "LogGroupName": {
596
591
  "Ref": "VpcFlowLogLogGroup7B5C56B9"
597
592
  },
593
+ "ResourceId": {
594
+ "Ref": "Vpc8378EB38"
595
+ },
596
+ "ResourceType": "VPC",
598
597
  "Tags": [
599
598
  {
600
599
  "Key": "Name",
601
- "Value": "withClientProps/Vpc"
600
+ "Value": "lammem-withClientProps/Vpc/FlowLog"
602
601
  }
603
- ]
602
+ ],
603
+ "TrafficType": "ALL"
604
604
  }
605
605
  }
606
606
  },