@sylvesterllc/aws-constructs 1.0.14 → 1.0.16
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.
- package/dist/config/AppConfig.js +6 -4
- package/dist/constructs/MicroService.js +1 -1
- package/dist/resources/dynamodb/CreateDynamo.js +2 -4
- package/dist/resources/gateway/createApi.js +2 -1
- package/dist/resources/gateway/createMicroServiceBundle.js +17 -14
- package/package.json +1 -1
- package/src/config/AppConfig.ts +6 -4
- package/src/constructs/MicroService.ts +0 -3
- package/src/resources/dynamodb/CreateDynamo.ts +1 -4
- package/src/resources/gateway/createApi.ts +3 -0
- package/src/resources/gateway/createMicroServiceBundle.ts +19 -16
package/dist/config/AppConfig.js
CHANGED
|
@@ -34,9 +34,11 @@ class AppConfig {
|
|
|
34
34
|
this.RESOURCES.DYNAMO = {
|
|
35
35
|
...config.RESOURCES.DYNAMO
|
|
36
36
|
};
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
if (config.DNS) {
|
|
38
|
+
this.DNS = {
|
|
39
|
+
...config.DNS
|
|
40
|
+
};
|
|
41
|
+
}
|
|
40
42
|
}
|
|
41
43
|
// this.lambdaConfigs = this.expandProps<TsgLambdaName, TsgLambdaProp>(this.RESOURCES.LAMBDA!);
|
|
42
44
|
// this.dynamoConfigs = this.expandProps<TsgTableName, TsgDynamoProp>(this.RESOURCES.DYNAMO?.TABLES!);
|
|
@@ -58,4 +60,4 @@ class AppConfig {
|
|
|
58
60
|
}
|
|
59
61
|
}
|
|
60
62
|
exports.AppConfig = AppConfig;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBYSxTQUFTO0lBV2xCLElBQUksT0FBTztRQUNQLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7SUFDN0IsQ0FBQztJQUVELElBQUksU0FBUztRQUNULE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7SUFDM0UsQ0FBQztJQUVELFlBQVksTUFBa0I7UUFDMUIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUMxQixDQUFDO0lBRU8sUUFBUSxDQUFDLE1BQWtCO1FBQy9CLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNsQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDL0IsSUFBSSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBR25DLENBQUM7SUFFTyxvQkFBb0IsQ0FBQyxNQUFrQjtRQUMzQyxJQUFJLENBQUMsT0FBTyxHQUFHO1lBQ1gsR0FBRyxNQUFNLENBQUMsT0FBTztTQUNwQixDQUFDO0lBQ04sQ0FBQztJQUVPLGlCQUFpQixDQUFDLE1BQWtCO1FBRXhDLElBQUksTUFBTSxDQUFDLEdBQUc7WUFDVixJQUFJLENBQUMsR0FBRyxHQUFHO2dCQUNQLEdBQUcsTUFBTSxDQUFDLEdBQUc7YUFDaEIsQ0FBQztJQUNWLENBQUM7SUFFTyxpQkFBaUIsQ0FBQyxNQUFrQjtRQUN4QyxJQUFJLENBQUMsU0FBUyxHQUFHO1lBQ2IsR0FBRyxNQUFNLENBQUMsU0FBUztTQUN0QixDQUFDO1FBQ0YsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEdBQUc7WUFDcEIsR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU07U0FDN0IsQ0FBQztRQUVGLElBQUksTUFBTSxDQUFDLEdBQUcsRUFBRTtZQUNaLElBQUksQ0FBQyxHQUFHLEdBQUc7Z0JBQ1AsR0FBRyxNQUFNLENBQUMsR0FBSTthQUNqQixDQUFDO1NBQ0w7SUFDTCxDQUFDO0lBQ0QsbUdBQW1HO0lBQ25HLDBHQUEwRztJQUMxRyxJQUFJO0lBRUksZUFBZSxDQUFPLE1BQVcsRUFBRSxNQUEwQjtRQUVqRSxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1QsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE1BQU0sR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFPLE1BQU0sQ0FBQyxDQUFDO1FBQ3hDLE9BQU8sTUFBTSxDQUFDO0lBRWxCLENBQUM7SUFFTyxXQUFXLENBQU8sSUFBdUI7UUFFN0MsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2xCLGFBQWE7UUFDYixLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUM3QyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ3RCO1FBQ0QsT0FBTyxNQUFhLENBQUM7SUFDekIsQ0FBQztDQUNKO0FBbkZELDhCQW1GQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNvbmZpZyB9IGZyb20gXCJwcm9jZXNzXCI7XG5pbXBvcnQgeyBBcGlBcHBDb25maWcgfSBmcm9tIFwiLi9jdXN0b21Db25maWdzL0FwaUFwcENvbmZpZ1wiO1xuaW1wb3J0IHsgR2xvYmFsQXBwQ29uZmlnIH0gZnJvbSBcIi4vY3VzdG9tQ29uZmlncy9HbG9iYWxBcHBDb25maWdcIjtcbmltcG9ydCB7IElBcHBDb25maWcgfSBmcm9tIFwiLi9jdXN0b21Db25maWdzL0lBcHBDb25maWdcIjtcbmltcG9ydCB7IFJlc291cmNlQXBwQ29uZmlnIH0gZnJvbSBcIi4vY3VzdG9tQ29uZmlncy9SZXNvdXJjZUFwcENvbmZpZ1wiO1xuaW1wb3J0IHsgVHNnRHluYW1vUHJvcCB9IGZyb20gXCIuL3R5cGVzXCI7XG5pbXBvcnQgeyBUc2dEbnNBcHBDb25maWcgfSBmcm9tIFwiLi90eXBlcy9Uc2dEbnNDb25maWdcIjtcbmltcG9ydCB7IFRzZ0xhbWJkYU5hbWUgfSBmcm9tIFwiLi90eXBlcy9Uc2dMYW1iZGFOYW1lXCI7XG5pbXBvcnQgeyBUc2dMYW1iZGFQcm9wIH0gZnJvbSBcIi4vdHlwZXMvVHNnTGFtYmRhUHJvcFwiO1xuXG5leHBvcnQgY2xhc3MgQXBwQ29uZmlnIGltcGxlbWVudHMgSUFwcENvbmZpZyB7XG5cbiAgICBwdWJsaWMgQVBJOiBBcGlBcHBDb25maWc7XG4gICAgcHVibGljIEdMT0JBTFM6IEdsb2JhbEFwcENvbmZpZztcbiAgICBwdWJsaWMgUkVTT1VSQ0VTOiBSZXNvdXJjZUFwcENvbmZpZztcbiAgICBwdWJsaWMgRE5TPzogVHNnRG5zQXBwQ29uZmlnO1xuXG5cbiAgICBwdWJsaWMgbGFtYmRhQ29uZmlnczogVHNnTGFtYmRhUHJvcFtdO1xuICAgIHB1YmxpYyBkeW5hbW9Db25maWdzOiBUc2dEeW5hbW9Qcm9wW107XG5cbiAgICBnZXQgQXBwTmFtZSgpIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuR0xPQkFMUy5uYW1lO1xuICAgIH1cblxuICAgIGdldCBBcHBQcmVmaXgoKSB7XG4gICAgICAgIHJldHVybiAodGhpcy5HTE9CQUxTLnByZWZpeCkgPyB0aGlzLkdMT0JBTFMucHJlZml4IDogdGhpcy5HTE9CQUxTLm5hbWU7XG4gICAgfVxuXG4gICAgY29uc3RydWN0b3IoY29uZmlnOiBJQXBwQ29uZmlnKSB7XG4gICAgICAgIHRoaXMucG9wdWxhdGUoY29uZmlnKTtcbiAgICB9XG5cbiAgICBwcml2YXRlIHBvcHVsYXRlKGNvbmZpZzogSUFwcENvbmZpZykge1xuICAgICAgICB0aGlzLnBvcHVsYXRlR2xvYmFsQ29uZmlnKGNvbmZpZyk7XG4gICAgICAgIHRoaXMucG9wdWxhdGVBcGlDb25maWcoY29uZmlnKTtcbiAgICAgICAgdGhpcy5wb3B1bGF0ZVJlc291cmNlcyhjb25maWcpO1xuXG5cbiAgICB9XG5cbiAgICBwcml2YXRlIHBvcHVsYXRlR2xvYmFsQ29uZmlnKGNvbmZpZzogSUFwcENvbmZpZykge1xuICAgICAgICB0aGlzLkdMT0JBTFMgPSB7XG4gICAgICAgICAgICAuLi5jb25maWcuR0xPQkFMU1xuICAgICAgICB9O1xuICAgIH1cblxuICAgIHByaXZhdGUgcG9wdWxhdGVBcGlDb25maWcoY29uZmlnOiBJQXBwQ29uZmlnKSB7XG5cbiAgICAgICAgaWYgKGNvbmZpZy5BUEkpXG4gICAgICAgICAgICB0aGlzLkFQSSA9IHtcbiAgICAgICAgICAgICAgICAuLi5jb25maWcuQVBJXG4gICAgICAgICAgICB9O1xuICAgIH1cblxuICAgIHByaXZhdGUgcG9wdWxhdGVSZXNvdXJjZXMoY29uZmlnOiBJQXBwQ29uZmlnKSB7XG4gICAgICAgIHRoaXMuUkVTT1VSQ0VTID0ge1xuICAgICAgICAgICAgLi4uY29uZmlnLlJFU09VUkNFU1xuICAgICAgICB9O1xuICAgICAgICB0aGlzLlJFU09VUkNFUy5EWU5BTU8gPSB7XG4gICAgICAgICAgICAuLi5jb25maWcuUkVTT1VSQ0VTLkRZTkFNT1xuICAgICAgICB9O1xuXG4gICAgICAgIGlmIChjb25maWcuRE5TKSB7XG4gICAgICAgICAgICB0aGlzLkROUyA9IHtcbiAgICAgICAgICAgICAgICAuLi5jb25maWcuRE5TIVxuICAgICAgICAgICAgfTtcbiAgICAgICAgfVxuICAgIH1cbiAgICAvLyAgICAgdGhpcy5sYW1iZGFDb25maWdzID0gdGhpcy5leHBhbmRQcm9wczxUc2dMYW1iZGFOYW1lLCBUc2dMYW1iZGFQcm9wPih0aGlzLlJFU09VUkNFUy5MQU1CREEhKTtcbiAgICAvLyAgICAgdGhpcy5keW5hbW9Db25maWdzID0gdGhpcy5leHBhbmRQcm9wczxUc2dUYWJsZU5hbWUsIFRzZ0R5bmFtb1Byb3A+KHRoaXMuUkVTT1VSQ0VTLkRZTkFNTz8uVEFCTEVTISk7XG4gICAgLy8gfVxuXG4gICAgcHJpdmF0ZSBwb3B1bGF0ZUNvbmZpZ3M8VCwgUj4ocmVzdWx0OiBSW10sIHJlY29yZD86IFJlY29yZDxzdHJpbmcsIFI+KSB7XG5cbiAgICAgICAgaWYgKCFyZWNvcmQpIHtcbiAgICAgICAgICAgIHJldHVybiBudWxsO1xuICAgICAgICB9XG5cbiAgICAgICAgcmVzdWx0ID0gdGhpcy5leHBhbmRQcm9wczxULCBSPihyZWNvcmQpO1xuICAgICAgICByZXR1cm4gcmVzdWx0O1xuXG4gICAgfVxuXG4gICAgcHJpdmF0ZSBleHBhbmRQcm9wczxULCBSPihkYXRhOiBSZWNvcmQ8c3RyaW5nLCBSPikge1xuXG4gICAgICAgIGNvbnN0IHJlc3VsdCA9IFtdO1xuICAgICAgICAvLyBAdHMtaWdub3JlXG4gICAgICAgIGZvciAoY29uc3QgW2tleSwgdmFsdWVdIG9mIE9iamVjdC5lbnRyaWVzKGRhdGEpKSB7XG4gICAgICAgICAgICByZXN1bHQucHVzaCh2YWx1ZSk7XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIHJlc3VsdCBhcyBSW107XG4gICAgfVxufSJdfQ==
|
|
@@ -42,4 +42,4 @@ class MicroService extends constructs_1.Construct {
|
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
exports.MicroService = MicroService;
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWljcm9TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnN0cnVjdHMvTWljcm9TZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJDQUF1QztBQUV2Qyw0RkFBeUY7QUFDekYscUVBQW9FO0FBQ3BFLDhEQUFxRDtBQUNyRCxrRUFBZ0U7QUFFaEUsbURBQWdEO0FBQ2hELDZDQUFtQztBQUNuQyxNQUFhLFlBQWEsU0FBUSxzQkFBUztJQUt2QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXdCO1FBQzlELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLHFCQUFTLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFdEMsSUFBSSxDQUFDLG1CQUFtQixHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTTtZQUN0RCxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUU3RCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFFbkMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUN6QixDQUFDO0lBRU8sTUFBTSxDQUFDLEtBQWdCLEVBQUUsS0FBZ0I7UUFFN0MsSUFBSSxNQUFNLEdBQXdCLFNBQVMsQ0FBQztRQUc1QyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLEVBQUU7WUFDaEMsK0VBQStFO1lBQy9FLHVCQUF1QjtZQUN0QixNQUFNLFNBQVMsR0FBRyxJQUFBLGtDQUFnQixFQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1NBQ3JGO1FBSUQsdURBQXVEO1FBRXZELE1BQU0sT0FBTyxHQUFHLElBQUksZUFBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBRXBELE1BQU0sTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUFDLGlCQUFpQjtRQUUzQyxzQ0FBc0M7UUFDdEMsSUFBSSxJQUFJLENBQUMsbUJBQW1CLEVBQUU7WUFDMUIsTUFBTSxNQUFNLEdBQUcsSUFBSSw2QkFBYyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7WUFFekQsTUFBTSxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUM7U0FDakM7UUFFRCxrRUFBa0U7UUFFbEUsTUFBTSxNQUFNLEdBQUcsSUFBSSxtREFBd0IsQ0FBQyxLQUFLLEVBQ3pDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQ2pFLE1BQU07SUFHVixDQUFDO0lBRVMsU0FBUyxDQUFDLEtBQWdCO1FBQ2hDLGtCQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNsRCxrQkFBSSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsZUFBZSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDbEUsQ0FBQztDQUNKO0FBekRELG9DQXlEQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRhYmxlIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1keW5hbW9kYlwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IE1pY3Jvc2VydmljZVByb3BzIH0gZnJvbSBcIi4uL2ludGVyZmFjZXMvTWljcm9zZXJ2aWNlUHJvcHNcIjtcbmltcG9ydCB7IENyZWF0ZU1pY3JvU2VydmljZUJ1bmRsZSB9IGZyb20gXCIuLi9yZXNvdXJjZXMvZ2F0ZXdheS9jcmVhdGVNaWNyb1NlcnZpY2VCdW5kbGVcIjtcbmltcG9ydCB7IENyZWF0ZUR5bmFtb0RiIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9keW5hbW9kYi9DcmVhdGVEeW5hbW9cIjtcbmltcG9ydCB7IEFwaSB9IGZyb20gXCIuLi9yZXNvdXJjZXMvZ2F0ZXdheS9jcmVhdGVBcGlcIjtcbmltcG9ydCB7IGdldFNlY3JldE1hbmFnZXIgfSBmcm9tIFwiLi4vcmVzb3VyY2VzL3NlY3VyaXR5TWFuYWdlclwiO1xuaW1wb3J0IHsgY3JlYXRlQ29tbW9uTGF5ZXIgfSBmcm9tIFwiLi4vcmVzb3VyY2VzL2hlbHBlcnMvY3JlYXRlQ29tbW9uTGF5ZXJcIjtcbmltcG9ydCB7IEFwcENvbmZpZyB9IGZyb20gXCIuLi9jb25maWcvQXBwQ29uZmlnXCI7XG5pbXBvcnQgeyBUYWdzIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5leHBvcnQgY2xhc3MgTWljcm9TZXJ2aWNlIGV4dGVuZHMgQ29uc3RydWN0IHtcblxuICAgIHByb3RlY3RlZCByZWFkb25seSByZXF1aXJlRHluYW1vVGFibGVzOiBib29sZWFuOyAgXG4gICAgcHJvdGVjdGVkIGFwcENvbmZpZzogQXBwQ29uZmlnO1xuXG4gICAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzKSB7XG4gICAgICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICAgICAgdGhpcy5hcHBDb25maWcgPSBuZXcgQXBwQ29uZmlnKHByb3BzKTtcblxuICAgICAgICB0aGlzLnJlcXVpcmVEeW5hbW9UYWJsZXMgPSAocHJvcHMuUkVTT1VSQ0VTLkRZTkFNTz8uVEFCTEVTICYmXG4gICAgICAgICAgICBwcm9wcy5SRVNPVVJDRVMuRFlOQU1PLlRBQkxFUy5sZW5ndGggPiAwKSA/IHRydWUgOiBmYWxzZTtcblxuICAgICAgICB0aGlzLm9uSW5pdChzY29wZSwgdGhpcy5hcHBDb25maWcpO1xuXG4gICAgICAgIHRoaXMuY3JlYXRlVGFnKHNjb3BlKVxuICAgIH1cblxuICAgIHByaXZhdGUgb25Jbml0KHNjb3BlOiBDb25zdHJ1Y3QsIHByb3BzOiBBcHBDb25maWcpIHtcblxuICAgICAgICBsZXQgdGFibGVzOiBUYWJsZVtdIHwgdW5kZWZpbmVkID0gdW5kZWZpbmVkO1xuXG5cbiAgICAgICAgaWYgKHByb2Nlc3MuZW52LlNFQ1JFVF9NQU5BR0VSX0FSTikge1xuICAgICAgICAgICAgLy8gdGhyb3cgbmV3IEVycm9yKGBZb3UgbXVzdCBwcm92aWRlIHRoZSBBUk4gZm9yIHRoZSB5b3VyIENvbmZpZ3VyYXRpb24gU2VjcmV0IFxuICAgICAgICAgICAgLy8gICAgIE1hbmFnZXJgKTsgICAgICBcbiAgICAgICAgICAgICBjb25zdCBzZWNyZXRNZ3IgPSBnZXRTZWNyZXRNYW5hZ2VyKHNjb3BlLCBwcm9wcywgcHJvY2Vzcy5lbnYuU0VDUkVUX01BTkFHRVJfQVJOKTsgICAgICAgICAgICBcbiAgICAgICAgfVxuXG4gICAgICAgXG5cbiAgICAgICAgLy8gY29uc3QgY29tbW9uTGF5ZXIgPSBjcmVhdGVDb21tb25MYXllcihzY29wZSwgcHJvcHMpO1xuXG4gICAgICAgIGNvbnN0IGdhdGV3YXkgPSBuZXcgQXBpKHNjb3BlLCB0aGlzLmFwcENvbmZpZykuQVBJcztcblxuICAgICAgICBjb25zdCBsYXllcnMgPSB1bmRlZmluZWQ7IC8vIFtjb21tb25MYXllcl07XG5cbiAgICAgICAgLy8gQ3JlYXRlcyBEeW5hbW9EYiBUYWJsZXMgaWYgcmVxdWlyZWRcbiAgICAgICAgaWYgKHRoaXMucmVxdWlyZUR5bmFtb1RhYmxlcykge1xuICAgICAgICAgICAgY29uc3QgZHluYW1vID0gbmV3IENyZWF0ZUR5bmFtb0RiKHNjb3BlLCB0aGlzLmFwcENvbmZpZyk7XG5cbiAgICAgICAgICAgIHRhYmxlcyA9IGR5bmFtby5DcmVhdGVkVGFibGVzO1xuICAgICAgICB9XG5cbiAgICAgICAgLy8gcHJvcHMuUkVTT1VSQ0VTLkxBTUJEQS5mb3JFYWNoKChsYW1iZGFQcm9wOiBUc2dMYW1iZGFQcm9wKSA9PiB7XG4gICAgICAgICAgICBcbiAgICAgICAgY29uc3QgcmVzdWx0ID0gbmV3IENyZWF0ZU1pY3JvU2VydmljZUJ1bmRsZShzY29wZSwgXG4gICAgICAgICAgICAgICAgZ2F0ZXdheVswXSwgcHJvcHMsIHRoaXMuYXBwQ29uZmlnLCB0YWJsZXMsIG51bGwsIGxheWVycyk7XG4gICAgICAgIC8vIH0pO1xuXG4gICAgICAgIFxuICAgIH1cblxuICAgIHByb3RlY3RlZCBjcmVhdGVUYWcoc2NvcGU6IENvbnN0cnVjdCkge1xuICAgICAgICBUYWdzLm9mKHNjb3BlKS5hZGQoJ0FwcCcsIHRoaXMuYXBwQ29uZmlnLkFwcE5hbWUpO1xuICAgICAgICBUYWdzLm9mKHNjb3BlKS5hZGQoJ1Jlc291Y2VQcmVmaXgnLCB0aGlzLmFwcENvbmZpZy5BcHBQcmVmaXgpO1xuICAgIH1cbn0iXX0=
|
|
@@ -64,9 +64,7 @@ class CreateDynamoDb extends baseResource_1.BaseResource {
|
|
|
64
64
|
return props;
|
|
65
65
|
}
|
|
66
66
|
generateDbName(tableName) {
|
|
67
|
-
|
|
68
|
-
return `${tableName}`;
|
|
69
|
-
// return `${this.config.AppPrefix}-${tableName}`;
|
|
67
|
+
return `${this.config.AppPrefix}-${tableName}`;
|
|
70
68
|
}
|
|
71
69
|
}
|
|
72
70
|
CreateDynamoDb.ReadWriteActions = [
|
|
@@ -84,4 +82,4 @@ CreateDynamoDb.ReadWriteActions = [
|
|
|
84
82
|
"dynamodb:UpdateItem",
|
|
85
83
|
];
|
|
86
84
|
exports.CreateDynamoDb = CreateDynamoDb;
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3JlYXRlRHluYW1vLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Jlc291cmNlcy9keW5hbW9kYi9DcmVhdGVEeW5hbW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQXVEO0FBQ3ZELDJEQUFzRztBQUd0Ryx1REFBb0Q7QUFHcEQsTUFBYSxjQUFlLFNBQVEsMkJBQW1CO0lBaUJuRCxJQUFJLGFBQWE7UUFDYixPQUFPLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQztJQUNqQyxDQUFDO0lBRUQsWUFBc0IsS0FBZ0IsRUFBWSxNQUFpQjtRQUMvRCxLQUFLLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBREgsVUFBSyxHQUFMLEtBQUssQ0FBVztRQUFZLFdBQU0sR0FBTixNQUFNLENBQVc7UUFHL0QsSUFBSSxDQUFDLGdCQUFnQixHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFbkQsSUFBSSxJQUFJLENBQUMsZ0JBQWdCLEVBQUU7WUFDdkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7U0FDbkQ7SUFDTCxDQUFDO0lBRVMsY0FBYyxDQUFDLEtBQWdCO1FBRWpDLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUVqQyxNQUFNLE1BQU0sR0FBRyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUMsSUFBUyxFQUFFLEdBQVcsRUFBRSxFQUFFO1lBQ2pELE1BQU0sT0FBTyxHQUFHLElBQUksb0JBQUssQ0FBQyxLQUFLLEVBQUUsR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLEVBQUU7Z0JBQ2xELEdBQUcsSUFBSTtnQkFDUCxhQUFhLEVBQUUsMkJBQWEsQ0FBQyxPQUFPO2FBRXZDLENBQUMsQ0FBQztZQUlILElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0JBRTVELE1BQU0sUUFBUSxHQUE4QjtvQkFDeEMsU0FBUyxFQUFFLElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQztvQkFDN0MsWUFBWSxFQUFFLEdBQUcsQ0FBQyxZQUFZO29CQUM5QixPQUFPLEVBQUUsR0FBRyxDQUFDLE9BQU87b0JBQ3BCLGNBQWMsRUFBRSxHQUFHLENBQUMsY0FBYztpQkFFckMsQ0FBQztnQkFFRixPQUFPLENBQUMsdUJBQXVCLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDOUMsQ0FBQyxDQUFDLENBQUM7WUFDSCxPQUFPLE9BQU8sQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztRQUVILE9BQU8sTUFBTSxJQUFJLEVBQUUsQ0FBQztJQUk1QixDQUFDO0lBR1MsWUFBWSxDQUFJLEtBQWdCLEVBQUUsYUFBa0I7UUFDMUQsSUFBSSxDQUFDLGdCQUFpQixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFBRTtZQUN0QyxJQUFJLHVCQUFTLENBQUMsS0FBSyxFQUFFLGNBQWMsR0FBRyxFQUFFLEVBQUU7Z0JBQ3RDLEtBQUssRUFBRSxDQUFDLENBQUMsU0FBUzthQUNyQixDQUFDLENBQUM7UUFDUCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFFTyxXQUFXO1FBQ2YsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUUzRCxNQUFNLElBQUksR0FBUSxFQUFFLENBQUM7WUFFckIsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUVsRCxJQUFJLENBQUMsWUFBWSxHQUFHO2dCQUNoQixJQUFJLEVBQUUsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxJQUFJO2dCQUN2QixJQUFJLEVBQUUsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxJQUFJO2FBQzFCLENBQUM7WUFFRixJQUFJLENBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQyxXQUFXLENBQUM7WUFFakMsSUFBSSxDQUFDLENBQUMsT0FBTyxFQUFFO2dCQUNYLElBQUksQ0FBQyxPQUFPLEdBQUc7b0JBQ1gsSUFBSSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSTtvQkFDcEIsSUFBSSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSTtpQkFDdkIsQ0FBQTthQUNKO1lBQ0QsT0FBTyxJQUFrQixDQUFDO1FBQzlCLENBQUMsQ0FBQyxDQUFDO1FBRUgsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVPLGNBQWMsQ0FBQyxTQUFpQjtRQUNwQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLElBQUksU0FBUyxFQUFFLENBQUM7SUFDbkQsQ0FBQzs7QUFwR00sK0JBQWdCLEdBQWE7SUFDaEMsdUJBQXVCO0lBQ3ZCLHlCQUF5QjtJQUN6Qiw2QkFBNkI7SUFDN0IscUJBQXFCO0lBQ3JCLHdCQUF3QjtJQUN4QixrQkFBa0I7SUFDbEIscUJBQXFCO0lBQ3JCLDJCQUEyQjtJQUMzQixrQkFBa0I7SUFDbEIsZ0JBQWdCO0lBQ2hCLGVBQWU7SUFDZixxQkFBcUI7Q0FDeEIsQ0FBQztBQWZPLHdDQUFjIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2ZuT3V0cHV0LCBSZW1vdmFsUG9saWN5IH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBHbG9iYWxTZWNvbmRhcnlJbmRleFByb3BzLFN0cmVhbVZpZXdUeXBlLFRhYmxlLCBUYWJsZVByb3BzIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1keW5hbW9kYlwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IEFwcENvbmZpZyB9IGZyb20gXCIuLi8uLi9jb25maWcvQXBwQ29uZmlnXCI7XG5pbXBvcnQgeyBCYXNlUmVzb3VyY2UgfSBmcm9tIFwiLi4vYmFzZS9iYXNlUmVzb3VyY2VcIjtcblxuXG5leHBvcnQgY2xhc3MgQ3JlYXRlRHluYW1vRGIgZXh0ZW5kcyBCYXNlUmVzb3VyY2U8VGFibGU+IHtcblxuICAgIHN0YXRpYyBSZWFkV3JpdGVBY3Rpb25zOiBzdHJpbmdbXSA9IFtcbiAgICAgICAgXCJkeW5hbW9kYjpCYXRjaEdldEl0ZW1cIixcbiAgICAgICAgXCJkeW5hbW9kYjpCYXRjaFdyaXRlSXRlbVwiLFxuICAgICAgICBcImR5bmFtb2RiOkNvbmRpdGlvbkNoZWNrSXRlbVwiLFxuICAgICAgICBcImR5bmFtb2RiOkRlbGV0ZUl0ZW1cIixcbiAgICAgICAgXCJkeW5hbW9kYjpEZXNjcmliZVRhYmxlXCIsXG4gICAgICAgIFwiZHluYW1vZGI6R2V0SXRlbVwiLFxuICAgICAgICBcImR5bmFtb2RiOkdldFJlY29yZHNcIixcbiAgICAgICAgXCJkeW5hbW9kYjpHZXRTaGFyZEl0ZXJhdG9yXCIsXG4gICAgICAgIFwiZHluYW1vZGI6UHV0SXRlbVwiLFxuICAgICAgICBcImR5bmFtb2RiOlF1ZXJ5XCIsXG4gICAgICAgIFwiZHluYW1vZGI6U2NhblwiLFxuICAgICAgICBcImR5bmFtb2RiOlVwZGF0ZUl0ZW1cIixcbiAgICBdO1xuXG4gICAgZ2V0IENyZWF0ZWRUYWJsZXMoKSB7XG4gICAgICAgIHJldHVybiB0aGlzLmNyZWF0ZWRSZXNvdXJjZXM7XG4gICAgfVxuICAgIFxuICAgIGNvbnN0cnVjdG9yKHByb3RlY3RlZCBzY29wZTogQ29uc3RydWN0LCBwcm90ZWN0ZWQgY29uZmlnOiBBcHBDb25maWcpIHtcbiAgICAgICAgc3VwZXIoc2NvcGUsIGNvbmZpZyk7XG5cbiAgICAgICAgdGhpcy5jcmVhdGVkUmVzb3VyY2VzID0gdGhpcy5jcmVhdGVSZXNvdXJjZShzY29wZSk7XG5cbiAgICAgICAgaWYgKHRoaXMuY3JlYXRlZFJlc291cmNlcykge1xuICAgICAgICAgICAgdGhpcy5jcmVhdGVPdXRwdXQoc2NvcGUsIHRoaXMuY3JlYXRlZFJlc291cmNlcyk7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwcm90ZWN0ZWQgY3JlYXRlUmVzb3VyY2Uoc2NvcGU6IENvbnN0cnVjdCk6IFRhYmxlW10ge1xuICAgICAgICBcbiAgICAgICAgICAgIGNvbnN0IHByb3BzID0gdGhpcy5jcmVhdGVQcm9wcygpO1xuXG4gICAgICAgICAgICBjb25zdCB0YWJsZXMgPSBwcm9wcz8ubWFwKChwcm9wOiBhbnksIGlkeDogbnVtYmVyKSA9PiB7XG4gICAgICAgICAgICAgICAgY29uc3QgZGJUYWJsZSA9IG5ldyBUYWJsZShzY29wZSwgYCR7cHJvcC50YWJsZU5hbWV9YCwge1xuICAgICAgICAgICAgICAgICAgICAuLi5wcm9wLFxuICAgICAgICAgICAgICAgICAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1ksXG4gICAgICAgICAgICAgICAgICAgIFxuICAgICAgICAgICAgICAgIH0pO1xuXG4gICAgICAgICAgICAgICAgXG5cbiAgICAgICAgICAgICAgICB0aGlzLmNvbmZpZy5SRVNPVVJDRVMuRFlOQU1PPy5UQUJMRVM/LltpZHhdLmluZGV4ZXMubWFwKChnc2kpID0+IHtcblxuICAgICAgICAgICAgICAgICAgICBjb25zdCBnc2lQcm9wczogR2xvYmFsU2Vjb25kYXJ5SW5kZXhQcm9wcyA9IHtcbiAgICAgICAgICAgICAgICAgICAgICAgIGluZGV4TmFtZTogdGhpcy5nZW5lcmF0ZURiTmFtZShnc2kuaW5kZXhOYW1lKSxcbiAgICAgICAgICAgICAgICAgICAgICAgIHBhcnRpdGlvbktleTogZ3NpLnBhcnRpdGlvbktleSxcbiAgICAgICAgICAgICAgICAgICAgICAgIHNvcnRLZXk6IGdzaS5zb3J0S2V5LFxuICAgICAgICAgICAgICAgICAgICAgICAgcHJvamVjdGlvblR5cGU6IGdzaS5wcm9qZWN0aW9uVHlwZVxuXG4gICAgICAgICAgICAgICAgICAgIH07XG5cbiAgICAgICAgICAgICAgICAgICAgZGJUYWJsZS5hZGRHbG9iYWxTZWNvbmRhcnlJbmRleChnc2lQcm9wcyk7XG4gICAgICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICAgICAgcmV0dXJuIGRiVGFibGU7XG4gICAgICAgICAgICB9KTtcblxuICAgICAgICAgICAgcmV0dXJuIHRhYmxlcyA/PyBbXTtcbiAgICAgICBcblxuICAgICAgIFxuICAgIH1cblxuXG4gICAgcHJvdGVjdGVkIGNyZWF0ZU91dHB1dDxUPihzY29wZTogQ29uc3RydWN0LCBjcmVhdGVkQXNzZXRzOiBUW10pOiB2b2lkIHtcbiAgICAgICAgdGhpcy5jcmVhdGVkUmVzb3VyY2VzIS5mb3JFYWNoKCh4LCBpZHgpID0+IHtcbiAgICAgICAgICAgIG5ldyBDZm5PdXRwdXQoc2NvcGUsIGBkeW5hbW9UYWJsZSR7aWR4fWAsIHtcbiAgICAgICAgICAgICAgICB2YWx1ZTogeC50YWJsZU5hbWVcbiAgICAgICAgICAgIH0pO1xuICAgICAgICB9KTtcbiAgICB9XG5cbiAgICBwcml2YXRlIGNyZWF0ZVByb3BzKCkge1xuICAgICAgICBjb25zdCBwcm9wcyA9IHRoaXMuY29uZmlnLlJFU09VUkNFUz8uRFlOQU1PPy5UQUJMRVM/Lm1hcCgoeCkgPT4ge1xuXG4gICAgICAgICAgICBjb25zdCBwcm9wOiBhbnkgPSB7fTtcblxuICAgICAgICAgICAgcHJvcC50YWJsZU5hbWUgPSB0aGlzLmdlbmVyYXRlRGJOYW1lKHgudGFibGVOYW1lKTtcbiAgICAgICAgICAgICAgICAgICAgICAgIFxuICAgICAgICAgICAgcHJvcC5wYXJ0aXRpb25LZXkgPSB7XG4gICAgICAgICAgICAgICAgbmFtZTogeC5wcmltYXJ5S2V5Lm5hbWUsXG4gICAgICAgICAgICAgICAgdHlwZTogeC5wcmltYXJ5S2V5LnR5cGVcbiAgICAgICAgICAgIH07XG5cbiAgICAgICAgICAgIHByb3AuYmlsbGluZ01vZGUgPSB4LmJpbGxpbmdNb2RlO1xuXG4gICAgICAgICAgICBpZiAoeC5zb3J0S2V5KSB7XG4gICAgICAgICAgICAgICAgcHJvcC5zb3J0S2V5ID0ge1xuICAgICAgICAgICAgICAgICAgICBuYW1lOiB4LnNvcnRLZXkubmFtZSxcbiAgICAgICAgICAgICAgICAgICAgdHlwZTogeC5zb3J0S2V5LnR5cGUsXG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfVxuICAgICAgICAgICAgcmV0dXJuIHByb3AgYXMgVGFibGVQcm9wcztcbiAgICAgICAgfSk7XG5cbiAgICAgICAgcmV0dXJuIHByb3BzO1xuICAgIH1cblxuICAgIHByaXZhdGUgZ2VuZXJhdGVEYk5hbWUodGFibGVOYW1lOiBzdHJpbmcpIHtcbiAgICAgICAgcmV0dXJuIGAke3RoaXMuY29uZmlnLkFwcFByZWZpeH0tJHt0YWJsZU5hbWV9YDtcbiAgICB9XG59Il19
|
|
@@ -18,6 +18,7 @@ class Api extends baseResource_1.BaseResource {
|
|
|
18
18
|
}
|
|
19
19
|
createApi(scope) {
|
|
20
20
|
if (this.config.DNS) {
|
|
21
|
+
console.log('### DNS is true ###');
|
|
21
22
|
const zone = this.getZone(this.scope, this.config);
|
|
22
23
|
const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));
|
|
23
24
|
this.createARecord(scope, zone, api);
|
|
@@ -119,4 +120,4 @@ class Api extends baseResource_1.BaseResource {
|
|
|
119
120
|
}
|
|
120
121
|
}
|
|
121
122
|
exports.Api = Api;
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createApi.js","sourceRoot":"","sources":["../../../src/resources/gateway/createApi.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, RemovalPolicy, Tag } from \"aws-cdk-lib\";\nimport { BasePathMapping, Cors, CorsOptions, DomainName, EndpointType, IDomainName, IRestApi, MethodOptions, RestApi, RestApiProps, SecurityPolicy } from \"aws-cdk-lib/aws-apigateway\";\nimport { ARecord, HostedZone, IHostedZone, RecordTarget } from \"aws-cdk-lib/aws-route53\";\nimport { ApiGateway, ApiGatewayDomain } from \"aws-cdk-lib/aws-route53-targets\";\nimport { Construct } from \"constructs\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { MicroserviceProps } from \"../../interfaces/MicroserviceProps\";\n\nimport { BaseResource } from \"../base/baseResource\";\nimport { CreateCertificate } from \"../certificate/createCertificate\";\n\nexport class Api extends BaseResource<IRestApi> {\n\n    private corsOptions: CorsOptions;\n\n\n    get APIs() {\n        return this.createdResources;\n    }\n\n    constructor(scope: Construct, config: AppConfig) {\n        super(scope, config);\n\n        this.corsOptions = this.createDefaultCorsOptions();\n\n        this.createdResources = this.createResource(scope);\n    }\n\n    private createApi(scope: Construct) {\n        if (this.config.DNS) {\n            const zone = this.getZone(this.scope, this.config);\n\n            const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));\n\n            this.createARecord(scope, zone, api);\n\n            return api;\n        } else {\n\n            const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps());\n\n            return api;\n        }\n    }\n\n    private createApiProps(zone?: IHostedZone): RestApiProps {\n\n        if (this.config.DNS) {\n\n            const cert = this.createCertificate(this.scope, zone!, this.config);\n\n            const props: RestApiProps = {\n                restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,\n                description: this.config.API.Description,\n                domainName: {\n                    domainName: `${this.config.API.DomainPrefix}.${this.config.DNS.ZoneName}`,\n                    certificate: cert.certificate,\n                    endpointType: EndpointType.EDGE,\n                    securityPolicy: SecurityPolicy.TLS_1_2\n                },\n                // TODO:  ADD CUSTOM DOMAIN HERE\n                // defaultDomainMapping: {\n                //     domainName: domain,            \n                //   },\n                // domainName: '',\n                defaultCorsPreflightOptions: this.corsOptions\n            };\n\n            return props;\n        } else {\n            const props: RestApiProps = {\n                restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,\n                description: this.config.API.Description,\n                defaultCorsPreflightOptions: this.corsOptions\n            };\n\n            return props;\n        }\n    }\n\n    private createDefaultCorsOptions() {\n\n        const corsOptions: CorsOptions = {\n            allowHeaders: [\n                '*',\n            ],\n            allowMethods: Cors.ALL_METHODS,\n            allowCredentials: true,\n            allowOrigins: Cors.ALL_ORIGINS,\n        };\n\n        return corsOptions;\n    }\n\n    // private createCustomDomain(scope: Construct, config: MicroserviceProps) {\n    //     const domainName = DomainName.fromDomainNameAttributes(scope, `${config.API.Name}-custom-domain`, {\n    //         domainName: config.DNS?.ZoneName,\n    //         domainNameAliasHostedZoneId: config.DNS.ZoneId!,\n    //         domainNameAliasTarget: config.API.DomainPrefix!,\n    //     });\n\n    //     return domainName\n    // }\n\n    // private attachDomainToApi(scope: Construct, api: IRestApi, domain: IDomainName, config: MicroserviceProps) {\n    //     return new BasePathMapping(scope, `${config.API.Name}-basePathMapping`, {\n    //         domainName: domain,\n    //         restApi: api,\n    //     });\n    // }\n\n    private getZone(scope: Construct, config: MicroserviceProps) {\n        return HostedZone.fromHostedZoneAttributes(scope, `${config.DNS?.ZoneName}-zone`, {\n            zoneName: config.DNS?.ZoneName!,\n            hostedZoneId: config.DNS?.ZoneId!\n        });\n    }\n\n    private createCertificate(scope: Construct, zone: IHostedZone, config: MicroserviceProps) {\n        const cert = new CreateCertificate(scope, config, zone);\n        return cert;\n    }\n\n    private createARecord(scope: Construct, zone: IHostedZone, api: RestApi) {\n        const aRecord = new ARecord(scope, \"ApiRecord\", {\n            zone,\n            target: RecordTarget.fromAlias(new ApiGateway(api)),\n            recordName: this.config.API.DomainPrefix\n        });\n\n        aRecord.applyRemovalPolicy(RemovalPolicy.DESTROY);\n        return aRecord;\n    }\n\n    protected createResource(scope: Construct) {\n\n        const api = this.createApi(scope);\n        // TODO:  ONLY IF CUSTOM MAPPING IS REQUIRED\n        // const domain = this.createCustomDomain(scope, this.config);\n\n        // const mapping = this.attachDomainToApi(scope, api, domain, this.config);\n\n\n\n        return [api];\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        createdAssets.forEach((api, idx) => {\n\n            new CfnOutput(scope, `api${idx}`, {\n                // @ts-ignore\n                value: api.url\n            });\n        });\n    }\n\n}"]}
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createApi.js","sourceRoot":"","sources":["../../../src/resources/gateway/createApi.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, RemovalPolicy, Tag } from \"aws-cdk-lib\";\nimport { BasePathMapping, Cors, CorsOptions, DomainName, EndpointType, IDomainName, IRestApi, MethodOptions, RestApi, RestApiProps, SecurityPolicy } from \"aws-cdk-lib/aws-apigateway\";\nimport { ARecord, HostedZone, IHostedZone, RecordTarget } from \"aws-cdk-lib/aws-route53\";\nimport { ApiGateway, ApiGatewayDomain } from \"aws-cdk-lib/aws-route53-targets\";\nimport { Construct } from \"constructs\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { MicroserviceProps } from \"../../interfaces/MicroserviceProps\";\n\nimport { BaseResource } from \"../base/baseResource\";\nimport { CreateCertificate } from \"../certificate/createCertificate\";\n\nexport class Api extends BaseResource<IRestApi> {\n\n    private corsOptions: CorsOptions;\n\n\n    get APIs() {\n        return this.createdResources;\n    }\n\n    constructor(scope: Construct, config: AppConfig) {\n        super(scope, config);\n\n        this.corsOptions = this.createDefaultCorsOptions();\n\n        this.createdResources = this.createResource(scope);\n    }\n\n    private createApi(scope: Construct) {\n        if (this.config.DNS) {\n            \n            console.log('### DNS is true ###');\n\n            const zone = this.getZone(this.scope, this.config);\n\n            const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));\n\n            this.createARecord(scope, zone, api);\n\n            return api;\n        } else {\n\n            const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps());\n\n            return api;\n        }\n    }\n\n    private createApiProps(zone?: IHostedZone): RestApiProps {\n\n        if (this.config.DNS) {\n\n            const cert = this.createCertificate(this.scope, zone!, this.config);\n\n            const props: RestApiProps = {\n                restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,\n                description: this.config.API.Description,\n                domainName: {\n                    domainName: `${this.config.API.DomainPrefix}.${this.config.DNS.ZoneName}`,\n                    certificate: cert.certificate,\n                    endpointType: EndpointType.EDGE,\n                    securityPolicy: SecurityPolicy.TLS_1_2\n                },\n                // TODO:  ADD CUSTOM DOMAIN HERE\n                // defaultDomainMapping: {\n                //     domainName: domain,            \n                //   },\n                // domainName: '',\n                defaultCorsPreflightOptions: this.corsOptions\n            };\n\n            return props;\n        } else {\n            const props: RestApiProps = {\n                restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,\n                description: this.config.API.Description,\n                defaultCorsPreflightOptions: this.corsOptions\n            };\n\n            return props;\n        }\n    }\n\n    private createDefaultCorsOptions() {\n\n        const corsOptions: CorsOptions = {\n            allowHeaders: [\n                '*',\n            ],\n            allowMethods: Cors.ALL_METHODS,\n            allowCredentials: true,\n            allowOrigins: Cors.ALL_ORIGINS,\n        };\n\n        return corsOptions;\n    }\n\n    // private createCustomDomain(scope: Construct, config: MicroserviceProps) {\n    //     const domainName = DomainName.fromDomainNameAttributes(scope, `${config.API.Name}-custom-domain`, {\n    //         domainName: config.DNS?.ZoneName,\n    //         domainNameAliasHostedZoneId: config.DNS.ZoneId!,\n    //         domainNameAliasTarget: config.API.DomainPrefix!,\n    //     });\n\n    //     return domainName\n    // }\n\n    // private attachDomainToApi(scope: Construct, api: IRestApi, domain: IDomainName, config: MicroserviceProps) {\n    //     return new BasePathMapping(scope, `${config.API.Name}-basePathMapping`, {\n    //         domainName: domain,\n    //         restApi: api,\n    //     });\n    // }\n\n    private getZone(scope: Construct, config: MicroserviceProps) {\n        return HostedZone.fromHostedZoneAttributes(scope, `${config.DNS?.ZoneName}-zone`, {\n            zoneName: config.DNS?.ZoneName!,\n            hostedZoneId: config.DNS?.ZoneId!\n        });\n    }\n\n    private createCertificate(scope: Construct, zone: IHostedZone, config: MicroserviceProps) {\n        const cert = new CreateCertificate(scope, config, zone);\n        return cert;\n    }\n\n    private createARecord(scope: Construct, zone: IHostedZone, api: RestApi) {\n        const aRecord = new ARecord(scope, \"ApiRecord\", {\n            zone,\n            target: RecordTarget.fromAlias(new ApiGateway(api)),\n            recordName: this.config.API.DomainPrefix\n        });\n\n        aRecord.applyRemovalPolicy(RemovalPolicy.DESTROY);\n        return aRecord;\n    }\n\n    protected createResource(scope: Construct) {\n\n        const api = this.createApi(scope);\n        // TODO:  ONLY IF CUSTOM MAPPING IS REQUIRED\n        // const domain = this.createCustomDomain(scope, this.config);\n\n        // const mapping = this.attachDomainToApi(scope, api, domain, this.config);\n\n\n\n        return [api];\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        createdAssets.forEach((api, idx) => {\n\n            new CfnOutput(scope, `api${idx}`, {\n                // @ts-ignore\n                value: api.url\n            });\n        });\n    }\n\n}"]}
|
|
@@ -40,9 +40,9 @@ class CreateMicroServiceBundle {
|
|
|
40
40
|
this.AssignAccessToTables(this.tables, lambdas.Lambdas);
|
|
41
41
|
}
|
|
42
42
|
// Allow access to existing tables
|
|
43
|
-
if (this.requireDynamoTableRefs) {
|
|
44
|
-
|
|
45
|
-
}
|
|
43
|
+
// if (this.requireDynamoTableRefs) {
|
|
44
|
+
// this.AssignAccessToTableRefs(scope, this.props.RESOURCES.DYNAMO?.TABLE_REFS, lambdas.Lambdas);
|
|
45
|
+
// }
|
|
46
46
|
if (this.secretMgr) {
|
|
47
47
|
this.AssignAccessToSecretManager(this.secretMgr, lambdas.Lambdas);
|
|
48
48
|
}
|
|
@@ -56,20 +56,23 @@ class CreateMicroServiceBundle {
|
|
|
56
56
|
}
|
|
57
57
|
AssignAccessToTables(tables, lambdas) {
|
|
58
58
|
if (tables) {
|
|
59
|
-
|
|
60
|
-
|
|
59
|
+
lambdas.forEach((lambda) => {
|
|
60
|
+
tables.forEach((table) => {
|
|
61
61
|
// This is a CDK bug: It doesn't provide
|
|
62
62
|
// access to the indexes.
|
|
63
63
|
//table.grantReadWriteData(lambda);
|
|
64
64
|
// Workaround:
|
|
65
|
-
lambda.addToRolePolicy(
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
65
|
+
// lambda.addToRolePolicy(
|
|
66
|
+
// new PolicyStatement({
|
|
67
|
+
// effect: Effect.ALLOW,
|
|
68
|
+
// actions: CreateDynamoDb.ReadWriteActions,
|
|
69
|
+
// resources: [
|
|
70
|
+
// table.tableArn,
|
|
71
|
+
// `${table.tableArn}/*`, // This is not recognized by cdk, but table is. why?
|
|
72
|
+
// ],
|
|
73
|
+
// })
|
|
74
|
+
// );
|
|
75
|
+
table.grantReadWriteData(lambda);
|
|
73
76
|
});
|
|
74
77
|
});
|
|
75
78
|
}
|
|
@@ -126,4 +129,4 @@ class CreateMicroServiceBundle {
|
|
|
126
129
|
}
|
|
127
130
|
}
|
|
128
131
|
exports.CreateMicroServiceBundle = CreateMicroServiceBundle;
|
|
129
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createMicroServiceBundle.js","sourceRoot":"","sources":["../../../src/resources/gateway/createMicroServiceBundle.ts"],"names":[],"mappings":"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","sourcesContent":["import { IRestApi, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { ITable, Table } from \"aws-cdk-lib/aws-dynamodb\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { Effect, PolicyStatement } from \"aws-cdk-lib/aws-iam\";\nimport { Construct } from \"constructs\";\nimport { TsgDynamoTableRef, TsgLambdaProp } from \"../../config/types\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { MicroserviceProps } from \"../../interfaces/MicroserviceProps\";\nimport { CreateAuthorizer } from \"../helpers/createAuthorizer\";\nimport { Routes } from \"../helpers/createRoutes\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { Duration, RemovalPolicy, Stack } from \"aws-cdk-lib\";\nimport { CreateDynamoDb } from \"../dynamodb/CreateDynamo\";\nimport { ISecret } from \"aws-cdk-lib/aws-secretsmanager\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { MetricOptions } from \"aws-cdk-lib/aws-cloudwatch\";\n\nexport class CreateMicroServiceBundle {\n    \n    protected readonly requireDynamoTableRefs: boolean;\n    protected readonly requireAuthorizer: boolean;\n\n    constructor(scope: Construct, \n        private readonly gatewayApi: IRestApi, \n        private readonly props: MicroserviceProps,        \n        private readonly appConfig: AppConfig,\n        private readonly tables?: Table[], \n        private readonly secretMgr?: ISecret | null, \n        private readonly layers?: LayerVersion[],        \n        ) {\n        \n        this.requireDynamoTableRefs = (props.RESOURCES.DYNAMO?.TABLE_REFS?.length ?? 0 > 0) ? true : false;\n        this.requireAuthorizer = (props.RESOURCES.AUTHORIZER) ? true : false;\n        this.onInit(scope);\n    }\n\n    private onInit(scope: Construct) {\n\n        \n        let authorizer: TokenAuthorizer|undefined = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = new CreateAuthorizer(scope, this.appConfig, this.props.RESOURCES.AUTHORIZER!).JwtAuthorizer;\n            authorizer._attachToApi(this.gatewayApi);   \n            authorizer.applyRemovalPolicy(RemovalPolicy.DESTROY);\n        }        \n\n        // Create Lambdas\n        const lambdaProp: TsgLambdaProps = {\n            scope,\n            prop: this.props,            \n            layers: this.layers,\n            appConfig: this.appConfig\n        };\n\n        const lambdas = new CreateLambda(lambdaProp, this.appConfig);\n\n        if (this.tables) {\n            this.AssignAccessToTables(this.tables, lambdas.Lambdas);\n        }        \n\n        // Allow access to existing tables\n        if (this.requireDynamoTableRefs) {\n            this.AssignAccessToTableRefs(scope, this.props.RESOURCES.DYNAMO?.TABLE_REFS, lambdas.Lambdas);\n        }\n\n        if (this.secretMgr) {\n            this.AssignAccessToSecretManager(this.secretMgr, lambdas.Lambdas);\n        }        \n\n        // lambdas.Lambdas.map((lambda) => {\n        //     lambda.metricErrors({                \n        //             label: `${lambda.functionName}-errors`, \n        //             period: Duration.minutes(3)           \n                \n        //     })\n        // });\n\n        this.AddRoutes(this.props, this.gatewayApi, lambdas.Lambdas, authorizer);\n    }\n\n    private AssignAccessToTables(tables: Table[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            tables.forEach((table: ITable) => {\n\n                lambdas.forEach((lambda: NodejsFunction) => {\n\n                    //  This is a CDK bug: It doesn't provide\n                    //  access to the indexes.\n                    //table.grantReadWriteData(lambda);\n\n                    //  Workaround:\n                    lambda.addToRolePolicy(\n                        new PolicyStatement({\n                            effect: Effect.ALLOW,\n                            actions: CreateDynamoDb.ReadWriteActions,\n                            resources: [\n                                table.tableArn,\n                                `${table.tableArn}/*`, // This is not recognized by cdk, but table is.  why?\n                            ],\n                        })\n                    );\n\n                    \n                    \n                });\n\n            });\n        }\n    }\n\n    private AssignAccessToTableRefs(scope: Construct, tableRefs: TsgDynamoTableRef[] | undefined, lambdas: NodejsFunction[]) {\n\n        if (tableRefs) {\n            tableRefs.forEach((tableRef: TsgDynamoTableRef) => {\n\n                if (tableRef.region) {\n                    this.AssignReadWriteAccessToTableInRegion(scope, tableRef, lambdas);\n                }\n                else {\n                    this.AssignReadWriteAccessToTable(scope, tableRef, lambdas);\n                }\n            });\n        }\n    }\n\n    private AssignReadWriteAccessToTableInRegion(scope: Construct, tableRef: TsgDynamoTableRef, lambdas: NodejsFunction[]) {\n        lambdas.forEach((lambda: NodejsFunction) => {\n\n            let tableArn = \"arn:aws:dynamodb:\" + tableRef.region + \":\" + ((scope as Stack).account) + \":table/\" + tableRef.tableName;\n            let statement = new PolicyStatement({\n                effect: Effect.ALLOW,\n                resources: [\n                    tableArn,\n                    tableArn + \"/index/*\",\n                ],\n                actions: CreateDynamoDb.ReadWriteActions,\n            });\n\n            lambda.role?.addToPrincipalPolicy(statement);\n            \n        });\n    }\n\n    private AssignReadWriteAccessToTable(scope: Construct, tableRef: TsgDynamoTableRef, lambdas: NodejsFunction[]) {\n        let table: ITable = Table.fromTableName(scope, tableRef.tableName, tableRef.tableName);\n\n        lambdas.forEach((lambda: NodejsFunction) => {\n            table.grantReadWriteData(lambda)\n            \n        });\n    }\n\n    private AddRoutes(props: MicroserviceProps, \n        gateway: IRestApi, \n        lambdas: NodejsFunction[], \n        authorizer?: TokenAuthorizer) {\n\n        props.RESOURCES.LAMBDA?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop, this.appConfig);\n\n            if (!lambdaId) {\n                throw new Error(`Can't find lambda`);\n            }\n            const lambdaNode = lambdas.find(x => x.node.id === lambdaId);\n\n            if (!lambdaNode) {\n                throw new Error(\"Can't find the Lambda Integration\");                \n            }\n\n            Routes.createResource(prop, gateway, lambdaNode, authorizer);\n        \n        });\n    }\n\n    private AssignAccessToSecretManager(secret: ISecret, lambdas: NodejsFunction[]) {\n\n        lambdas.forEach((lambda) => {\n            const result = secret.grantRead(lambda);\n            \n        });\n        \n    }\n\n}"]}
|
|
132
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createMicroServiceBundle.js","sourceRoot":"","sources":["../../../src/resources/gateway/createMicroServiceBundle.ts"],"names":[],"mappings":"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","sourcesContent":["import { IRestApi, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { ITable, Table } from \"aws-cdk-lib/aws-dynamodb\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { Effect, PolicyStatement } from \"aws-cdk-lib/aws-iam\";\nimport { Construct } from \"constructs\";\nimport { TsgDynamoTableRef, TsgLambdaProp } from \"../../config/types\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { MicroserviceProps } from \"../../interfaces/MicroserviceProps\";\nimport { CreateAuthorizer } from \"../helpers/createAuthorizer\";\nimport { Routes } from \"../helpers/createRoutes\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { Duration, RemovalPolicy, Stack } from \"aws-cdk-lib\";\nimport { CreateDynamoDb } from \"../dynamodb/CreateDynamo\";\nimport { ISecret } from \"aws-cdk-lib/aws-secretsmanager\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { MetricOptions } from \"aws-cdk-lib/aws-cloudwatch\";\n\nexport class CreateMicroServiceBundle {\n    \n    protected readonly requireDynamoTableRefs: boolean;\n    protected readonly requireAuthorizer: boolean;\n\n    constructor(scope: Construct, \n        private readonly gatewayApi: IRestApi, \n        private readonly props: MicroserviceProps,        \n        private readonly appConfig: AppConfig,\n        private readonly tables?: Table[], \n        private readonly secretMgr?: ISecret | null, \n        private readonly layers?: LayerVersion[],        \n        ) {\n        \n        this.requireDynamoTableRefs = (props.RESOURCES.DYNAMO?.TABLE_REFS?.length ?? 0 > 0) ? true : false;\n        this.requireAuthorizer = (props.RESOURCES.AUTHORIZER) ? true : false;\n        this.onInit(scope);\n    }\n\n    private onInit(scope: Construct) {\n\n        \n        let authorizer: TokenAuthorizer|undefined = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = new CreateAuthorizer(scope, this.appConfig, this.props.RESOURCES.AUTHORIZER!).JwtAuthorizer;\n            authorizer._attachToApi(this.gatewayApi);   \n            authorizer.applyRemovalPolicy(RemovalPolicy.DESTROY);\n        }        \n\n        // Create Lambdas\n        const lambdaProp: TsgLambdaProps = {\n            scope,\n            prop: this.props,            \n            layers: this.layers,\n            appConfig: this.appConfig\n        };\n\n        const lambdas = new CreateLambda(lambdaProp, this.appConfig);\n\n        if (this.tables) {\n            this.AssignAccessToTables(this.tables, lambdas.Lambdas);\n        }        \n\n        // Allow access to existing tables\n        // if (this.requireDynamoTableRefs) {\n        //     this.AssignAccessToTableRefs(scope, this.props.RESOURCES.DYNAMO?.TABLE_REFS, lambdas.Lambdas);\n        // }\n\n        if (this.secretMgr) {\n            this.AssignAccessToSecretManager(this.secretMgr, lambdas.Lambdas);\n        }        \n\n        // lambdas.Lambdas.map((lambda) => {\n        //     lambda.metricErrors({                \n        //             label: `${lambda.functionName}-errors`, \n        //             period: Duration.minutes(3)           \n                \n        //     })\n        // });\n\n        this.AddRoutes(this.props, this.gatewayApi, lambdas.Lambdas, authorizer);\n    }\n\n    private AssignAccessToTables(tables: Table[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            lambdas.forEach((lambda: NodejsFunction) => {\n            \n                tables.forEach((table: ITable) => {\n\n                \n\n                    //  This is a CDK bug: It doesn't provide\n                    //  access to the indexes.\n                    //table.grantReadWriteData(lambda);\n\n                    //  Workaround:\n                    // lambda.addToRolePolicy(\n                    //     new PolicyStatement({\n                    //         effect: Effect.ALLOW,\n                    //         actions: CreateDynamoDb.ReadWriteActions,\n                    //         resources: [\n                    //             table.tableArn,\n                    //             `${table.tableArn}/*`, // This is not recognized by cdk, but table is.  why?\n                    //         ],\n                    //     })\n                    // );\n\n                    table.grantReadWriteData(lambda);\n                    \n                    \n                });\n\n            });\n        }\n    }\n\n    private AssignAccessToTableRefs(scope: Construct, tableRefs: TsgDynamoTableRef[] | undefined, lambdas: NodejsFunction[]) {\n\n        if (tableRefs) {\n            tableRefs.forEach((tableRef: TsgDynamoTableRef) => {\n\n                if (tableRef.region) {\n                    this.AssignReadWriteAccessToTableInRegion(scope, tableRef, lambdas);\n                }\n                else {\n                    this.AssignReadWriteAccessToTable(scope, tableRef, lambdas);\n                }\n            });\n        }\n    }\n\n    private AssignReadWriteAccessToTableInRegion(scope: Construct, tableRef: TsgDynamoTableRef, lambdas: NodejsFunction[]) {\n        lambdas.forEach((lambda: NodejsFunction) => {\n\n            let tableArn = \"arn:aws:dynamodb:\" + tableRef.region + \":\" + ((scope as Stack).account) + \":table/\" + tableRef.tableName;\n            let statement = new PolicyStatement({\n                effect: Effect.ALLOW,\n                resources: [\n                    tableArn,\n                    tableArn + \"/index/*\",\n                ],\n                actions: CreateDynamoDb.ReadWriteActions,\n            });\n\n            lambda.role?.addToPrincipalPolicy(statement);\n            \n        });\n    }\n\n    private AssignReadWriteAccessToTable(scope: Construct, tableRef: TsgDynamoTableRef, lambdas: NodejsFunction[]) {\n        let table: ITable = Table.fromTableName(scope, tableRef.tableName, tableRef.tableName);\n\n        lambdas.forEach((lambda: NodejsFunction) => {\n            table.grantReadWriteData(lambda)\n            \n        });\n    }\n\n    private AddRoutes(props: MicroserviceProps, \n        gateway: IRestApi, \n        lambdas: NodejsFunction[], \n        authorizer?: TokenAuthorizer) {\n\n        props.RESOURCES.LAMBDA?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop, this.appConfig);\n\n            if (!lambdaId) {\n                throw new Error(`Can't find lambda`);\n            }\n            const lambdaNode = lambdas.find(x => x.node.id === lambdaId);\n\n            if (!lambdaNode) {\n                throw new Error(\"Can't find the Lambda Integration\");                \n            }\n\n            Routes.createResource(prop, gateway, lambdaNode, authorizer);\n        \n        });\n    }\n\n    private AssignAccessToSecretManager(secret: ISecret, lambdas: NodejsFunction[]) {\n\n        lambdas.forEach((lambda) => {\n            const result = secret.grantRead(lambda);\n            \n        });\n        \n    }\n\n}"]}
|
package/package.json
CHANGED
package/src/config/AppConfig.ts
CHANGED
|
@@ -61,9 +61,11 @@ export class AppConfig implements IAppConfig {
|
|
|
61
61
|
...config.RESOURCES.DYNAMO
|
|
62
62
|
};
|
|
63
63
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
if (config.DNS) {
|
|
65
|
+
this.DNS = {
|
|
66
|
+
...config.DNS!
|
|
67
|
+
};
|
|
68
|
+
}
|
|
67
69
|
}
|
|
68
70
|
// this.lambdaConfigs = this.expandProps<TsgLambdaName, TsgLambdaProp>(this.RESOURCES.LAMBDA!);
|
|
69
71
|
// this.dynamoConfigs = this.expandProps<TsgTableName, TsgDynamoProp>(this.RESOURCES.DYNAMO?.TABLES!);
|
|
@@ -81,7 +83,7 @@ export class AppConfig implements IAppConfig {
|
|
|
81
83
|
}
|
|
82
84
|
|
|
83
85
|
private expandProps<T, R>(data: Record<string, R>) {
|
|
84
|
-
|
|
86
|
+
|
|
85
87
|
const result = [];
|
|
86
88
|
// @ts-ignore
|
|
87
89
|
for (const [key, value] of Object.entries(data)) {
|
|
@@ -8,9 +8,6 @@ import { getSecretManager } from "../resources/securityManager";
|
|
|
8
8
|
import { createCommonLayer } from "../resources/helpers/createCommonLayer";
|
|
9
9
|
import { AppConfig } from "../config/AppConfig";
|
|
10
10
|
import { Tags } from "aws-cdk-lib";
|
|
11
|
-
import { TsgLambdaProps } from "../config/types/TsgLambdaProps";
|
|
12
|
-
import { TsgLambdaProp } from "../config/types";
|
|
13
|
-
|
|
14
11
|
export class MicroService extends Construct {
|
|
15
12
|
|
|
16
13
|
protected readonly requireDynamoTables: boolean;
|
|
@@ -106,9 +106,6 @@ export class CreateDynamoDb extends BaseResource<Table> {
|
|
|
106
106
|
}
|
|
107
107
|
|
|
108
108
|
private generateDbName(tableName: string) {
|
|
109
|
-
|
|
110
|
-
return `${tableName}`;
|
|
111
|
-
|
|
112
|
-
// return `${this.config.AppPrefix}-${tableName}`;
|
|
109
|
+
return `${this.config.AppPrefix}-${tableName}`;
|
|
113
110
|
}
|
|
114
111
|
}
|
|
@@ -28,6 +28,9 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
28
28
|
|
|
29
29
|
private createApi(scope: Construct) {
|
|
30
30
|
if (this.config.DNS) {
|
|
31
|
+
|
|
32
|
+
console.log('### DNS is true ###');
|
|
33
|
+
|
|
31
34
|
const zone = this.getZone(this.scope, this.config);
|
|
32
35
|
|
|
33
36
|
const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));
|
|
@@ -62,9 +62,9 @@ export class CreateMicroServiceBundle {
|
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
// Allow access to existing tables
|
|
65
|
-
if (this.requireDynamoTableRefs) {
|
|
66
|
-
|
|
67
|
-
}
|
|
65
|
+
// if (this.requireDynamoTableRefs) {
|
|
66
|
+
// this.AssignAccessToTableRefs(scope, this.props.RESOURCES.DYNAMO?.TABLE_REFS, lambdas.Lambdas);
|
|
67
|
+
// }
|
|
68
68
|
|
|
69
69
|
if (this.secretMgr) {
|
|
70
70
|
this.AssignAccessToSecretManager(this.secretMgr, lambdas.Lambdas);
|
|
@@ -84,26 +84,29 @@ export class CreateMicroServiceBundle {
|
|
|
84
84
|
private AssignAccessToTables(tables: Table[], lambdas: NodejsFunction[]) {
|
|
85
85
|
|
|
86
86
|
if (tables) {
|
|
87
|
-
|
|
87
|
+
lambdas.forEach((lambda: NodejsFunction) => {
|
|
88
|
+
|
|
89
|
+
tables.forEach((table: ITable) => {
|
|
88
90
|
|
|
89
|
-
|
|
91
|
+
|
|
90
92
|
|
|
91
93
|
// This is a CDK bug: It doesn't provide
|
|
92
94
|
// access to the indexes.
|
|
93
95
|
//table.grantReadWriteData(lambda);
|
|
94
96
|
|
|
95
97
|
// Workaround:
|
|
96
|
-
lambda.addToRolePolicy(
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
);
|
|
106
|
-
|
|
98
|
+
// lambda.addToRolePolicy(
|
|
99
|
+
// new PolicyStatement({
|
|
100
|
+
// effect: Effect.ALLOW,
|
|
101
|
+
// actions: CreateDynamoDb.ReadWriteActions,
|
|
102
|
+
// resources: [
|
|
103
|
+
// table.tableArn,
|
|
104
|
+
// `${table.tableArn}/*`, // This is not recognized by cdk, but table is. why?
|
|
105
|
+
// ],
|
|
106
|
+
// })
|
|
107
|
+
// );
|
|
108
|
+
|
|
109
|
+
table.grantReadWriteData(lambda);
|
|
107
110
|
|
|
108
111
|
|
|
109
112
|
});
|