@sylvesterllc/aws-constructs 1.1.44 → 1.1.45

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 (7) hide show
  1. package/dist/resources/dynamodb/CreateDynamoSingleTableDesign.js +25 -24
  2. package/dist/resources/lambda/createLambda.js +20 -14
  3. package/dist/resources/sqs/create-sqs-resource.js +11 -7
  4. package/package.json +1 -1
  5. package/src/resources/dynamodb/CreateDynamoSingleTableDesign.ts +109 -106
  6. package/src/resources/lambda/createLambda.ts +214 -178
  7. package/src/resources/sqs/create-sqs-resource.ts +13 -9
package/dist/resources/dynamodb/CreateDynamoSingleTableDesign.js CHANGED
@@ -34,51 +34,51 @@ class CreateDynamoSingleTableDesign extends tsgBaseResource_1.TsgBaseResource {
34
34
  tableName: this.tableName,
35
35
  removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
36
36
  partitionKey: {
37
- name: 'pk',
37
+ name: "pk",
38
38
  type: aws_dynamodb_1.AttributeType.STRING,
39
39
  },
40
40
  sortKey: {
41
- name: 'sk',
41
+ name: "sk",
42
42
  type: aws_dynamodb_1.AttributeType.STRING,
43
43
  },
44
44
  billingMode: aws_dynamodb_1.BillingMode.PAY_PER_REQUEST,
45
45
  });
46
46
  const gsiIndexes = [
47
47
  {
48
- indexName: 'gsi1Index',
48
+ indexName: "gsi1Index",
49
49
  partitionKey: {
50
- name: 'gsi1pk',
51
- type: aws_dynamodb_1.AttributeType.STRING
50
+ name: "gsi1pk",
51
+ type: aws_dynamodb_1.AttributeType.STRING,
52
52
  },
53
53
  sortKey: {
54
- name: 'gsi1sk',
55
- type: aws_dynamodb_1.AttributeType.STRING
54
+ name: "gsi1sk",
55
+ type: aws_dynamodb_1.AttributeType.STRING,
56
56
  },
57
- projectionType: aws_dynamodb_1.ProjectionType.ALL
57
+ projectionType: aws_dynamodb_1.ProjectionType.ALL,
58
58
  },
59
59
  {
60
- indexName: 'gsi2Index',
60
+ indexName: "gsi2Index",
61
61
  partitionKey: {
62
- name: 'gsi2pk',
63
- type: aws_dynamodb_1.AttributeType.STRING
62
+ name: "gsi2pk",
63
+ type: aws_dynamodb_1.AttributeType.STRING,
64
64
  },
65
65
  sortKey: {
66
- name: 'gsi2sk',
67
- type: aws_dynamodb_1.AttributeType.STRING
66
+ name: "gsi2sk",
67
+ type: aws_dynamodb_1.AttributeType.STRING,
68
68
  },
69
- projectionType: aws_dynamodb_1.ProjectionType.ALL
69
+ projectionType: aws_dynamodb_1.ProjectionType.ALL,
70
70
  },
71
71
  {
72
- indexName: 'gsi3Index',
72
+ indexName: "gsi3Index",
73
73
  partitionKey: {
74
- name: 'gsi3pk',
75
- type: aws_dynamodb_1.AttributeType.STRING
74
+ name: "gsi3pk",
75
+ type: aws_dynamodb_1.AttributeType.STRING,
76
76
  },
77
77
  sortKey: {
78
- name: 'gsi3sk',
79
- type: aws_dynamodb_1.AttributeType.STRING
78
+ name: "gsi3sk",
79
+ type: aws_dynamodb_1.AttributeType.STRING,
80
80
  },
81
- projectionType: aws_dynamodb_1.ProjectionType.ALL
81
+ projectionType: aws_dynamodb_1.ProjectionType.ALL,
82
82
  },
83
83
  ];
84
84
  gsiIndexes.map((gsi) => {
@@ -86,17 +86,18 @@ class CreateDynamoSingleTableDesign extends tsgBaseResource_1.TsgBaseResource {
86
86
  indexName: gsi.indexName,
87
87
  partitionKey: gsi.partitionKey,
88
88
  sortKey: gsi.sortKey,
89
- projectionType: gsi.projectionType
89
+ projectionType: gsi.projectionType,
90
90
  };
91
91
  dbTable.addGlobalSecondaryIndex(gsiProps);
92
92
  });
93
93
  return dbTable;
94
94
  }
95
95
  createOutput(scope) {
96
- new aws_cdk_lib_1.CfnOutput(scope, `dynamoTable-${this.CreatedTable?.tableName}`, {
97
- value: `Table Name: ${this.createdResource?.tableName}\t Table Arn: ${this.createdResource?.tableArn}`
96
+ // Logical IDs must not include unresolved tokens; use a stable ID
97
+ new aws_cdk_lib_1.CfnOutput(scope, "dynamoTable", {
98
+ value: `Table Name: ${this.createdResource?.tableName}\t Table Arn: ${this.createdResource?.tableArn}`,
98
99
  });
99
100
  }
100
101
  }
101
102
  exports.CreateDynamoSingleTableDesign = CreateDynamoSingleTableDesign;
102
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3JlYXRlRHluYW1vU2luZ2xlVGFibGVEZXNpZ24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2R5bmFtb2RiL0NyZWF0ZUR5bmFtb1NpbmdsZVRhYmxlRGVzaWduLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUF1RDtBQUN2RCwyREFBb0k7QUFFcEksNkRBQTBEO0FBRzFELE1BQWEsNkJBQThCLFNBQVEsaUNBQThCO0lBcUJ2RDtJQUE0QjtJQW5CbEQsTUFBTSxDQUFDLGdCQUFnQixHQUFhO1FBQ2hDLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIsNkJBQTZCO1FBQzdCLHFCQUFxQjtRQUNyQix3QkFBd0I7UUFDeEIsa0JBQWtCO1FBQ2xCLHFCQUFxQjtRQUNyQiwyQkFBMkI7UUFDM0Isa0JBQWtCO1FBQ2xCLGdCQUFnQjtRQUNoQixlQUFlO1FBQ2YscUJBQXFCO0tBQ3hCLENBQUM7SUFFRixJQUFJLFlBQVk7UUFDWixPQUFPLElBQUksQ0FBQyxlQUFlLENBQUM7SUFDaEMsQ0FBQztJQUVELFlBQXNCLEtBQWdCLEVBQVksU0FBaUI7UUFDL0QsS0FBSyxDQUFDLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQztRQUROLFVBQUssR0FBTCxLQUFLLENBQVc7UUFBWSxjQUFTLEdBQVQsU0FBUyxDQUFRO0lBRW5FLENBQUM7SUFFUyxjQUFjLENBQUMsS0FBZ0I7UUFFckMsTUFBTSxPQUFPLEdBQUcsSUFBSSxvQkFBSyxDQUFDLEtBQUssRUFBRSxHQUFHLElBQUksQ0FBQyxTQUFTLEVBQUUsRUFBRTtZQUNsRCxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVM7WUFDekIsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTztZQUVwQyxZQUFZLEVBQUU7Z0JBQ1YsSUFBSSxFQUFFLElBQUk7Z0JBQ1YsSUFBSSxFQUFFLDRCQUFhLENBQUMsTUFBTTthQUM3QjtZQUNELE9BQU8sRUFBRTtnQkFDTCxJQUFJLEVBQUUsSUFBSTtnQkFDVixJQUFJLEVBQUUsNEJBQWEsQ0FBQyxNQUFNO2FBQzdCO1lBQ0QsV0FBVyxFQUFFLDBCQUFXLENBQUMsZUFBZTtTQUMzQyxDQUFDLENBQUM7UUFFSCxNQUFNLFVBQVUsR0FBRztZQUNmO2dCQUNJLFNBQVMsRUFBRSxXQUFXO2dCQUN0QixZQUFZLEVBQUU7b0JBQ1YsSUFBSSxFQUFFLFFBQVE7b0JBQ2QsSUFBSSxFQUFFLDRCQUFhLENBQUMsTUFBTTtpQkFDN0I7Z0JBQ0QsT0FBTyxFQUFFO29CQUNMLElBQUksRUFBRSxRQUFRO29CQUNkLElBQUksRUFBRSw0QkFBYSxDQUFDLE1BQU07aUJBQzdCO2dCQUNELGNBQWMsRUFBRSw2QkFBYyxDQUFDLEdBQUc7YUFDckM7WUFDRDtnQkFDSSxTQUFTLEVBQUUsV0FBVztnQkFDdEIsWUFBWSxFQUFFO29CQUNWLElBQUksRUFBRSxRQUFRO29CQUNkLElBQUksRUFBRSw0QkFBYSxDQUFDLE1BQU07aUJBQzdCO2dCQUNELE9BQU8sRUFBRTtvQkFDTCxJQUFJLEVBQUUsUUFBUTtvQkFDZCxJQUFJLEVBQUUsNEJBQWEsQ0FBQyxNQUFNO2lCQUM3QjtnQkFDRCxjQUFjLEVBQUUsNkJBQWMsQ0FBQyxHQUFHO2FBQ3JDO1lBQ0Q7Z0JBQ0ksU0FBUyxFQUFFLFdBQVc7Z0JBQ3RCLFlBQVksRUFBRTtvQkFDVixJQUFJLEVBQUUsUUFBUTtvQkFDZCxJQUFJLEVBQUUsNEJBQWEsQ0FBQyxNQUFNO2lCQUM3QjtnQkFDRCxPQUFPLEVBQUU7b0JBQ0wsSUFBSSxFQUFFLFFBQVE7b0JBQ2QsSUFBSSxFQUFFLDRCQUFhLENBQUMsTUFBTTtpQkFDN0I7Z0JBQ0QsY0FBYyxFQUFFLDZCQUFjLENBQUMsR0FBRzthQUNyQztTQUNKLENBQUM7UUFFRixVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFFbkIsTUFBTSxRQUFRLEdBQThCO2dCQUN4QyxTQUFTLEVBQUUsR0FBRyxDQUFDLFNBQVM7Z0JBQ3hCLFlBQVksRUFBRSxHQUFHLENBQUMsWUFBWTtnQkFDOUIsT0FBTyxFQUFFLEdBQUcsQ0FBQyxPQUFPO2dCQUNwQixjQUFjLEVBQUUsR0FBRyxDQUFDLGNBQWM7YUFFckMsQ0FBQztZQUVGLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM5QyxDQUFDLENBQUMsQ0FBQztRQUVILE9BQU8sT0FBTyxDQUFDO0lBQ25CLENBQUM7SUFHUyxZQUFZLENBQUksS0FBZ0I7UUFFdEMsSUFBSSx1QkFBUyxDQUFDLEtBQUssRUFBRSxlQUFlLElBQUksQ0FBQyxZQUFZLEVBQUUsU0FBUyxFQUFFLEVBQUU7WUFDaEUsS0FBSyxFQUFFLGVBQWUsSUFBSSxDQUFDLGVBQWUsRUFBRSxTQUFTLGlCQUFpQixJQUFJLENBQUMsZUFBZSxFQUFFLFFBQVEsRUFBRTtTQUN6RyxDQUFDLENBQUM7SUFFUCxDQUFDOztBQXhHTCxzRUF5R0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDZm5PdXRwdXQsIFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcclxuaW1wb3J0IHsgQXR0cmlidXRlVHlwZSwgQmlsbGluZ01vZGUsIEdsb2JhbFNlY29uZGFyeUluZGV4UHJvcHMsIFByb2plY3Rpb25UeXBlLCBUYWJsZSwgVGFibGVQcm9wcyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZHluYW1vZGJcIjtcclxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcclxuaW1wb3J0IHsgVHNnQmFzZVJlc291cmNlIH0gZnJvbSBcIi4uL2Jhc2UvdHNnQmFzZVJlc291cmNlXCI7XHJcblxyXG5cclxuZXhwb3J0IGNsYXNzIENyZWF0ZUR5bmFtb1NpbmdsZVRhYmxlRGVzaWduIGV4dGVuZHMgVHNnQmFzZVJlc291cmNlPFRhYmxlLCBzdHJpbmc+IHtcclxuXHJcbiAgICBzdGF0aWMgUmVhZFdyaXRlQWN0aW9uczogc3RyaW5nW10gPSBbXHJcbiAgICAgICAgXCJkeW5hbW9kYjpCYXRjaEdldEl0ZW1cIixcclxuICAgICAgICBcImR5bmFtb2RiOkJhdGNoV3JpdGVJdGVtXCIsXHJcbiAgICAgICAgXCJkeW5hbW9kYjpDb25kaXRpb25DaGVja0l0ZW1cIixcclxuICAgICAgICBcImR5bmFtb2RiOkRlbGV0ZUl0ZW1cIixcclxuICAgICAgICBcImR5bmFtb2RiOkRlc2NyaWJlVGFibGVcIixcclxuICAgICAgICBcImR5bmFtb2RiOkdldEl0ZW1cIixcclxuICAgICAgICBcImR5bmFtb2RiOkdldFJlY29yZHNcIixcclxuICAgICAgICBcImR5bmFtb2RiOkdldFNoYXJkSXRlcmF0b3JcIixcclxuICAgICAgICBcImR5bmFtb2RiOlB1dEl0ZW1cIixcclxuICAgICAgICBcImR5bmFtb2RiOlF1ZXJ5XCIsXHJcbiAgICAgICAgXCJkeW5hbW9kYjpTY2FuXCIsXHJcbiAgICAgICAgXCJkeW5hbW9kYjpVcGRhdGVJdGVtXCIsXHJcbiAgICBdO1xyXG5cclxuICAgIGdldCBDcmVhdGVkVGFibGUoKSB7XHJcbiAgICAgICAgcmV0dXJuIHRoaXMuY3JlYXRlZFJlc291cmNlO1xyXG4gICAgfVxyXG5cclxuICAgIGNvbnN0cnVjdG9yKHByb3RlY3RlZCBzY29wZTogQ29uc3RydWN0LCBwcm90ZWN0ZWQgdGFibGVOYW1lOiBzdHJpbmcpIHtcclxuICAgICAgICBzdXBlcihzY29wZSwgdGFibGVOYW1lKTtcclxuICAgIH1cclxuXHJcbiAgICBwcm90ZWN0ZWQgY3JlYXRlUmVzb3VyY2Uoc2NvcGU6IENvbnN0cnVjdCk6IFRhYmxlIHtcclxuXHJcbiAgICAgICAgY29uc3QgZGJUYWJsZSA9IG5ldyBUYWJsZShzY29wZSwgYCR7dGhpcy50YWJsZU5hbWV9YCwge1xyXG4gICAgICAgICAgICB0YWJsZU5hbWU6IHRoaXMudGFibGVOYW1lLFxyXG4gICAgICAgICAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1ksXHJcblxyXG4gICAgICAgICAgICBwYXJ0aXRpb25LZXk6IHtcclxuICAgICAgICAgICAgICAgIG5hbWU6ICdwaycsXHJcbiAgICAgICAgICAgICAgICB0eXBlOiBBdHRyaWJ1dGVUeXBlLlNUUklORyxcclxuICAgICAgICAgICAgfSxcclxuICAgICAgICAgICAgc29ydEtleToge1xyXG4gICAgICAgICAgICAgICAgbmFtZTogJ3NrJyxcclxuICAgICAgICAgICAgICAgIHR5cGU6IEF0dHJpYnV0ZVR5cGUuU1RSSU5HLFxyXG4gICAgICAgICAgICB9LFxyXG4gICAgICAgICAgICBiaWxsaW5nTW9kZTogQmlsbGluZ01vZGUuUEFZX1BFUl9SRVFVRVNULFxyXG4gICAgICAgIH0pO1xyXG5cclxuICAgICAgICBjb25zdCBnc2lJbmRleGVzID0gW1xyXG4gICAgICAgICAgICB7XHJcbiAgICAgICAgICAgICAgICBpbmRleE5hbWU6ICdnc2kxSW5kZXgnLFxyXG4gICAgICAgICAgICAgICAgcGFydGl0aW9uS2V5OiB7XHJcbiAgICAgICAgICAgICAgICAgICAgbmFtZTogJ2dzaTFwaycsXHJcbiAgICAgICAgICAgICAgICAgICAgdHlwZTogQXR0cmlidXRlVHlwZS5TVFJJTkdcclxuICAgICAgICAgICAgICAgIH0sXHJcbiAgICAgICAgICAgICAgICBzb3J0S2V5OiB7XHJcbiAgICAgICAgICAgICAgICAgICAgbmFtZTogJ2dzaTFzaycsXHJcbiAgICAgICAgICAgICAgICAgICAgdHlwZTogQXR0cmlidXRlVHlwZS5TVFJJTkdcclxuICAgICAgICAgICAgICAgIH0sXHJcbiAgICAgICAgICAgICAgICBwcm9qZWN0aW9uVHlwZTogUHJvamVjdGlvblR5cGUuQUxMXHJcbiAgICAgICAgICAgIH0sXHJcbiAgICAgICAgICAgIHtcclxuICAgICAgICAgICAgICAgIGluZGV4TmFtZTogJ2dzaTJJbmRleCcsXHJcbiAgICAgICAgICAgICAgICBwYXJ0aXRpb25LZXk6IHtcclxuICAgICAgICAgICAgICAgICAgICBuYW1lOiAnZ3NpMnBrJyxcclxuICAgICAgICAgICAgICAgICAgICB0eXBlOiBBdHRyaWJ1dGVUeXBlLlNUUklOR1xyXG4gICAgICAgICAgICAgICAgfSxcclxuICAgICAgICAgICAgICAgIHNvcnRLZXk6IHtcclxuICAgICAgICAgICAgICAgICAgICBuYW1lOiAnZ3NpMnNrJyxcclxuICAgICAgICAgICAgICAgICAgICB0eXBlOiBBdHRyaWJ1dGVUeXBlLlNUUklOR1xyXG4gICAgICAgICAgICAgICAgfSxcclxuICAgICAgICAgICAgICAgIHByb2plY3Rpb25UeXBlOiBQcm9qZWN0aW9uVHlwZS5BTExcclxuICAgICAgICAgICAgfSxcclxuICAgICAgICAgICAge1xyXG4gICAgICAgICAgICAgICAgaW5kZXhOYW1lOiAnZ3NpM0luZGV4JyxcclxuICAgICAgICAgICAgICAgIHBhcnRpdGlvbktleToge1xyXG4gICAgICAgICAgICAgICAgICAgIG5hbWU6ICdnc2kzcGsnLFxyXG4gICAgICAgICAgICAgICAgICAgIHR5cGU6IEF0dHJpYnV0ZVR5cGUuU1RSSU5HXHJcbiAgICAgICAgICAgICAgICB9LFxyXG4gICAgICAgICAgICAgICAgc29ydEtleToge1xyXG4gICAgICAgICAgICAgICAgICAgIG5hbWU6ICdnc2kzc2snLFxyXG4gICAgICAgICAgICAgICAgICAgIHR5cGU6IEF0dHJpYnV0ZVR5cGUuU1RSSU5HXHJcbiAgICAgICAgICAgICAgICB9LFxyXG4gICAgICAgICAgICAgICAgcHJvamVjdGlvblR5cGU6IFByb2plY3Rpb25UeXBlLkFMTFxyXG4gICAgICAgICAgICB9LFxyXG4gICAgICAgIF07XHJcblxyXG4gICAgICAgIGdzaUluZGV4ZXMubWFwKChnc2kpID0+IHtcclxuXHJcbiAgICAgICAgICAgIGNvbnN0IGdzaVByb3BzOiBHbG9iYWxTZWNvbmRhcnlJbmRleFByb3BzID0ge1xyXG4gICAgICAgICAgICAgICAgaW5kZXhOYW1lOiBnc2kuaW5kZXhOYW1lLFxyXG4gICAgICAgICAgICAgICAgcGFydGl0aW9uS2V5OiBnc2kucGFydGl0aW9uS2V5LFxyXG4gICAgICAgICAgICAgICAgc29ydEtleTogZ3NpLnNvcnRLZXksXHJcbiAgICAgICAgICAgICAgICBwcm9qZWN0aW9uVHlwZTogZ3NpLnByb2plY3Rpb25UeXBlXHJcblxyXG4gICAgICAgICAgICB9O1xyXG5cclxuICAgICAgICAgICAgZGJUYWJsZS5hZGRHbG9iYWxTZWNvbmRhcnlJbmRleChnc2lQcm9wcyk7XHJcbiAgICAgICAgfSk7XHJcblxyXG4gICAgICAgIHJldHVybiBkYlRhYmxlO1xyXG4gICAgfVxyXG5cclxuXHJcbiAgICBwcm90ZWN0ZWQgY3JlYXRlT3V0cHV0PFQ+KHNjb3BlOiBDb25zdHJ1Y3QpOiB2b2lkIHtcclxuXHJcbiAgICAgICAgbmV3IENmbk91dHB1dChzY29wZSwgYGR5bmFtb1RhYmxlLSR7dGhpcy5DcmVhdGVkVGFibGU/LnRhYmxlTmFtZX1gLCB7XHJcbiAgICAgICAgICAgIHZhbHVlOiBgVGFibGUgTmFtZTogJHt0aGlzLmNyZWF0ZWRSZXNvdXJjZT8udGFibGVOYW1lfVxcdCBUYWJsZSBBcm46ICR7dGhpcy5jcmVhdGVkUmVzb3VyY2U/LnRhYmxlQXJufWBcclxuICAgICAgICB9KTtcclxuXHJcbiAgICB9XHJcbn0iXX0=
103
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3JlYXRlRHluYW1vU2luZ2xlVGFibGVEZXNpZ24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2R5bmFtb2RiL0NyZWF0ZUR5bmFtb1NpbmdsZVRhYmxlRGVzaWduLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUF1RDtBQUN2RCwyREFPa0M7QUFFbEMsNkRBQTBEO0FBRTFELE1BQWEsNkJBQThCLFNBQVEsaUNBR2xEO0lBb0J1QjtJQUE0QjtJQW5CbEQsTUFBTSxDQUFDLGdCQUFnQixHQUFhO1FBQ2xDLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIsNkJBQTZCO1FBQzdCLHFCQUFxQjtRQUNyQix3QkFBd0I7UUFDeEIsa0JBQWtCO1FBQ2xCLHFCQUFxQjtRQUNyQiwyQkFBMkI7UUFDM0Isa0JBQWtCO1FBQ2xCLGdCQUFnQjtRQUNoQixlQUFlO1FBQ2YscUJBQXFCO0tBQ3RCLENBQUM7SUFFRixJQUFJLFlBQVk7UUFDZCxPQUFPLElBQUksQ0FBQyxlQUFlLENBQUM7SUFDOUIsQ0FBQztJQUVELFlBQXNCLEtBQWdCLEVBQVksU0FBaUI7UUFDakUsS0FBSyxDQUFDLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQztRQURKLFVBQUssR0FBTCxLQUFLLENBQVc7UUFBWSxjQUFTLEdBQVQsU0FBUyxDQUFRO0lBRW5FLENBQUM7SUFFUyxjQUFjLENBQUMsS0FBZ0I7UUFDdkMsTUFBTSxPQUFPLEdBQUcsSUFBSSxvQkFBSyxDQUFDLEtBQUssRUFBRSxHQUFHLElBQUksQ0FBQyxTQUFTLEVBQUUsRUFBRTtZQUNwRCxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVM7WUFDekIsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTztZQUVwQyxZQUFZLEVBQUU7Z0JBQ1osSUFBSSxFQUFFLElBQUk7Z0JBQ1YsSUFBSSxFQUFFLDRCQUFhLENBQUMsTUFBTTthQUMzQjtZQUNELE9BQU8sRUFBRTtnQkFDUCxJQUFJLEVBQUUsSUFBSTtnQkFDVixJQUFJLEVBQUUsNEJBQWEsQ0FBQyxNQUFNO2FBQzNCO1lBQ0QsV0FBVyxFQUFFLDBCQUFXLENBQUMsZUFBZTtTQUN6QyxDQUFDLENBQUM7UUFFSCxNQUFNLFVBQVUsR0FBRztZQUNqQjtnQkFDRSxTQUFTLEVBQUUsV0FBVztnQkFDdEIsWUFBWSxFQUFFO29CQUNaLElBQUksRUFBRSxRQUFRO29CQUNkLElBQUksRUFBRSw0QkFBYSxDQUFDLE1BQU07aUJBQzNCO2dCQUNELE9BQU8sRUFBRTtvQkFDUCxJQUFJLEVBQUUsUUFBUTtvQkFDZCxJQUFJLEVBQUUsNEJBQWEsQ0FBQyxNQUFNO2lCQUMzQjtnQkFDRCxjQUFjLEVBQUUsNkJBQWMsQ0FBQyxHQUFHO2FBQ25DO1lBQ0Q7Z0JBQ0UsU0FBUyxFQUFFLFdBQVc7Z0JBQ3RCLFlBQVksRUFBRTtvQkFDWixJQUFJLEVBQUUsUUFBUTtvQkFDZCxJQUFJLEVBQUUsNEJBQWEsQ0FBQyxNQUFNO2lCQUMzQjtnQkFDRCxPQUFPLEVBQUU7b0JBQ1AsSUFBSSxFQUFFLFFBQVE7b0JBQ2QsSUFBSSxFQUFFLDRCQUFhLENBQUMsTUFBTTtpQkFDM0I7Z0JBQ0QsY0FBYyxFQUFFLDZCQUFjLENBQUMsR0FBRzthQUNuQztZQUNEO2dCQUNFLFNBQVMsRUFBRSxXQUFXO2dCQUN0QixZQUFZLEVBQUU7b0JBQ1osSUFBSSxFQUFFLFFBQVE7b0JBQ2QsSUFBSSxFQUFFLDRCQUFhLENBQUMsTUFBTTtpQkFDM0I7Z0JBQ0QsT0FBTyxFQUFFO29CQUNQLElBQUksRUFBRSxRQUFRO29CQUNkLElBQUksRUFBRSw0QkFBYSxDQUFDLE1BQU07aUJBQzNCO2dCQUNELGNBQWMsRUFBRSw2QkFBYyxDQUFDLEdBQUc7YUFDbkM7U0FDRixDQUFDO1FBRUYsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQ3JCLE1BQU0sUUFBUSxHQUE4QjtnQkFDMUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxTQUFTO2dCQUN4QixZQUFZLEVBQUUsR0FBRyxDQUFDLFlBQVk7Z0JBQzlCLE9BQU8sRUFBRSxHQUFHLENBQUMsT0FBTztnQkFDcEIsY0FBYyxFQUFFLEdBQUcsQ0FBQyxjQUFjO2FBQ25DLENBQUM7WUFFRixPQUFPLENBQUMsdUJBQXVCLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDNUMsQ0FBQyxDQUFDLENBQUM7UUFFSCxPQUFPLE9BQU8sQ0FBQztJQUNqQixDQUFDO0lBRVMsWUFBWSxDQUFJLEtBQWdCO1FBQ3hDLGtFQUFrRTtRQUNsRSxJQUFJLHVCQUFTLENBQUMsS0FBSyxFQUFFLGFBQWEsRUFBRTtZQUNsQyxLQUFLLEVBQUUsZUFBZSxJQUFJLENBQUMsZUFBZSxFQUFFLFNBQVMsaUJBQWlCLElBQUksQ0FBQyxlQUFlLEVBQUUsUUFBUSxFQUFFO1NBQ3ZHLENBQUMsQ0FBQztJQUNMLENBQUM7O0FBckdILHNFQXNHQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENmbk91dHB1dCwgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xyXG5pbXBvcnQge1xyXG4gIEF0dHJpYnV0ZVR5cGUsXHJcbiAgQmlsbGluZ01vZGUsXHJcbiAgR2xvYmFsU2Vjb25kYXJ5SW5kZXhQcm9wcyxcclxuICBQcm9qZWN0aW9uVHlwZSxcclxuICBUYWJsZSxcclxuICBUYWJsZVByb3BzLFxyXG59IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZHluYW1vZGJcIjtcclxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcclxuaW1wb3J0IHsgVHNnQmFzZVJlc291cmNlIH0gZnJvbSBcIi4uL2Jhc2UvdHNnQmFzZVJlc291cmNlXCI7XHJcblxyXG5leHBvcnQgY2xhc3MgQ3JlYXRlRHluYW1vU2luZ2xlVGFibGVEZXNpZ24gZXh0ZW5kcyBUc2dCYXNlUmVzb3VyY2U8XHJcbiAgVGFibGUsXHJcbiAgc3RyaW5nXHJcbj4ge1xyXG4gIHN0YXRpYyBSZWFkV3JpdGVBY3Rpb25zOiBzdHJpbmdbXSA9IFtcclxuICAgIFwiZHluYW1vZGI6QmF0Y2hHZXRJdGVtXCIsXHJcbiAgICBcImR5bmFtb2RiOkJhdGNoV3JpdGVJdGVtXCIsXHJcbiAgICBcImR5bmFtb2RiOkNvbmRpdGlvbkNoZWNrSXRlbVwiLFxyXG4gICAgXCJkeW5hbW9kYjpEZWxldGVJdGVtXCIsXHJcbiAgICBcImR5bmFtb2RiOkRlc2NyaWJlVGFibGVcIixcclxuICAgIFwiZHluYW1vZGI6R2V0SXRlbVwiLFxyXG4gICAgXCJkeW5hbW9kYjpHZXRSZWNvcmRzXCIsXHJcbiAgICBcImR5bmFtb2RiOkdldFNoYXJkSXRlcmF0b3JcIixcclxuICAgIFwiZHluYW1vZGI6UHV0SXRlbVwiLFxyXG4gICAgXCJkeW5hbW9kYjpRdWVyeVwiLFxyXG4gICAgXCJkeW5hbW9kYjpTY2FuXCIsXHJcbiAgICBcImR5bmFtb2RiOlVwZGF0ZUl0ZW1cIixcclxuICBdO1xyXG5cclxuICBnZXQgQ3JlYXRlZFRhYmxlKCkge1xyXG4gICAgcmV0dXJuIHRoaXMuY3JlYXRlZFJlc291cmNlO1xyXG4gIH1cclxuXHJcbiAgY29uc3RydWN0b3IocHJvdGVjdGVkIHNjb3BlOiBDb25zdHJ1Y3QsIHByb3RlY3RlZCB0YWJsZU5hbWU6IHN0cmluZykge1xyXG4gICAgc3VwZXIoc2NvcGUsIHRhYmxlTmFtZSk7XHJcbiAgfVxyXG5cclxuICBwcm90ZWN0ZWQgY3JlYXRlUmVzb3VyY2Uoc2NvcGU6IENvbnN0cnVjdCk6IFRhYmxlIHtcclxuICAgIGNvbnN0IGRiVGFibGUgPSBuZXcgVGFibGUoc2NvcGUsIGAke3RoaXMudGFibGVOYW1lfWAsIHtcclxuICAgICAgdGFibGVOYW1lOiB0aGlzLnRhYmxlTmFtZSxcclxuICAgICAgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5ERVNUUk9ZLFxyXG5cclxuICAgICAgcGFydGl0aW9uS2V5OiB7XHJcbiAgICAgICAgbmFtZTogXCJwa1wiLFxyXG4gICAgICAgIHR5cGU6IEF0dHJpYnV0ZVR5cGUuU1RSSU5HLFxyXG4gICAgICB9LFxyXG4gICAgICBzb3J0S2V5OiB7XHJcbiAgICAgICAgbmFtZTogXCJza1wiLFxyXG4gICAgICAgIHR5cGU6IEF0dHJpYnV0ZVR5cGUuU1RSSU5HLFxyXG4gICAgICB9LFxyXG4gICAgICBiaWxsaW5nTW9kZTogQmlsbGluZ01vZGUuUEFZX1BFUl9SRVFVRVNULFxyXG4gICAgfSk7XHJcblxyXG4gICAgY29uc3QgZ3NpSW5kZXhlcyA9IFtcclxuICAgICAge1xyXG4gICAgICAgIGluZGV4TmFtZTogXCJnc2kxSW5kZXhcIixcclxuICAgICAgICBwYXJ0aXRpb25LZXk6IHtcclxuICAgICAgICAgIG5hbWU6IFwiZ3NpMXBrXCIsXHJcbiAgICAgICAgICB0eXBlOiBBdHRyaWJ1dGVUeXBlLlNUUklORyxcclxuICAgICAgICB9LFxyXG4gICAgICAgIHNvcnRLZXk6IHtcclxuICAgICAgICAgIG5hbWU6IFwiZ3NpMXNrXCIsXHJcbiAgICAgICAgICB0eXBlOiBBdHRyaWJ1dGVUeXBlLlNUUklORyxcclxuICAgICAgICB9LFxyXG4gICAgICAgIHByb2plY3Rpb25UeXBlOiBQcm9qZWN0aW9uVHlwZS5BTEwsXHJcbiAgICAgIH0sXHJcbiAgICAgIHtcclxuICAgICAgICBpbmRleE5hbWU6IFwiZ3NpMkluZGV4XCIsXHJcbiAgICAgICAgcGFydGl0aW9uS2V5OiB7XHJcbiAgICAgICAgICBuYW1lOiBcImdzaTJwa1wiLFxyXG4gICAgICAgICAgdHlwZTogQXR0cmlidXRlVHlwZS5TVFJJTkcsXHJcbiAgICAgICAgfSxcclxuICAgICAgICBzb3J0S2V5OiB7XHJcbiAgICAgICAgICBuYW1lOiBcImdzaTJza1wiLFxyXG4gICAgICAgICAgdHlwZTogQXR0cmlidXRlVHlwZS5TVFJJTkcsXHJcbiAgICAgICAgfSxcclxuICAgICAgICBwcm9qZWN0aW9uVHlwZTogUHJvamVjdGlvblR5cGUuQUxMLFxyXG4gICAgICB9LFxyXG4gICAgICB7XHJcbiAgICAgICAgaW5kZXhOYW1lOiBcImdzaTNJbmRleFwiLFxyXG4gICAgICAgIHBhcnRpdGlvbktleToge1xyXG4gICAgICAgICAgbmFtZTogXCJnc2kzcGtcIixcclxuICAgICAgICAgIHR5cGU6IEF0dHJpYnV0ZVR5cGUuU1RSSU5HLFxyXG4gICAgICAgIH0sXHJcbiAgICAgICAgc29ydEtleToge1xyXG4gICAgICAgICAgbmFtZTogXCJnc2kzc2tcIixcclxuICAgICAgICAgIHR5cGU6IEF0dHJpYnV0ZVR5cGUuU1RSSU5HLFxyXG4gICAgICAgIH0sXHJcbiAgICAgICAgcHJvamVjdGlvblR5cGU6IFByb2plY3Rpb25UeXBlLkFMTCxcclxuICAgICAgfSxcclxuICAgIF07XHJcblxyXG4gICAgZ3NpSW5kZXhlcy5tYXAoKGdzaSkgPT4ge1xyXG4gICAgICBjb25zdCBnc2lQcm9wczogR2xvYmFsU2Vjb25kYXJ5SW5kZXhQcm9wcyA9IHtcclxuICAgICAgICBpbmRleE5hbWU6IGdzaS5pbmRleE5hbWUsXHJcbiAgICAgICAgcGFydGl0aW9uS2V5OiBnc2kucGFydGl0aW9uS2V5LFxyXG4gICAgICAgIHNvcnRLZXk6IGdzaS5zb3J0S2V5LFxyXG4gICAgICAgIHByb2plY3Rpb25UeXBlOiBnc2kucHJvamVjdGlvblR5cGUsXHJcbiAgICAgIH07XHJcblxyXG4gICAgICBkYlRhYmxlLmFkZEdsb2JhbFNlY29uZGFyeUluZGV4KGdzaVByb3BzKTtcclxuICAgIH0pO1xyXG5cclxuICAgIHJldHVybiBkYlRhYmxlO1xyXG4gIH1cclxuXHJcbiAgcHJvdGVjdGVkIGNyZWF0ZU91dHB1dDxUPihzY29wZTogQ29uc3RydWN0KTogdm9pZCB7XHJcbiAgICAvLyBMb2dpY2FsIElEcyBtdXN0IG5vdCBpbmNsdWRlIHVucmVzb2x2ZWQgdG9rZW5zOyB1c2UgYSBzdGFibGUgSURcclxuICAgIG5ldyBDZm5PdXRwdXQoc2NvcGUsIFwiZHluYW1vVGFibGVcIiwge1xyXG4gICAgICB2YWx1ZTogYFRhYmxlIE5hbWU6ICR7dGhpcy5jcmVhdGVkUmVzb3VyY2U/LnRhYmxlTmFtZX1cXHQgVGFibGUgQXJuOiAke3RoaXMuY3JlYXRlZFJlc291cmNlPy50YWJsZUFybn1gLFxyXG4gICAgfSk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
package/dist/resources/lambda/createLambda.js CHANGED
@@ -31,7 +31,7 @@ class CreateLambda extends baseResource_1.BaseResource {
31
31
  createdAssets.forEach((x, idx) => {
32
32
  new aws_cdk_lib_1.CfnOutput(scope, `lambda-${idx}`, {
33
33
  // @ts-ignore
34
- value: x.functionName
34
+ value: x.functionName,
35
35
  });
36
36
  });
37
37
  }
@@ -53,36 +53,42 @@ class CreateLambda extends baseResource_1.BaseResource {
53
53
  prop,
54
54
  role,
55
55
  layers,
56
- props
56
+ props,
57
57
  });
58
58
  }
59
59
  createLambdaFunctionProps(props) {
60
60
  const { prop, role, layers } = props;
61
+ // Create explicit LogGroup to avoid deprecated `logRetention`
62
+ const functionName = `${this.config.AppPrefix}-${prop.name}`;
63
+ const logGroup = new aws_logs_1.LogGroup(this.scope, `${functionName}-logs`, {
64
+ retention: !prop.logDuration
65
+ ? aws_logs_1.RetentionDays.FIVE_DAYS
66
+ : lambdaHelper_1.LambdaHelper.getDayToSaveLogs(prop.logDuration),
67
+ });
61
68
  const lambdaProp = {
62
69
  entry: path.join(prop.codePath),
63
- functionName: `${this.config.AppPrefix}-${prop.name}`,
70
+ functionName,
64
71
  handler: prop.handler,
65
- logRetention: (!prop.logDuration) ? aws_logs_1.RetentionDays.FIVE_DAYS : lambdaHelper_1.LambdaHelper.getDayToSaveLogs(prop.logDuration),
72
+ logGroup,
66
73
  runtime: prop.runtime || this.config.GLOBALS.stackRuntime,
67
74
  timeout: prop.duration || aws_cdk_lib_1.Duration.minutes(2),
68
75
  memorySize: prop.memory || 512,
69
76
  environment: {
70
- "VERBOSE_LOGGING": "true",
71
- ...prop.environment
77
+ VERBOSE_LOGGING: "true",
78
+ ...prop.environment,
72
79
  },
73
80
  bundling: {
74
81
  minify: false,
75
- target: 'es2020',
82
+ target: "es2020",
76
83
  sourceMap: true,
77
84
  sourceMapMode: aws_lambda_nodejs_1.SourceMapMode.EXTERNAL,
78
85
  environment: prop.environment || prop.environment,
79
86
  },
80
87
  role,
81
- layers
88
+ layers,
82
89
  };
83
90
  return lambdaProp;
84
91
  }
85
- ;
86
92
  createAlarmsForLambdas(lambdas) {
87
93
  const lambdaRecords = this.createRecordForLambda(lambdas);
88
94
  // console.log('Lambda Records:', lambdaRecords);
@@ -98,14 +104,14 @@ class CreateLambda extends baseResource_1.BaseResource {
98
104
  const invocationMetric = lambda.metricInvocations({
99
105
  period: aws_cdk_lib_1.Duration.minutes(3),
100
106
  });
101
- const uuid = (0, util_helper_1.getUUID)().split('-')[0];
107
+ const uuid = (0, util_helper_1.getUUID)().split("-")[0];
102
108
  new aws_cloudwatch_1.Alarm(this.scope, `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`, {
103
109
  metric: errorMetric,
104
110
  threshold: 5,
105
111
  comparisonOperator: aws_cloudwatch_1.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
106
112
  evaluationPeriods: 3,
107
113
  alarmDescription: `${this.config.AppPrefix} errors over 3 min period`,
108
- alarmName: `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`
114
+ alarmName: `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`,
109
115
  });
110
116
  new aws_cloudwatch_1.Alarm(this.scope, `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`, {
111
117
  metric: durationMetric,
@@ -113,7 +119,7 @@ class CreateLambda extends baseResource_1.BaseResource {
113
119
  comparisonOperator: aws_cloudwatch_1.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
114
120
  evaluationPeriods: 3,
115
121
  alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} duration errors over 3 min period`,
116
- alarmName: `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`
122
+ alarmName: `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`,
117
123
  });
118
124
  const invocationAlarm = new aws_cloudwatch_1.Alarm(this.scope, `${this.config.AppPrefix}-${lambda.node.id}-invocation-alarm`, {
119
125
  metric: errorMetric,
@@ -121,7 +127,7 @@ class CreateLambda extends baseResource_1.BaseResource {
121
127
  comparisonOperator: aws_cloudwatch_1.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
122
128
  evaluationPeriods: 3,
123
129
  alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} errors over 3 min period`,
124
- alarmName: `${this.config.AppPrefix}-${lambda.node.id}-invocation-Metric-alarm`
130
+ alarmName: `${this.config.AppPrefix}-${lambda.node.id}-invocation-Metric-alarm`,
125
131
  });
126
132
  });
127
133
  }
@@ -141,4 +147,4 @@ class CreateLambda extends baseResource_1.BaseResource {
141
147
  }
142
148
  }
143
149
  exports.CreateLambda = CreateLambda;
144
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createLambda.js","sourceRoot":"","sources":["../../../src/resources/lambda/createLambda.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Duration } from \"aws-cdk-lib\";\r\nimport { TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\r\nimport { Alarm, ComparisonOperator, IAlarmAction } from \"aws-cdk-lib/aws-cloudwatch\";\r\nimport { IRole, ManagedPolicy } from \"aws-cdk-lib/aws-iam\";\r\nimport { LayerVersion, Runtime } from \"aws-cdk-lib/aws-lambda\";\r\nimport { NodejsFunction, NodejsFunctionProps, SourceMapMode } from \"aws-cdk-lib/aws-lambda-nodejs\";\r\nimport { Construct } from \"constructs\";\r\nimport * as path from 'path';\r\nimport { AppConfig } from \"../../config/AppConfig\";\r\nimport { TsgLambdaProp } from \"../../config/types\";\r\n\r\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\r\nimport { CreateLambdaFunctionInput } from \"../../interfaces/CreateLambdaFunctionInput\";\r\nimport { BaseResource } from \"../base/baseResource\";\r\nimport { RetentionDays } from \"aws-cdk-lib/aws-logs\";\r\nimport { LambdaHelper } from \"./lambdaHelper\";\r\nimport { getUUID } from \"../../helpers/util-helper\";\r\n\r\n\r\nexport class CreateLambda extends BaseResource<NodejsFunction> {\r\n\r\n    public Lambdas: NodejsFunction[] = [];\r\n    public LambdaRecords: Record<string, NodejsFunction> = {};\r\n\r\n    constructor(scope: Construct, config: AppConfig, private layers?: LayerVersion[]) {\r\n        super(scope, config);\r\n\r\n        const resources = this.createResource(scope);\r\n\r\n        this.createdResources = [...resources];\r\n\r\n        this.Lambdas = [...resources];\r\n\r\n        this.createAlarmsForLambdas(this.Lambdas);\r\n\r\n        this.LambdaRecords = this.createRecordForLambda(this.Lambdas);\r\n\r\n        this.createOutput(scope, resources);\r\n    }\r\n\r\n    protected createResource(scope: Construct): NodejsFunction[] {\r\n\r\n        const result = this.createLambdas(this.config);\r\n\r\n        return result;\r\n    }\r\n\r\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\r\n        createdAssets.forEach((x, idx) => {\r\n\r\n            new CfnOutput(scope, `lambda-${idx}`, {\r\n                // @ts-ignore\r\n                value: x.functionName\r\n            });\r\n        });\r\n    }\r\n\r\n    private createLambdas(config: AppConfig): NodejsFunction[] {\r\n\r\n        const createdLambdas: NodejsFunction[] = this.createLambdaFunctions(this.scope, undefined, this.layers);\r\n\r\n        return createdLambdas;\r\n    }\r\n\r\n    private createLambdaFunctions(scope: Construct, role?: IRole, layers?: LayerVersion[]) {\r\n\r\n        const createdLambdas = this.config.RESOURCES.LAMBDA.map((config: TsgLambdaProp) => {\r\n\r\n            let lambdaProps = this.createLambdaProps(config, role, layers);\r\n\r\n            const lambdaId = CreateLambda.getIdForLambda(config, this.config);\r\n            let fctn = new NodejsFunction(scope, lambdaId, lambdaProps);\r\n\r\n            return fctn;\r\n        });\r\n\r\n        return createdLambdas || [];\r\n    }\r\n\r\n    private createLambdaProps(prop: TsgLambdaProp, role?: IRole, layers?: LayerVersion[], props?: TsgLambdaProps) {\r\n\r\n        return this.createLambdaFunctionProps({\r\n            prop,\r\n            role,\r\n            layers,\r\n            props\r\n        });\r\n    }\r\n\r\n    private createLambdaFunctionProps(props: CreateLambdaFunctionInput) {\r\n        const { prop, role, layers } = props;\r\n\r\n        const lambdaProp: NodejsFunctionProps = {\r\n            entry: path.join(prop.codePath),\r\n            functionName: `${this.config.AppPrefix}-${prop.name}`,\r\n            handler: prop.handler,\r\n            logRetention: (!prop.logDuration) ? RetentionDays.FIVE_DAYS : LambdaHelper.getDayToSaveLogs(prop.logDuration),\r\n            runtime: prop.runtime || this.config.GLOBALS.stackRuntime,\r\n            timeout: prop.duration || Duration.minutes(2),\r\n            memorySize: prop.memory || 512,\r\n            environment: {\r\n                \"VERBOSE_LOGGING\": \"true\",\r\n                ...prop.environment\r\n            },\r\n            bundling: {\r\n                minify: false,\r\n                target: 'es2020',\r\n                sourceMap: true,\r\n                sourceMapMode: SourceMapMode.EXTERNAL,\r\n                environment: prop.environment || prop.environment,\r\n            },\r\n            role,\r\n            layers\r\n\r\n        }\r\n\r\n        return lambdaProp;\r\n    };\r\n\r\n    private createAlarmsForLambdas(lambdas: NodejsFunction[]) {\r\n\r\n        const lambdaRecords = this.createRecordForLambda(lambdas);\r\n\r\n        // console.log('Lambda Records:', lambdaRecords);\r\n        // const lambdaNames = Object.keys(lambdaRecords);\r\n        // console.log('lambda Names from Records', lambdaNames);\r\n\r\n        lambdas.forEach((lambda, idx) => {\r\n\r\n            const errorMetric = lambda.metricErrors({\r\n                period: Duration.minutes(3),\r\n\r\n            });\r\n\r\n            const durationMetric = lambda.metricDuration({\r\n                period: Duration.minutes(3),\r\n            });\r\n\r\n            const invocationMetric = lambda.metricInvocations({\r\n                period: Duration.minutes(3),\r\n            });\r\n\r\n            const uuid = getUUID().split('-')[0];\r\n\r\n            new Alarm(this.scope, `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`, {\r\n                metric: errorMetric,\r\n                threshold: 5,\r\n                comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\r\n                evaluationPeriods: 3,\r\n                alarmDescription: `${this.config.AppPrefix} errors over 3 min period`,\r\n                alarmName: `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`\r\n            });\r\n\r\n            new Alarm(this.scope, `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`, {\r\n                metric: durationMetric,\r\n                threshold: 1,\r\n                comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\r\n                evaluationPeriods: 3,\r\n                alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} duration errors over 3 min period`,\r\n                alarmName: `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`\r\n            });\r\n\r\n            const invocationAlarm = new Alarm(this.scope, `${this.config.AppPrefix}-${lambda.node.id}-invocation-alarm`, {\r\n                metric: errorMetric,\r\n                threshold: 1000,\r\n                comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\r\n                evaluationPeriods: 3,\r\n                alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} errors over 3 min period`,\r\n                alarmName: `${this.config.AppPrefix}-${lambda.node.id}-invocation-Metric-alarm`\r\n            });\r\n        });\r\n    }\r\n\r\n    public static getIdForLambda(lambdaProp: TsgLambdaProp, appConfig: AppConfig) {\r\n        return `${appConfig.AppPrefix}-${lambdaProp.name}`.toLowerCase();\r\n    }\r\n\r\n    private createRecordForLambda(lambdas: NodejsFunction[]) {\r\n\r\n        const names = this.config.RESOURCES.LAMBDA.map((lambda) => {\r\n            return lambda.name;\r\n        });\r\n\r\n        const lambdaNames = [...names] as const;\r\n\r\n        type LambdaName = typeof lambdaNames[number];\r\n\r\n\r\n        const lambdaRecord: Record<LambdaName, NodejsFunction> = {} as Record<LambdaName, NodejsFunction>;\r\n\r\n        lambdas.forEach((lambda, idx) => {\r\n            lambdaRecord[lambdaNames[idx] as LambdaName] = lambdas[idx];\r\n        });\r\n\r\n        return lambdaRecord;\r\n    }\r\n\r\n   \r\n\r\n    \r\n}\r\n\r\n\r\n"]}
150
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createLambda.js","sourceRoot":"","sources":["../../../src/resources/lambda/createLambda.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Duration } from \"aws-cdk-lib\";\r\nimport { TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\r\nimport {\r\n  Alarm,\r\n  ComparisonOperator,\r\n  IAlarmAction,\r\n} from \"aws-cdk-lib/aws-cloudwatch\";\r\nimport { IRole, ManagedPolicy } from \"aws-cdk-lib/aws-iam\";\r\nimport { LayerVersion, Runtime } from \"aws-cdk-lib/aws-lambda\";\r\nimport {\r\n  NodejsFunction,\r\n  NodejsFunctionProps,\r\n  SourceMapMode,\r\n} from \"aws-cdk-lib/aws-lambda-nodejs\";\r\nimport { Construct } from \"constructs\";\r\nimport * as path from \"path\";\r\nimport { AppConfig } from \"../../config/AppConfig\";\r\nimport { TsgLambdaProp } from \"../../config/types\";\r\n\r\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\r\nimport { CreateLambdaFunctionInput } from \"../../interfaces/CreateLambdaFunctionInput\";\r\nimport { BaseResource } from \"../base/baseResource\";\r\nimport { LogGroup, RetentionDays } from \"aws-cdk-lib/aws-logs\";\r\nimport { LambdaHelper } from \"./lambdaHelper\";\r\nimport { getUUID } from \"../../helpers/util-helper\";\r\n\r\nexport class CreateLambda extends BaseResource<NodejsFunction> {\r\n  public Lambdas: NodejsFunction[] = [];\r\n  public LambdaRecords: Record<string, NodejsFunction> = {};\r\n\r\n  constructor(\r\n    scope: Construct,\r\n    config: AppConfig,\r\n    private layers?: LayerVersion[]\r\n  ) {\r\n    super(scope, config);\r\n\r\n    const resources = this.createResource(scope);\r\n\r\n    this.createdResources = [...resources];\r\n\r\n    this.Lambdas = [...resources];\r\n\r\n    this.createAlarmsForLambdas(this.Lambdas);\r\n\r\n    this.LambdaRecords = this.createRecordForLambda(this.Lambdas);\r\n\r\n    this.createOutput(scope, resources);\r\n  }\r\n\r\n  protected createResource(scope: Construct): NodejsFunction[] {\r\n    const result = this.createLambdas(this.config);\r\n\r\n    return result;\r\n  }\r\n\r\n  protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\r\n    createdAssets.forEach((x, idx) => {\r\n      new CfnOutput(scope, `lambda-${idx}`, {\r\n        // @ts-ignore\r\n        value: x.functionName,\r\n      });\r\n    });\r\n  }\r\n\r\n  private createLambdas(config: AppConfig): NodejsFunction[] {\r\n    const createdLambdas: NodejsFunction[] = this.createLambdaFunctions(\r\n      this.scope,\r\n      undefined,\r\n      this.layers\r\n    );\r\n\r\n    return createdLambdas;\r\n  }\r\n\r\n  private createLambdaFunctions(\r\n    scope: Construct,\r\n    role?: IRole,\r\n    layers?: LayerVersion[]\r\n  ) {\r\n    const createdLambdas = this.config.RESOURCES.LAMBDA.map(\r\n      (config: TsgLambdaProp) => {\r\n        let lambdaProps = this.createLambdaProps(config, role, layers);\r\n\r\n        const lambdaId = CreateLambda.getIdForLambda(config, this.config);\r\n        let fctn = new NodejsFunction(scope, lambdaId, lambdaProps);\r\n\r\n        return fctn;\r\n      }\r\n    );\r\n\r\n    return createdLambdas || [];\r\n  }\r\n\r\n  private createLambdaProps(\r\n    prop: TsgLambdaProp,\r\n    role?: IRole,\r\n    layers?: LayerVersion[],\r\n    props?: TsgLambdaProps\r\n  ) {\r\n    return this.createLambdaFunctionProps({\r\n      prop,\r\n      role,\r\n      layers,\r\n      props,\r\n    });\r\n  }\r\n\r\n  private createLambdaFunctionProps(props: CreateLambdaFunctionInput) {\r\n    const { prop, role, layers } = props;\r\n\r\n    // Create explicit LogGroup to avoid deprecated `logRetention`\r\n    const functionName = `${this.config.AppPrefix}-${prop.name}`;\r\n    const logGroup = new LogGroup(this.scope, `${functionName}-logs`, {\r\n      retention: !prop.logDuration\r\n        ? RetentionDays.FIVE_DAYS\r\n        : LambdaHelper.getDayToSaveLogs(prop.logDuration),\r\n    });\r\n\r\n    const lambdaProp: NodejsFunctionProps = {\r\n      entry: path.join(prop.codePath),\r\n      functionName,\r\n      handler: prop.handler,\r\n      logGroup,\r\n      runtime: prop.runtime || this.config.GLOBALS.stackRuntime,\r\n      timeout: prop.duration || Duration.minutes(2),\r\n      memorySize: prop.memory || 512,\r\n      environment: {\r\n        VERBOSE_LOGGING: \"true\",\r\n        ...prop.environment,\r\n      },\r\n      bundling: {\r\n        minify: false,\r\n        target: \"es2020\",\r\n        sourceMap: true,\r\n        sourceMapMode: SourceMapMode.EXTERNAL,\r\n        environment: prop.environment || prop.environment,\r\n      },\r\n      role,\r\n      layers,\r\n    };\r\n\r\n    return lambdaProp;\r\n  }\r\n\r\n  private createAlarmsForLambdas(lambdas: NodejsFunction[]) {\r\n    const lambdaRecords = this.createRecordForLambda(lambdas);\r\n\r\n    // console.log('Lambda Records:', lambdaRecords);\r\n    // const lambdaNames = Object.keys(lambdaRecords);\r\n    // console.log('lambda Names from Records', lambdaNames);\r\n\r\n    lambdas.forEach((lambda, idx) => {\r\n      const errorMetric = lambda.metricErrors({\r\n        period: Duration.minutes(3),\r\n      });\r\n\r\n      const durationMetric = lambda.metricDuration({\r\n        period: Duration.minutes(3),\r\n      });\r\n\r\n      const invocationMetric = lambda.metricInvocations({\r\n        period: Duration.minutes(3),\r\n      });\r\n\r\n      const uuid = getUUID().split(\"-\")[0];\r\n\r\n      new Alarm(\r\n        this.scope,\r\n        `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`,\r\n        {\r\n          metric: errorMetric,\r\n          threshold: 5,\r\n          comparisonOperator:\r\n            ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\r\n          evaluationPeriods: 3,\r\n          alarmDescription: `${this.config.AppPrefix} errors over 3 min period`,\r\n          alarmName: `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`,\r\n        }\r\n      );\r\n\r\n      new Alarm(\r\n        this.scope,\r\n        `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`,\r\n        {\r\n          metric: durationMetric,\r\n          threshold: 1,\r\n          comparisonOperator:\r\n            ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\r\n          evaluationPeriods: 3,\r\n          alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} duration errors over 3 min period`,\r\n          alarmName: `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`,\r\n        }\r\n      );\r\n\r\n      const invocationAlarm = new Alarm(\r\n        this.scope,\r\n        `${this.config.AppPrefix}-${lambda.node.id}-invocation-alarm`,\r\n        {\r\n          metric: errorMetric,\r\n          threshold: 1000,\r\n          comparisonOperator:\r\n            ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\r\n          evaluationPeriods: 3,\r\n          alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} errors over 3 min period`,\r\n          alarmName: `${this.config.AppPrefix}-${lambda.node.id}-invocation-Metric-alarm`,\r\n        }\r\n      );\r\n    });\r\n  }\r\n\r\n  public static getIdForLambda(\r\n    lambdaProp: TsgLambdaProp,\r\n    appConfig: AppConfig\r\n  ) {\r\n    return `${appConfig.AppPrefix}-${lambdaProp.name}`.toLowerCase();\r\n  }\r\n\r\n  private createRecordForLambda(lambdas: NodejsFunction[]) {\r\n    const names = this.config.RESOURCES.LAMBDA.map((lambda) => {\r\n      return lambda.name;\r\n    });\r\n\r\n    const lambdaNames = [...names] as const;\r\n\r\n    type LambdaName = (typeof lambdaNames)[number];\r\n\r\n    const lambdaRecord: Record<LambdaName, NodejsFunction> = {} as Record<\r\n      LambdaName,\r\n      NodejsFunction\r\n    >;\r\n\r\n    lambdas.forEach((lambda, idx) => {\r\n      lambdaRecord[lambdaNames[idx] as LambdaName] = lambdas[idx];\r\n    });\r\n\r\n    return lambdaRecord;\r\n  }\r\n}\r\n"]}
package/dist/resources/sqs/create-sqs-resource.js CHANGED
@@ -2,20 +2,24 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createSQSResource = void 0;
4
4
  const aws_sqs_1 = require("aws-cdk-lib/aws-sqs");
5
+ const core_1 = require("aws-cdk-lib/core");
5
6
  const createSQSResource = (scope, queueName) => {
6
- const dlQueue = new aws_sqs_1.Queue(scope, `sqs-queue-dl-${queueName} `, {
7
- queueName: `${queueName}-dead-letter-queue`,
7
+ const stackSuffix = core_1.Stack.of(scope).stackName;
8
+ const physicalQueueName = `${queueName}-${stackSuffix}`;
9
+ const physicalDlqName = `${queueName}-dead-letter-queue-${stackSuffix}`;
10
+ const dlQueue = new aws_sqs_1.Queue(scope, `sqs-queue-dl-${physicalQueueName}`, {
11
+ queueName: physicalDlqName,
8
12
  });
9
13
  const queueProp = {
10
- queueName,
14
+ queueName: physicalQueueName,
11
15
  deadLetterQueue: {
12
16
  queue: dlQueue,
13
- maxReceiveCount: 5
14
- }
17
+ maxReceiveCount: 5,
18
+ },
15
19
  };
16
20
  // SQS resource creation logic goes here
17
- const createdQueue = new aws_sqs_1.Queue(scope, `sqs-queue-${queueName}`, queueProp);
21
+ const createdQueue = new aws_sqs_1.Queue(scope, `sqs-queue-${physicalQueueName}`, queueProp);
18
22
  return createdQueue;
19
23
  };
20
24
  exports.createSQSResource = createSQSResource;
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLXNxcy1yZXNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9yZXNvdXJjZXMvc3FzL2NyZWF0ZS1zcXMtcmVzb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaURBQXdEO0FBR2pELE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxLQUFnQixFQUFFLFNBQWlCLEVBQUUsRUFBRTtJQUVyRSxNQUFNLE9BQU8sR0FBRyxJQUFJLGVBQUssQ0FBQyxLQUFLLEVBQUUsZ0JBQWdCLFNBQVMsR0FBRyxFQUFFO1FBQy9ELFNBQVMsRUFBRSxHQUFHLFNBQVMsb0JBQW9CO0tBQzVDLENBQUMsQ0FBQztJQUVELE1BQU0sU0FBUyxHQUFlO1FBQzFCLFNBQVM7UUFDVCxlQUFlLEVBQUU7WUFDYixLQUFLLEVBQUUsT0FBTztZQUNkLGVBQWUsRUFBRSxDQUFDO1NBQ3JCO0tBQ0osQ0FBQztJQUVGLHdDQUF3QztJQUMxQyxNQUFNLFlBQVksR0FBRyxJQUFJLGVBQUssQ0FBQyxLQUFLLEVBQUUsYUFBYSxTQUFTLEVBQUUsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUUzRSxPQUFPLFlBQVksQ0FBQztBQUN0QixDQUFDLENBQUM7QUFsQlcsUUFBQSxpQkFBaUIscUJBa0I1QiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFF1ZXVlLCBRdWV1ZVByb3BzIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1zcXNcIjtcclxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcclxuXHJcbmV4cG9ydCBjb25zdCBjcmVhdGVTUVNSZXNvdXJjZSA9IChzY29wZTogQ29uc3RydWN0LCBxdWV1ZU5hbWU6IHN0cmluZykgPT4ge1xyXG4gIFxyXG4gICAgY29uc3QgZGxRdWV1ZSA9IG5ldyBRdWV1ZShzY29wZSwgYHNxcy1xdWV1ZS1kbC0ke3F1ZXVlTmFtZX0gYCwge1xyXG4gICAgcXVldWVOYW1lOiBgJHtxdWV1ZU5hbWV9LWRlYWQtbGV0dGVyLXF1ZXVlYCwgICAgICAgIFxyXG4gIH0pO1xyXG5cclxuICAgIGNvbnN0IHF1ZXVlUHJvcDogUXVldWVQcm9wcyA9IHtcclxuICAgICAgICBxdWV1ZU5hbWUsXHJcbiAgICAgICAgZGVhZExldHRlclF1ZXVlOiB7XHJcbiAgICAgICAgICAgIHF1ZXVlOiBkbFF1ZXVlLFxyXG4gICAgICAgICAgICBtYXhSZWNlaXZlQ291bnQ6IDVcclxuICAgICAgICB9XHJcbiAgICB9O1xyXG4gIFxyXG4gICAgLy8gU1FTIHJlc291cmNlIGNyZWF0aW9uIGxvZ2ljIGdvZXMgaGVyZVxyXG4gIGNvbnN0IGNyZWF0ZWRRdWV1ZSA9IG5ldyBRdWV1ZShzY29wZSwgYHNxcy1xdWV1ZS0ke3F1ZXVlTmFtZX1gLCBxdWV1ZVByb3ApO1xyXG5cclxuICByZXR1cm4gY3JlYXRlZFF1ZXVlO1xyXG59O1xyXG4iXX0=
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLXNxcy1yZXNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9yZXNvdXJjZXMvc3FzL2NyZWF0ZS1zcXMtcmVzb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaURBQXdEO0FBQ3hELDJDQUF5QztBQUdsQyxNQUFNLGlCQUFpQixHQUFHLENBQUMsS0FBZ0IsRUFBRSxTQUFpQixFQUFFLEVBQUU7SUFDdkUsTUFBTSxXQUFXLEdBQUcsWUFBSyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDOUMsTUFBTSxpQkFBaUIsR0FBRyxHQUFHLFNBQVMsSUFBSSxXQUFXLEVBQUUsQ0FBQztJQUN4RCxNQUFNLGVBQWUsR0FBRyxHQUFHLFNBQVMsc0JBQXNCLFdBQVcsRUFBRSxDQUFDO0lBRXhFLE1BQU0sT0FBTyxHQUFHLElBQUksZUFBSyxDQUFDLEtBQUssRUFBRSxnQkFBZ0IsaUJBQWlCLEVBQUUsRUFBRTtRQUNwRSxTQUFTLEVBQUUsZUFBZTtLQUMzQixDQUFDLENBQUM7SUFFRCxNQUFNLFNBQVMsR0FBZTtRQUM1QixTQUFTLEVBQUUsaUJBQWlCO1FBQzVCLGVBQWUsRUFBRTtZQUNmLEtBQUssRUFBRSxPQUFPO1lBQ2QsZUFBZSxFQUFFLENBQUM7U0FDbkI7S0FDRixDQUFDO0lBRUYsd0NBQXdDO0lBQzFDLE1BQU0sWUFBWSxHQUFHLElBQUksZUFBSyxDQUFDLEtBQUssRUFBRSxhQUFhLGlCQUFpQixFQUFFLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFFbkYsT0FBTyxZQUFZLENBQUM7QUFDdEIsQ0FBQyxDQUFDO0FBckJXLFFBQUEsaUJBQWlCLHFCQXFCNUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBRdWV1ZSwgUXVldWVQcm9wcyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3Mtc3FzXCI7XHJcbmltcG9ydCB7IFN0YWNrIH0gZnJvbSBcImF3cy1jZGstbGliL2NvcmVcIjtcclxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcclxuXHJcbmV4cG9ydCBjb25zdCBjcmVhdGVTUVNSZXNvdXJjZSA9IChzY29wZTogQ29uc3RydWN0LCBxdWV1ZU5hbWU6IHN0cmluZykgPT4ge1xyXG4gIGNvbnN0IHN0YWNrU3VmZml4ID0gU3RhY2sub2Yoc2NvcGUpLnN0YWNrTmFtZTtcclxuICBjb25zdCBwaHlzaWNhbFF1ZXVlTmFtZSA9IGAke3F1ZXVlTmFtZX0tJHtzdGFja1N1ZmZpeH1gO1xyXG4gIGNvbnN0IHBoeXNpY2FsRGxxTmFtZSA9IGAke3F1ZXVlTmFtZX0tZGVhZC1sZXR0ZXItcXVldWUtJHtzdGFja1N1ZmZpeH1gO1xyXG5cclxuICBjb25zdCBkbFF1ZXVlID0gbmV3IFF1ZXVlKHNjb3BlLCBgc3FzLXF1ZXVlLWRsLSR7cGh5c2ljYWxRdWV1ZU5hbWV9YCwge1xyXG4gICAgcXVldWVOYW1lOiBwaHlzaWNhbERscU5hbWUsXHJcbiAgfSk7XHJcblxyXG4gICAgY29uc3QgcXVldWVQcm9wOiBRdWV1ZVByb3BzID0ge1xyXG4gICAgICBxdWV1ZU5hbWU6IHBoeXNpY2FsUXVldWVOYW1lLFxyXG4gICAgICBkZWFkTGV0dGVyUXVldWU6IHtcclxuICAgICAgICBxdWV1ZTogZGxRdWV1ZSxcclxuICAgICAgICBtYXhSZWNlaXZlQ291bnQ6IDUsXHJcbiAgICAgIH0sXHJcbiAgICB9O1xyXG4gIFxyXG4gICAgLy8gU1FTIHJlc291cmNlIGNyZWF0aW9uIGxvZ2ljIGdvZXMgaGVyZVxyXG4gIGNvbnN0IGNyZWF0ZWRRdWV1ZSA9IG5ldyBRdWV1ZShzY29wZSwgYHNxcy1xdWV1ZS0ke3BoeXNpY2FsUXVldWVOYW1lfWAsIHF1ZXVlUHJvcCk7XHJcblxyXG4gIHJldHVybiBjcmVhdGVkUXVldWU7XHJcbn07XHJcbiJdfQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sylvesterllc/aws-constructs",
3
- "version": "1.1.44",
3
+ "version": "1.1.45",
4
4
  "description": "AWS Constructs",
5
5
  "main": "dist/index.js",
6
6
  "keywords": [
package/src/resources/dynamodb/CreateDynamoSingleTableDesign.ts CHANGED
@@ -1,112 +1,115 @@
1
1
  import { CfnOutput, RemovalPolicy } from "aws-cdk-lib";
2
- import { AttributeType, BillingMode, GlobalSecondaryIndexProps, ProjectionType, Table, TableProps } from "aws-cdk-lib/aws-dynamodb";
2
+ import {
3
+ AttributeType,
4
+ BillingMode,
5
+ GlobalSecondaryIndexProps,
6
+ ProjectionType,
7
+ Table,
8
+ TableProps,
9
+ } from "aws-cdk-lib/aws-dynamodb";
3
10
  import { Construct } from "constructs";
4
11
  import { TsgBaseResource } from "../base/tsgBaseResource";
5
12
 
6
-
7
- export class CreateDynamoSingleTableDesign extends TsgBaseResource<Table, string> {
8
-
9
- static ReadWriteActions: string[] = [
10
- "dynamodb:BatchGetItem",
11
- "dynamodb:BatchWriteItem",
12
- "dynamodb:ConditionCheckItem",
13
- "dynamodb:DeleteItem",
14
- "dynamodb:DescribeTable",
15
- "dynamodb:GetItem",
16
- "dynamodb:GetRecords",
17
- "dynamodb:GetShardIterator",
18
- "dynamodb:PutItem",
19
- "dynamodb:Query",
20
- "dynamodb:Scan",
21
- "dynamodb:UpdateItem",
13
+ export class CreateDynamoSingleTableDesign extends TsgBaseResource<
14
+ Table,
15
+ string
16
+ > {
17
+ static ReadWriteActions: string[] = [
18
+ "dynamodb:BatchGetItem",
19
+ "dynamodb:BatchWriteItem",
20
+ "dynamodb:ConditionCheckItem",
21
+ "dynamodb:DeleteItem",
22
+ "dynamodb:DescribeTable",
23
+ "dynamodb:GetItem",
24
+ "dynamodb:GetRecords",
25
+ "dynamodb:GetShardIterator",
26
+ "dynamodb:PutItem",
27
+ "dynamodb:Query",
28
+ "dynamodb:Scan",
29
+ "dynamodb:UpdateItem",
30
+ ];
31
+
32
+ get CreatedTable() {
33
+ return this.createdResource;
34
+ }
35
+
36
+ constructor(protected scope: Construct, protected tableName: string) {
37
+ super(scope, tableName);
38
+ }
39
+
40
+ protected createResource(scope: Construct): Table {
41
+ const dbTable = new Table(scope, `${this.tableName}`, {
42
+ tableName: this.tableName,
43
+ removalPolicy: RemovalPolicy.DESTROY,
44
+
45
+ partitionKey: {
46
+ name: "pk",
47
+ type: AttributeType.STRING,
48
+ },
49
+ sortKey: {
50
+ name: "sk",
51
+ type: AttributeType.STRING,
52
+ },
53
+ billingMode: BillingMode.PAY_PER_REQUEST,
54
+ });
55
+
56
+ const gsiIndexes = [
57
+ {
58
+ indexName: "gsi1Index",
59
+ partitionKey: {
60
+ name: "gsi1pk",
61
+ type: AttributeType.STRING,
62
+ },
63
+ sortKey: {
64
+ name: "gsi1sk",
65
+ type: AttributeType.STRING,
66
+ },
67
+ projectionType: ProjectionType.ALL,
68
+ },
69
+ {
70
+ indexName: "gsi2Index",
71
+ partitionKey: {
72
+ name: "gsi2pk",
73
+ type: AttributeType.STRING,
74
+ },
75
+ sortKey: {
76
+ name: "gsi2sk",
77
+ type: AttributeType.STRING,
78
+ },
79
+ projectionType: ProjectionType.ALL,
80
+ },
81
+ {
82
+ indexName: "gsi3Index",
83
+ partitionKey: {
84
+ name: "gsi3pk",
85
+ type: AttributeType.STRING,
86
+ },
87
+ sortKey: {
88
+ name: "gsi3sk",
89
+ type: AttributeType.STRING,
90
+ },
91
+ projectionType: ProjectionType.ALL,
92
+ },
22
93
  ];
23
94
 
24
- get CreatedTable() {
25
- return this.createdResource;
26
- }
27
-
28
- constructor(protected scope: Construct, protected tableName: string) {
29
- super(scope, tableName);
30
- }
31
-
32
- protected createResource(scope: Construct): Table {
33
-
34
- const dbTable = new Table(scope, `${this.tableName}`, {
35
- tableName: this.tableName,
36
- removalPolicy: RemovalPolicy.DESTROY,
37
-
38
- partitionKey: {
39
- name: 'pk',
40
- type: AttributeType.STRING,
41
- },
42
- sortKey: {
43
- name: 'sk',
44
- type: AttributeType.STRING,
45
- },
46
- billingMode: BillingMode.PAY_PER_REQUEST,
47
- });
48
-
49
- const gsiIndexes = [
50
- {
51
- indexName: 'gsi1Index',
52
- partitionKey: {
53
- name: 'gsi1pk',
54
- type: AttributeType.STRING
55
- },
56
- sortKey: {
57
- name: 'gsi1sk',
58
- type: AttributeType.STRING
59
- },
60
- projectionType: ProjectionType.ALL
61
- },
62
- {
63
- indexName: 'gsi2Index',
64
- partitionKey: {
65
- name: 'gsi2pk',
66
- type: AttributeType.STRING
67
- },
68
- sortKey: {
69
- name: 'gsi2sk',
70
- type: AttributeType.STRING
71
- },
72
- projectionType: ProjectionType.ALL
73
- },
74
- {
75
- indexName: 'gsi3Index',
76
- partitionKey: {
77
- name: 'gsi3pk',
78
- type: AttributeType.STRING
79
- },
80
- sortKey: {
81
- name: 'gsi3sk',
82
- type: AttributeType.STRING
83
- },
84
- projectionType: ProjectionType.ALL
85
- },
86
- ];
87
-
88
- gsiIndexes.map((gsi) => {
89
-
90
- const gsiProps: GlobalSecondaryIndexProps = {
91
- indexName: gsi.indexName,
92
- partitionKey: gsi.partitionKey,
93
- sortKey: gsi.sortKey,
94
- projectionType: gsi.projectionType
95
-
96
- };
97
-
98
- dbTable.addGlobalSecondaryIndex(gsiProps);
99
- });
100
-
101
- return dbTable;
102
- }
103
-
104
-
105
- protected createOutput<T>(scope: Construct): void {
106
-
107
- new CfnOutput(scope, `dynamoTable-${this.CreatedTable?.tableName}`, {
108
- value: `Table Name: ${this.createdResource?.tableName}\t Table Arn: ${this.createdResource?.tableArn}`
109
- });
110
-
111
- }
112
- }
95
+ gsiIndexes.map((gsi) => {
96
+ const gsiProps: GlobalSecondaryIndexProps = {
97
+ indexName: gsi.indexName,
98
+ partitionKey: gsi.partitionKey,
99
+ sortKey: gsi.sortKey,
100
+ projectionType: gsi.projectionType,
101
+ };
102
+
103
+ dbTable.addGlobalSecondaryIndex(gsiProps);
104
+ });
105
+
106
+ return dbTable;
107
+ }
108
+
109
+ protected createOutput<T>(scope: Construct): void {
110
+ // Logical IDs must not include unresolved tokens; use a stable ID
111
+ new CfnOutput(scope, "dynamoTable", {
112
+ value: `Table Name: ${this.createdResource?.tableName}\t Table Arn: ${this.createdResource?.tableArn}`,
113
+ });
114
+ }
115
+ }
package/src/resources/lambda/createLambda.ts CHANGED
@@ -1,203 +1,239 @@
1
1
  import { CfnOutput, Duration } from "aws-cdk-lib";
2
2
  import { TokenAuthorizer } from "aws-cdk-lib/aws-apigateway";
3
- import { Alarm, ComparisonOperator, IAlarmAction } from "aws-cdk-lib/aws-cloudwatch";
3
+ import {
4
+ Alarm,
5
+ ComparisonOperator,
6
+ IAlarmAction,
7
+ } from "aws-cdk-lib/aws-cloudwatch";
4
8
  import { IRole, ManagedPolicy } from "aws-cdk-lib/aws-iam";
5
9
  import { LayerVersion, Runtime } from "aws-cdk-lib/aws-lambda";
6
- import { NodejsFunction, NodejsFunctionProps, SourceMapMode } from "aws-cdk-lib/aws-lambda-nodejs";
10
+ import {
11
+ NodejsFunction,
12
+ NodejsFunctionProps,
13
+ SourceMapMode,
14
+ } from "aws-cdk-lib/aws-lambda-nodejs";
7
15
  import { Construct } from "constructs";
8
- import * as path from 'path';
16
+ import * as path from "path";
9
17
  import { AppConfig } from "../../config/AppConfig";
10
18
  import { TsgLambdaProp } from "../../config/types";
11
19
 
12
20
  import { TsgLambdaProps } from "../../config/types/TsgLambdaProps";
13
21
  import { CreateLambdaFunctionInput } from "../../interfaces/CreateLambdaFunctionInput";
14
22
  import { BaseResource } from "../base/baseResource";
15
- import { RetentionDays } from "aws-cdk-lib/aws-logs";
23
+ import { LogGroup, RetentionDays } from "aws-cdk-lib/aws-logs";
16
24
  import { LambdaHelper } from "./lambdaHelper";
17
25
  import { getUUID } from "../../helpers/util-helper";
18
26
 
19
-
20
27
  export class CreateLambda extends BaseResource<NodejsFunction> {
21
-
22
- public Lambdas: NodejsFunction[] = [];
23
- public LambdaRecords: Record<string, NodejsFunction> = {};
24
-
25
- constructor(scope: Construct, config: AppConfig, private layers?: LayerVersion[]) {
26
- super(scope, config);
27
-
28
- const resources = this.createResource(scope);
29
-
30
- this.createdResources = [...resources];
31
-
32
- this.Lambdas = [...resources];
33
-
34
- this.createAlarmsForLambdas(this.Lambdas);
35
-
36
- this.LambdaRecords = this.createRecordForLambda(this.Lambdas);
37
-
38
- this.createOutput(scope, resources);
39
- }
40
-
41
- protected createResource(scope: Construct): NodejsFunction[] {
42
-
43
- const result = this.createLambdas(this.config);
44
-
45
- return result;
46
- }
47
-
48
- protected createOutput<T>(scope: Construct, createdAssets: T[]): void {
49
- createdAssets.forEach((x, idx) => {
50
-
51
- new CfnOutput(scope, `lambda-${idx}`, {
52
- // @ts-ignore
53
- value: x.functionName
54
- });
55
- });
56
- }
57
-
58
- private createLambdas(config: AppConfig): NodejsFunction[] {
59
-
60
- const createdLambdas: NodejsFunction[] = this.createLambdaFunctions(this.scope, undefined, this.layers);
61
-
62
- return createdLambdas;
63
- }
64
-
65
- private createLambdaFunctions(scope: Construct, role?: IRole, layers?: LayerVersion[]) {
66
-
67
- const createdLambdas = this.config.RESOURCES.LAMBDA.map((config: TsgLambdaProp) => {
68
-
69
- let lambdaProps = this.createLambdaProps(config, role, layers);
70
-
71
- const lambdaId = CreateLambda.getIdForLambda(config, this.config);
72
- let fctn = new NodejsFunction(scope, lambdaId, lambdaProps);
73
-
74
- return fctn;
75
- });
76
-
77
- return createdLambdas || [];
78
- }
79
-
80
- private createLambdaProps(prop: TsgLambdaProp, role?: IRole, layers?: LayerVersion[], props?: TsgLambdaProps) {
81
-
82
- return this.createLambdaFunctionProps({
83
- prop,
84
- role,
85
- layers,
86
- props
87
- });
88
- }
89
-
90
- private createLambdaFunctionProps(props: CreateLambdaFunctionInput) {
91
- const { prop, role, layers } = props;
92
-
93
- const lambdaProp: NodejsFunctionProps = {
94
- entry: path.join(prop.codePath),
95
- functionName: `${this.config.AppPrefix}-${prop.name}`,
96
- handler: prop.handler,
97
- logRetention: (!prop.logDuration) ? RetentionDays.FIVE_DAYS : LambdaHelper.getDayToSaveLogs(prop.logDuration),
98
- runtime: prop.runtime || this.config.GLOBALS.stackRuntime,
99
- timeout: prop.duration || Duration.minutes(2),
100
- memorySize: prop.memory || 512,
101
- environment: {
102
- "VERBOSE_LOGGING": "true",
103
- ...prop.environment
104
- },
105
- bundling: {
106
- minify: false,
107
- target: 'es2020',
108
- sourceMap: true,
109
- sourceMapMode: SourceMapMode.EXTERNAL,
110
- environment: prop.environment || prop.environment,
111
- },
112
- role,
113
- layers
114
-
115
- }
116
-
117
- return lambdaProp;
28
+ public Lambdas: NodejsFunction[] = [];
29
+ public LambdaRecords: Record<string, NodejsFunction> = {};
30
+
31
+ constructor(
32
+ scope: Construct,
33
+ config: AppConfig,
34
+ private layers?: LayerVersion[]
35
+ ) {
36
+ super(scope, config);
37
+
38
+ const resources = this.createResource(scope);
39
+
40
+ this.createdResources = [...resources];
41
+
42
+ this.Lambdas = [...resources];
43
+
44
+ this.createAlarmsForLambdas(this.Lambdas);
45
+
46
+ this.LambdaRecords = this.createRecordForLambda(this.Lambdas);
47
+
48
+ this.createOutput(scope, resources);
49
+ }
50
+
51
+ protected createResource(scope: Construct): NodejsFunction[] {
52
+ const result = this.createLambdas(this.config);
53
+
54
+ return result;
55
+ }
56
+
57
+ protected createOutput<T>(scope: Construct, createdAssets: T[]): void {
58
+ createdAssets.forEach((x, idx) => {
59
+ new CfnOutput(scope, `lambda-${idx}`, {
60
+ // @ts-ignore
61
+ value: x.functionName,
62
+ });
63
+ });
64
+ }
65
+
66
+ private createLambdas(config: AppConfig): NodejsFunction[] {
67
+ const createdLambdas: NodejsFunction[] = this.createLambdaFunctions(
68
+ this.scope,
69
+ undefined,
70
+ this.layers
71
+ );
72
+
73
+ return createdLambdas;
74
+ }
75
+
76
+ private createLambdaFunctions(
77
+ scope: Construct,
78
+ role?: IRole,
79
+ layers?: LayerVersion[]
80
+ ) {
81
+ const createdLambdas = this.config.RESOURCES.LAMBDA.map(
82
+ (config: TsgLambdaProp) => {
83
+ let lambdaProps = this.createLambdaProps(config, role, layers);
84
+
85
+ const lambdaId = CreateLambda.getIdForLambda(config, this.config);
86
+ let fctn = new NodejsFunction(scope, lambdaId, lambdaProps);
87
+
88
+ return fctn;
89
+ }
90
+ );
91
+
92
+ return createdLambdas || [];
93
+ }
94
+
95
+ private createLambdaProps(
96
+ prop: TsgLambdaProp,
97
+ role?: IRole,
98
+ layers?: LayerVersion[],
99
+ props?: TsgLambdaProps
100
+ ) {
101
+ return this.createLambdaFunctionProps({
102
+ prop,
103
+ role,
104
+ layers,
105
+ props,
106
+ });
107
+ }
108
+
109
+ private createLambdaFunctionProps(props: CreateLambdaFunctionInput) {
110
+ const { prop, role, layers } = props;
111
+
112
+ // Create explicit LogGroup to avoid deprecated `logRetention`
113
+ const functionName = `${this.config.AppPrefix}-${prop.name}`;
114
+ const logGroup = new LogGroup(this.scope, `${functionName}-logs`, {
115
+ retention: !prop.logDuration
116
+ ? RetentionDays.FIVE_DAYS
117
+ : LambdaHelper.getDayToSaveLogs(prop.logDuration),
118
+ });
119
+
120
+ const lambdaProp: NodejsFunctionProps = {
121
+ entry: path.join(prop.codePath),
122
+ functionName,
123
+ handler: prop.handler,
124
+ logGroup,
125
+ runtime: prop.runtime || this.config.GLOBALS.stackRuntime,
126
+ timeout: prop.duration || Duration.minutes(2),
127
+ memorySize: prop.memory || 512,
128
+ environment: {
129
+ VERBOSE_LOGGING: "true",
130
+ ...prop.environment,
131
+ },
132
+ bundling: {
133
+ minify: false,
134
+ target: "es2020",
135
+ sourceMap: true,
136
+ sourceMapMode: SourceMapMode.EXTERNAL,
137
+ environment: prop.environment || prop.environment,
138
+ },
139
+ role,
140
+ layers,
118
141
  };
119
142
 
120
- private createAlarmsForLambdas(lambdas: NodejsFunction[]) {
121
-
122
- const lambdaRecords = this.createRecordForLambda(lambdas);
123
-
124
- // console.log('Lambda Records:', lambdaRecords);
125
- // const lambdaNames = Object.keys(lambdaRecords);
126
- // console.log('lambda Names from Records', lambdaNames);
127
-
128
- lambdas.forEach((lambda, idx) => {
129
-
130
- const errorMetric = lambda.metricErrors({
131
- period: Duration.minutes(3),
132
-
133
- });
134
-
135
- const durationMetric = lambda.metricDuration({
136
- period: Duration.minutes(3),
137
- });
138
-
139
- const invocationMetric = lambda.metricInvocations({
140
- period: Duration.minutes(3),
141
- });
142
-
143
- const uuid = getUUID().split('-')[0];
144
-
145
- new Alarm(this.scope, `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`, {
146
- metric: errorMetric,
147
- threshold: 5,
148
- comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
149
- evaluationPeriods: 3,
150
- alarmDescription: `${this.config.AppPrefix} errors over 3 min period`,
151
- alarmName: `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`
152
- });
153
-
154
- new Alarm(this.scope, `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`, {
155
- metric: durationMetric,
156
- threshold: 1,
157
- comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
158
- evaluationPeriods: 3,
159
- alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} duration errors over 3 min period`,
160
- alarmName: `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`
161
- });
162
-
163
- const invocationAlarm = new Alarm(this.scope, `${this.config.AppPrefix}-${lambda.node.id}-invocation-alarm`, {
164
- metric: errorMetric,
165
- threshold: 1000,
166
- comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
167
- evaluationPeriods: 3,
168
- alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} errors over 3 min period`,
169
- alarmName: `${this.config.AppPrefix}-${lambda.node.id}-invocation-Metric-alarm`
170
- });
171
- });
172
- }
173
-
174
- public static getIdForLambda(lambdaProp: TsgLambdaProp, appConfig: AppConfig) {
175
- return `${appConfig.AppPrefix}-${lambdaProp.name}`.toLowerCase();
176
- }
177
-
178
- private createRecordForLambda(lambdas: NodejsFunction[]) {
179
-
180
- const names = this.config.RESOURCES.LAMBDA.map((lambda) => {
181
- return lambda.name;
182
- });
183
-
184
- const lambdaNames = [...names] as const;
143
+ return lambdaProp;
144
+ }
145
+
146
+ private createAlarmsForLambdas(lambdas: NodejsFunction[]) {
147
+ const lambdaRecords = this.createRecordForLambda(lambdas);
148
+
149
+ // console.log('Lambda Records:', lambdaRecords);
150
+ // const lambdaNames = Object.keys(lambdaRecords);
151
+ // console.log('lambda Names from Records', lambdaNames);
152
+
153
+ lambdas.forEach((lambda, idx) => {
154
+ const errorMetric = lambda.metricErrors({
155
+ period: Duration.minutes(3),
156
+ });
157
+
158
+ const durationMetric = lambda.metricDuration({
159
+ period: Duration.minutes(3),
160
+ });
161
+
162
+ const invocationMetric = lambda.metricInvocations({
163
+ period: Duration.minutes(3),
164
+ });
165
+
166
+ const uuid = getUUID().split("-")[0];
167
+
168
+ new Alarm(
169
+ this.scope,
170
+ `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`,
171
+ {
172
+ metric: errorMetric,
173
+ threshold: 5,
174
+ comparisonOperator:
175
+ ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
176
+ evaluationPeriods: 3,
177
+ alarmDescription: `${this.config.AppPrefix} errors over 3 min period`,
178
+ alarmName: `${this.config.AppPrefix}-${lambda.node.id}-error-alarm`,
179
+ }
180
+ );
181
+
182
+ new Alarm(
183
+ this.scope,
184
+ `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`,
185
+ {
186
+ metric: durationMetric,
187
+ threshold: 1,
188
+ comparisonOperator:
189
+ ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
190
+ evaluationPeriods: 3,
191
+ alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} duration errors over 3 min period`,
192
+ alarmName: `${this.config.AppPrefix}-${lambda.node.id}-duration-alarm`,
193
+ }
194
+ );
195
+
196
+ const invocationAlarm = new Alarm(
197
+ this.scope,
198
+ `${this.config.AppPrefix}-${lambda.node.id}-invocation-alarm`,
199
+ {
200
+ metric: errorMetric,
201
+ threshold: 1000,
202
+ comparisonOperator:
203
+ ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
204
+ evaluationPeriods: 3,
205
+ alarmDescription: `${this.config.AppPrefix}-${lambda.node.id} errors over 3 min period`,
206
+ alarmName: `${this.config.AppPrefix}-${lambda.node.id}-invocation-Metric-alarm`,
207
+ }
208
+ );
209
+ });
210
+ }
185
211
 
186
- type LambdaName = typeof lambdaNames[number];
212
+ public static getIdForLambda(
213
+ lambdaProp: TsgLambdaProp,
214
+ appConfig: AppConfig
215
+ ) {
216
+ return `${appConfig.AppPrefix}-${lambdaProp.name}`.toLowerCase();
217
+ }
187
218
 
219
+ private createRecordForLambda(lambdas: NodejsFunction[]) {
220
+ const names = this.config.RESOURCES.LAMBDA.map((lambda) => {
221
+ return lambda.name;
222
+ });
188
223
 
189
- const lambdaRecord: Record<LambdaName, NodejsFunction> = {} as Record<LambdaName, NodejsFunction>;
224
+ const lambdaNames = [...names] as const;
190
225
 
191
- lambdas.forEach((lambda, idx) => {
192
- lambdaRecord[lambdaNames[idx] as LambdaName] = lambdas[idx];
193
- });
226
+ type LambdaName = (typeof lambdaNames)[number];
194
227
 
195
- return lambdaRecord;
196
- }
228
+ const lambdaRecord: Record<LambdaName, NodejsFunction> = {} as Record<
229
+ LambdaName,
230
+ NodejsFunction
231
+ >;
197
232
 
198
-
233
+ lambdas.forEach((lambda, idx) => {
234
+ lambdaRecord[lambdaNames[idx] as LambdaName] = lambdas[idx];
235
+ });
199
236
 
200
-
237
+ return lambdaRecord;
238
+ }
201
239
  }
202
-
203
-
package/src/resources/sqs/create-sqs-resource.ts CHANGED
@@ -1,22 +1,26 @@
1
1
  import { Queue, QueueProps } from "aws-cdk-lib/aws-sqs";
2
+ import { Stack } from "aws-cdk-lib/core";
2
3
  import { Construct } from "constructs";
3
4
 
4
5
  export const createSQSResource = (scope: Construct, queueName: string) => {
5
-
6
- const dlQueue = new Queue(scope, `sqs-queue-dl-${queueName} `, {
7
- queueName: `${queueName}-dead-letter-queue`,
6
+ const stackSuffix = Stack.of(scope).stackName;
7
+ const physicalQueueName = `${queueName}-${stackSuffix}`;
8
+ const physicalDlqName = `${queueName}-dead-letter-queue-${stackSuffix}`;
9
+
10
+ const dlQueue = new Queue(scope, `sqs-queue-dl-${physicalQueueName}`, {
11
+ queueName: physicalDlqName,
8
12
  });
9
13
 
10
14
  const queueProp: QueueProps = {
11
- queueName,
12
- deadLetterQueue: {
13
- queue: dlQueue,
14
- maxReceiveCount: 5
15
- }
15
+ queueName: physicalQueueName,
16
+ deadLetterQueue: {
17
+ queue: dlQueue,
18
+ maxReceiveCount: 5,
19
+ },
16
20
  };
17
21
 
18
22
  // SQS resource creation logic goes here
19
- const createdQueue = new Queue(scope, `sqs-queue-${queueName}`, queueProp);
23
+ const createdQueue = new Queue(scope, `sqs-queue-${physicalQueueName}`, queueProp);
20
24
 
21
25
  return createdQueue;
22
26
  };