@sylvesterllc/aws-constructs 1.0.40 → 1.0.41
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/__tests__/app-config.test.ts +2 -0
- package/dist/config/AppConfig.js +2 -2
- package/dist/constructs/MicroService.js +12 -7
- package/dist/resources/gateway/CreateApiAndAttachLambdas.d.ts +3 -4
- package/dist/resources/gateway/CreateApiAndAttachLambdas.js +2 -3
- package/package.json +1 -1
- package/src/config/AppConfig.ts +1 -1
- package/src/constructs/MicroService.ts +9 -6
- package/src/resources/gateway/CreateApiAndAttachLambdas.ts +6 -6
- package/tsconfig.json +1 -0
package/dist/config/AppConfig.js
CHANGED
|
@@ -10,7 +10,7 @@ class AppConfig {
|
|
|
10
10
|
}
|
|
11
11
|
constructor(config) {
|
|
12
12
|
this.populate(config);
|
|
13
|
-
console.log('config',
|
|
13
|
+
console.log('config', this);
|
|
14
14
|
}
|
|
15
15
|
populate(config) {
|
|
16
16
|
this.populateGlobalConfig(config);
|
|
@@ -71,4 +71,4 @@ class AppConfig {
|
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
exports.AppConfig = AppConfig;
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBYSxTQUFTO0lBV2xCLElBQUksT0FBTztRQUNQLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7SUFDN0IsQ0FBQztJQUVELElBQUksU0FBUztRQUNULE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7SUFDM0UsQ0FBQztJQUVELFlBQVksTUFBa0I7UUFDMUIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN0QixPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNoQyxDQUFDO0lBRU8sUUFBUSxDQUFDLE1BQWtCO1FBQy9CLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNsQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDL0IsSUFBSSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBR25DLENBQUM7SUFFTyxvQkFBb0IsQ0FBQyxNQUFrQjtRQUMzQyxJQUFJLENBQUMsT0FBTyxHQUFHO1lBQ1gsR0FBRyxNQUFNLENBQUMsT0FBTztTQUNwQixDQUFDO0lBQ04sQ0FBQztJQUVPLGlCQUFpQixDQUFDLE1BQWtCO1FBRXhDLElBQUksTUFBTSxDQUFDLEdBQUc7WUFDVixJQUFJLENBQUMsR0FBRyxHQUFHO2dCQUNQLEdBQUcsTUFBTSxDQUFDLEdBQUc7YUFDaEIsQ0FBQztJQUNWLENBQUM7SUFFTyxpQkFBaUIsQ0FBQyxNQUFrQjtRQUN4QyxJQUFJLENBQUMsU0FBUyxHQUFHO1lBQ2IsR0FBRyxNQUFNLENBQUMsU0FBUztTQUN0QixDQUFDO1FBQ0YsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEdBQUc7WUFDcEIsR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU07U0FDN0IsQ0FBQztRQUVGLElBQUksTUFBTSxDQUFDLEdBQUcsRUFBRTtZQUNaLElBQUksQ0FBQyxHQUFHLEdBQUc7Z0JBQ1AsR0FBRyxNQUFNLENBQUMsR0FBSTthQUNqQixDQUFDO1NBQ0w7UUFFRCxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsVUFBVSxFQUFFO1lBQzdCLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxHQUFHO2dCQUN4QixHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsVUFBVTthQUNqQyxDQUFDO1NBQ0w7UUFFRCxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1lBQ3RCLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxHQUFHO2dCQUNqQixHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRzthQUMxQixDQUFDO1NBQ0w7SUFFTCxDQUFDO0lBQ0QsbUdBQW1HO0lBQ25HLDBHQUEwRztJQUMxRyxJQUFJO0lBRUksZUFBZSxDQUFPLE1BQVcsRUFBRSxNQUEwQjtRQUVqRSxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1QsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE1BQU0sR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFPLE1BQU0sQ0FBQyxDQUFDO1FBQ3hDLE9BQU8sTUFBTSxDQUFDO0lBRWxCLENBQUM7SUFFTyxXQUFXLENBQU8sSUFBdUI7UUFFN0MsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2xCLGFBQWE7UUFDYixLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUM3QyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ3RCO1FBQ0QsT0FBTyxNQUFhLENBQUM7SUFDekIsQ0FBQztDQUNKO0FBakdELDhCQWlHQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNvbmZpZyB9IGZyb20gXCJwcm9jZXNzXCI7XG5pbXBvcnQgeyBBcGlBcHBDb25maWcgfSBmcm9tIFwiLi9jdXN0b21Db25maWdzL0FwaUFwcENvbmZpZ1wiO1xuaW1wb3J0IHsgR2xvYmFsQXBwQ29uZmlnIH0gZnJvbSBcIi4vY3VzdG9tQ29uZmlncy9HbG9iYWxBcHBDb25maWdcIjtcbmltcG9ydCB7IElBcHBDb25maWcgfSBmcm9tIFwiLi9jdXN0b21Db25maWdzL0lBcHBDb25maWdcIjtcbmltcG9ydCB7IFJlc291cmNlQXBwQ29uZmlnIH0gZnJvbSBcIi4vY3VzdG9tQ29uZmlncy9SZXNvdXJjZUFwcENvbmZpZ1wiO1xuaW1wb3J0IHsgVHNnRHluYW1vUHJvcCB9IGZyb20gXCIuL3R5cGVzXCI7XG5pbXBvcnQgeyBUc2dEbnNBcHBDb25maWcgfSBmcm9tIFwiLi90eXBlcy9Uc2dEbnNDb25maWdcIjtcbmltcG9ydCB7IFRzZ0xhbWJkYU5hbWUgfSBmcm9tIFwiLi90eXBlcy9Uc2dMYW1iZGFOYW1lXCI7XG5pbXBvcnQgeyBUc2dMYW1iZGFQcm9wIH0gZnJvbSBcIi4vdHlwZXMvVHNnTGFtYmRhUHJvcFwiO1xuXG5leHBvcnQgY2xhc3MgQXBwQ29uZmlnIGltcGxlbWVudHMgSUFwcENvbmZpZyB7XG5cbiAgICBwdWJsaWMgQVBJOiBBcGlBcHBDb25maWc7XG4gICAgcHVibGljIEdMT0JBTFM6IEdsb2JhbEFwcENvbmZpZztcbiAgICBwdWJsaWMgUkVTT1VSQ0VTOiBSZXNvdXJjZUFwcENvbmZpZztcbiAgICBwdWJsaWMgRE5TPzogVHNnRG5zQXBwQ29uZmlnO1xuXG5cbiAgICBwdWJsaWMgbGFtYmRhQ29uZmlnczogVHNnTGFtYmRhUHJvcFtdO1xuICAgIHB1YmxpYyBkeW5hbW9Db25maWdzOiBUc2dEeW5hbW9Qcm9wW107XG5cbiAgICBnZXQgQXBwTmFtZSgpIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuR0xPQkFMUy5uYW1lO1xuICAgIH1cblxuICAgIGdldCBBcHBQcmVmaXgoKSB7XG4gICAgICAgIHJldHVybiAodGhpcy5HTE9CQUxTLnByZWZpeCkgPyB0aGlzLkdMT0JBTFMucHJlZml4IDogdGhpcy5HTE9CQUxTLm5hbWU7XG4gICAgfVxuXG4gICAgY29uc3RydWN0b3IoY29uZmlnOiBJQXBwQ29uZmlnKSB7XG4gICAgICAgIHRoaXMucG9wdWxhdGUoY29uZmlnKTtcbiAgICAgICAgY29uc29sZS5sb2coJ2NvbmZpZycsIHRoaXMpO1xuICAgIH1cblxuICAgIHByaXZhdGUgcG9wdWxhdGUoY29uZmlnOiBJQXBwQ29uZmlnKSB7XG4gICAgICAgIHRoaXMucG9wdWxhdGVHbG9iYWxDb25maWcoY29uZmlnKTtcbiAgICAgICAgdGhpcy5wb3B1bGF0ZUFwaUNvbmZpZyhjb25maWcpO1xuICAgICAgICB0aGlzLnBvcHVsYXRlUmVzb3VyY2VzKGNvbmZpZyk7XG5cblxuICAgIH1cblxuICAgIHByaXZhdGUgcG9wdWxhdGVHbG9iYWxDb25maWcoY29uZmlnOiBJQXBwQ29uZmlnKSB7XG4gICAgICAgIHRoaXMuR0xPQkFMUyA9IHtcbiAgICAgICAgICAgIC4uLmNvbmZpZy5HTE9CQUxTXG4gICAgICAgIH07XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBwb3B1bGF0ZUFwaUNvbmZpZyhjb25maWc6IElBcHBDb25maWcpIHtcblxuICAgICAgICBpZiAoY29uZmlnLkFQSSlcbiAgICAgICAgICAgIHRoaXMuQVBJID0ge1xuICAgICAgICAgICAgICAgIC4uLmNvbmZpZy5BUElcbiAgICAgICAgICAgIH07XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBwb3B1bGF0ZVJlc291cmNlcyhjb25maWc6IElBcHBDb25maWcpIHtcbiAgICAgICAgdGhpcy5SRVNPVVJDRVMgPSB7XG4gICAgICAgICAgICAuLi5jb25maWcuUkVTT1VSQ0VTXG4gICAgICAgIH07XG4gICAgICAgIHRoaXMuUkVTT1VSQ0VTLkRZTkFNTyA9IHtcbiAgICAgICAgICAgIC4uLmNvbmZpZy5SRVNPVVJDRVMuRFlOQU1PXG4gICAgICAgIH07XG5cbiAgICAgICAgaWYgKGNvbmZpZy5ETlMpIHtcbiAgICAgICAgICAgIHRoaXMuRE5TID0ge1xuICAgICAgICAgICAgICAgIC4uLmNvbmZpZy5ETlMhXG4gICAgICAgICAgICB9O1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKGNvbmZpZy5SRVNPVVJDRVMuQVVUSE9SSVpFUikge1xuICAgICAgICAgICAgdGhpcy5SRVNPVVJDRVMuQVVUSE9SSVpFUiA9IHtcbiAgICAgICAgICAgICAgICAuLi5jb25maWcuUkVTT1VSQ0VTLkFVVEhPUklaRVJcbiAgICAgICAgICAgIH07XG4gICAgICAgIH1cblxuICAgICAgICBpZiAoY29uZmlnLlJFU09VUkNFUy5FQzIpIHtcbiAgICAgICAgICAgIHRoaXMuUkVTT1VSQ0VTLkVDMiA9IHtcbiAgICAgICAgICAgICAgICAuLi5jb25maWcuUkVTT1VSQ0VTLkVDMlxuICAgICAgICAgICAgfTtcbiAgICAgICAgfVxuXG4gICAgfVxuICAgIC8vICAgICB0aGlzLmxhbWJkYUNvbmZpZ3MgPSB0aGlzLmV4cGFuZFByb3BzPFRzZ0xhbWJkYU5hbWUsIFRzZ0xhbWJkYVByb3A+KHRoaXMuUkVTT1VSQ0VTLkxBTUJEQSEpO1xuICAgIC8vICAgICB0aGlzLmR5bmFtb0NvbmZpZ3MgPSB0aGlzLmV4cGFuZFByb3BzPFRzZ1RhYmxlTmFtZSwgVHNnRHluYW1vUHJvcD4odGhpcy5SRVNPVVJDRVMuRFlOQU1PPy5UQUJMRVMhKTtcbiAgICAvLyB9XG5cbiAgICBwcml2YXRlIHBvcHVsYXRlQ29uZmlnczxULCBSPihyZXN1bHQ6IFJbXSwgcmVjb3JkPzogUmVjb3JkPHN0cmluZywgUj4pIHtcblxuICAgICAgICBpZiAoIXJlY29yZCkge1xuICAgICAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICAgIH1cblxuICAgICAgICByZXN1bHQgPSB0aGlzLmV4cGFuZFByb3BzPFQsIFI+KHJlY29yZCk7XG4gICAgICAgIHJldHVybiByZXN1bHQ7XG5cbiAgICB9XG5cbiAgICBwcml2YXRlIGV4cGFuZFByb3BzPFQsIFI+KGRhdGE6IFJlY29yZDxzdHJpbmcsIFI+KSB7XG5cbiAgICAgICAgY29uc3QgcmVzdWx0ID0gW107XG4gICAgICAgIC8vIEB0cy1pZ25vcmVcbiAgICAgICAgZm9yIChjb25zdCBba2V5LCB2YWx1ZV0gb2YgT2JqZWN0LmVudHJpZXMoZGF0YSkpIHtcbiAgICAgICAgICAgIHJlc3VsdC5wdXNoKHZhbHVlKTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gcmVzdWx0IGFzIFJbXTtcbiAgICB9XG59Il19
|
|
@@ -20,19 +20,19 @@ class MicroService extends constructs_1.Construct {
|
|
|
20
20
|
props.RESOURCES.DYNAMO.TABLES.length > 0) ? true : false;
|
|
21
21
|
this.hasLambdaLayers = (props.RESOURCES.LAMBDA_LAYERS &&
|
|
22
22
|
props.RESOURCES.LAMBDA_LAYERS.length > 0) ? true : false;
|
|
23
|
-
this.onInit(scope
|
|
23
|
+
this.onInit(scope);
|
|
24
24
|
this.createTag(scope);
|
|
25
25
|
}
|
|
26
|
-
onInit(scope
|
|
26
|
+
onInit(scope) {
|
|
27
27
|
let tables = undefined;
|
|
28
28
|
let commonLayers = undefined;
|
|
29
29
|
if (process.env.SECRET_MANAGER_ARN) {
|
|
30
30
|
// throw new Error(`You must provide the ARN for the your Configuration Secret
|
|
31
31
|
// Manager`);
|
|
32
|
-
const secretMgr = (0, securityManager_1.getSecretManager)(scope,
|
|
32
|
+
const secretMgr = (0, securityManager_1.getSecretManager)(scope, this.appConfig, process.env.SECRET_MANAGER_ARN);
|
|
33
33
|
}
|
|
34
34
|
if (this.hasLambdaLayers) {
|
|
35
|
-
commonLayers = (0, createCommonLayer_1.createCommonLayer)(scope,
|
|
35
|
+
commonLayers = (0, createCommonLayer_1.createCommonLayer)(scope, this.appConfig);
|
|
36
36
|
}
|
|
37
37
|
const gateway = new createApi_1.Api(scope, this.appConfig).APIs;
|
|
38
38
|
const layers = commonLayers;
|
|
@@ -41,8 +41,13 @@ class MicroService extends constructs_1.Construct {
|
|
|
41
41
|
const dynamo = new CreateDynamo_1.CreateDynamoDb(scope, this.appConfig);
|
|
42
42
|
tables = dynamo.CreatedTables;
|
|
43
43
|
}
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
try {
|
|
45
|
+
// CREATE API GATEWAY AND LAMBDA HERE
|
|
46
|
+
const apiGateway = new CreateApiAndAttachLambdas_1.CreateApiAndAttachLambdas(scope, this.appConfig, gateway[0], layers, tables);
|
|
47
|
+
}
|
|
48
|
+
catch (err) {
|
|
49
|
+
console.error(err);
|
|
50
|
+
}
|
|
46
51
|
}
|
|
47
52
|
createTag(scope) {
|
|
48
53
|
aws_cdk_lib_1.Tags.of(scope).add('App', this.appConfig.AppName);
|
|
@@ -50,4 +55,4 @@ class MicroService extends constructs_1.Construct {
|
|
|
50
55
|
}
|
|
51
56
|
}
|
|
52
57
|
exports.MicroService = MicroService;
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWljcm9TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnN0cnVjdHMvTWljcm9TZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJDQUF1QztBQUV2QyxxRUFBb0U7QUFDcEUsOERBQXFEO0FBQ3JELGtFQUFnRTtBQUNoRSw4RUFBMkU7QUFDM0UsbURBQWdEO0FBQ2hELDZDQUFtQztBQUVuQyw4RkFBMkY7QUFDM0YsTUFBYSxZQUFhLFNBQVEsc0JBQVM7SUFNdkMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUF3QjtRQUM5RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBSkYsb0JBQWUsR0FBWSxLQUFLLENBQUM7UUFNaEQsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUVyQixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUkscUJBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN0QyxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUU5QyxJQUFJLENBQUMsbUJBQW1CLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNO1lBQ3RELEtBQUssQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1FBRTdELElBQUksQ0FBQyxlQUFlLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLGFBQWE7WUFDakQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUU3RCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRW5CLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDekIsQ0FBQztJQUVPLE1BQU0sQ0FBQyxLQUFnQjtRQUUzQixJQUFJLE1BQU0sR0FBd0IsU0FBUyxDQUFDO1FBQzVDLElBQUksWUFBWSxHQUErQixTQUFTLENBQUM7UUFFekQsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixFQUFFO1lBQ2hDLCtFQUErRTtZQUMvRSx1QkFBdUI7WUFDdEIsTUFBTSxTQUFTLEdBQUcsSUFBQSxrQ0FBZ0IsRUFBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUM7U0FDOUY7UUFFRCxJQUFJLElBQUksQ0FBQyxlQUFlLEVBQUU7WUFDdEIsWUFBWSxHQUFHLElBQUEscUNBQWlCLEVBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUMzRDtRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksZUFBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBRXBELE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQztRQUU1QixzQ0FBc0M7UUFDdEMsSUFBSSxJQUFJLENBQUMsbUJBQW1CLEVBQUU7WUFDMUIsTUFBTSxNQUFNLEdBQUcsSUFBSSw2QkFBYyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7WUFFekQsTUFBTSxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUM7U0FDakM7UUFFRCxJQUFHO1lBQ0gsc0NBQXNDO1lBQ3RDLE1BQU0sVUFBVSxHQUFHLElBQUkscURBQXlCLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBQyxNQUFNLENBQUMsQ0FBQztTQUNsRztRQUFDLE9BQU8sR0FBRyxFQUFFO1lBQ1YsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUN0QjtJQUNMLENBQUM7SUFFUyxTQUFTLENBQUMsS0FBZ0I7UUFDaEMsa0JBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xELGtCQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNsRSxDQUFDO0NBQ0o7QUEvREQsb0NBK0RDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVGFibGUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWR5bmFtb2RiXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHsgTWljcm9zZXJ2aWNlUHJvcHMgfSBmcm9tIFwiLi4vaW50ZXJmYWNlcy9NaWNyb3NlcnZpY2VQcm9wc1wiO1xuaW1wb3J0IHsgQ3JlYXRlRHluYW1vRGIgfSBmcm9tIFwiLi4vcmVzb3VyY2VzL2R5bmFtb2RiL0NyZWF0ZUR5bmFtb1wiO1xuaW1wb3J0IHsgQXBpIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9nYXRld2F5L2NyZWF0ZUFwaVwiO1xuaW1wb3J0IHsgZ2V0U2VjcmV0TWFuYWdlciB9IGZyb20gXCIuLi9yZXNvdXJjZXMvc2VjdXJpdHlNYW5hZ2VyXCI7XG5pbXBvcnQgeyBjcmVhdGVDb21tb25MYXllciB9IGZyb20gXCIuLi9yZXNvdXJjZXMvaGVscGVycy9jcmVhdGVDb21tb25MYXllclwiO1xuaW1wb3J0IHsgQXBwQ29uZmlnIH0gZnJvbSBcIi4uL2NvbmZpZy9BcHBDb25maWdcIjtcbmltcG9ydCB7IFRhZ3MgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IExheWVyVmVyc2lvbiB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtbGFtYmRhXCI7XG5pbXBvcnQgeyBDcmVhdGVBcGlBbmRBdHRhY2hMYW1iZGFzIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9nYXRld2F5L0NyZWF0ZUFwaUFuZEF0dGFjaExhbWJkYXNcIjtcbmV4cG9ydCBjbGFzcyBNaWNyb1NlcnZpY2UgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuXG4gICAgcHJvdGVjdGVkIHJlYWRvbmx5IHJlcXVpcmVEeW5hbW9UYWJsZXM6IGJvb2xlYW47XG4gICAgcHJvdGVjdGVkIHJlYWRvbmx5IGhhc0xhbWJkYUxheWVyczogYm9vbGVhbiA9IGZhbHNlOyAgXG4gICAgcHJvdGVjdGVkIGFwcENvbmZpZzogQXBwQ29uZmlnO1xuXG4gICAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzKSB7XG4gICAgICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICAgICAgY29uc29sZS50YWJsZShwcm9wcyk7XG5cbiAgICAgICAgdGhpcy5hcHBDb25maWcgPSBuZXcgQXBwQ29uZmlnKHByb3BzKTtcbiAgICAgICAgY29uc29sZS5sb2coJ3RoaXMuYXBwQ29uZmlnJywgdGhpcy5hcHBDb25maWcpO1xuICAgICAgICBcbiAgICAgICAgdGhpcy5yZXF1aXJlRHluYW1vVGFibGVzID0gKHByb3BzLlJFU09VUkNFUy5EWU5BTU8/LlRBQkxFUyAmJlxuICAgICAgICAgICAgcHJvcHMuUkVTT1VSQ0VTLkRZTkFNTy5UQUJMRVMubGVuZ3RoID4gMCkgPyB0cnVlIDogZmFsc2U7XG5cbiAgICAgICAgdGhpcy5oYXNMYW1iZGFMYXllcnMgPSAocHJvcHMuUkVTT1VSQ0VTLkxBTUJEQV9MQVlFUlMgJiYgXG4gICAgICAgICAgICBwcm9wcy5SRVNPVVJDRVMuTEFNQkRBX0xBWUVSUy5sZW5ndGggPiAwKSA/IHRydWUgOiBmYWxzZTtcblxuICAgICAgICB0aGlzLm9uSW5pdChzY29wZSk7XG5cbiAgICAgICAgdGhpcy5jcmVhdGVUYWcoc2NvcGUpXG4gICAgfVxuXG4gICAgcHJpdmF0ZSBvbkluaXQoc2NvcGU6IENvbnN0cnVjdCkge1xuXG4gICAgICAgIGxldCB0YWJsZXM6IFRhYmxlW10gfCB1bmRlZmluZWQgPSB1bmRlZmluZWQ7XG4gICAgICAgIGxldCBjb21tb25MYXllcnM6IExheWVyVmVyc2lvbltdIHwgdW5kZWZpbmVkID0gdW5kZWZpbmVkO1xuXG4gICAgICAgIGlmIChwcm9jZXNzLmVudi5TRUNSRVRfTUFOQUdFUl9BUk4pIHtcbiAgICAgICAgICAgIC8vIHRocm93IG5ldyBFcnJvcihgWW91IG11c3QgcHJvdmlkZSB0aGUgQVJOIGZvciB0aGUgeW91ciBDb25maWd1cmF0aW9uIFNlY3JldCBcbiAgICAgICAgICAgIC8vICAgICBNYW5hZ2VyYCk7ICAgICAgXG4gICAgICAgICAgICAgY29uc3Qgc2VjcmV0TWdyID0gZ2V0U2VjcmV0TWFuYWdlcihzY29wZSwgdGhpcy5hcHBDb25maWcsIHByb2Nlc3MuZW52LlNFQ1JFVF9NQU5BR0VSX0FSTik7ICAgICAgICAgICAgXG4gICAgICAgIH1cblxuICAgICAgICBpZiAodGhpcy5oYXNMYW1iZGFMYXllcnMpIHtcbiAgICAgICAgICAgIGNvbW1vbkxheWVycyA9IGNyZWF0ZUNvbW1vbkxheWVyKHNjb3BlLCB0aGlzLmFwcENvbmZpZyk7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBnYXRld2F5ID0gbmV3IEFwaShzY29wZSwgdGhpcy5hcHBDb25maWcpLkFQSXM7XG5cbiAgICAgICAgY29uc3QgbGF5ZXJzID0gY29tbW9uTGF5ZXJzO1xuXG4gICAgICAgIC8vIENyZWF0ZXMgRHluYW1vRGIgVGFibGVzIGlmIHJlcXVpcmVkXG4gICAgICAgIGlmICh0aGlzLnJlcXVpcmVEeW5hbW9UYWJsZXMpIHtcbiAgICAgICAgICAgIGNvbnN0IGR5bmFtbyA9IG5ldyBDcmVhdGVEeW5hbW9EYihzY29wZSwgdGhpcy5hcHBDb25maWcpO1xuXG4gICAgICAgICAgICB0YWJsZXMgPSBkeW5hbW8uQ3JlYXRlZFRhYmxlcztcbiAgICAgICAgfVxuXG4gICAgICAgIHRyeXtcbiAgICAgICAgLy8gQ1JFQVRFIEFQSSBHQVRFV0FZIEFORCBMQU1CREEgSEVSRSBcbiAgICAgICAgY29uc3QgYXBpR2F0ZXdheSA9IG5ldyBDcmVhdGVBcGlBbmRBdHRhY2hMYW1iZGFzKHNjb3BlLCB0aGlzLmFwcENvbmZpZywgZ2F0ZXdheVswXSwgbGF5ZXJzLHRhYmxlcyk7XG4gICAgICAgIH0gY2F0Y2ggKGVycikge1xuICAgICAgICAgICAgY29uc29sZS5lcnJvcihlcnIpO1xuICAgICAgICB9XG4gICAgfVxuXG4gICAgcHJvdGVjdGVkIGNyZWF0ZVRhZyhzY29wZTogQ29uc3RydWN0KSB7XG4gICAgICAgIFRhZ3Mub2Yoc2NvcGUpLmFkZCgnQXBwJywgdGhpcy5hcHBDb25maWcuQXBwTmFtZSk7XG4gICAgICAgIFRhZ3Mub2Yoc2NvcGUpLmFkZCgnUmVzb3VjZVByZWZpeCcsIHRoaXMuYXBwQ29uZmlnLkFwcFByZWZpeCk7XG4gICAgfVxufSJdfQ==
|
|
@@ -7,13 +7,12 @@ import { TsgAuthorizerType } from "../../config/types/TsgAuthorizerType";
|
|
|
7
7
|
import { IRestApi } from "aws-cdk-lib/aws-apigateway";
|
|
8
8
|
import { LayerVersion } from "aws-cdk-lib/aws-lambda";
|
|
9
9
|
export declare class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
|
|
10
|
-
protected config: AppConfig;
|
|
11
10
|
private readonly gatewayApi;
|
|
12
11
|
private readonly layers?;
|
|
13
12
|
private readonly tables?;
|
|
14
|
-
protected
|
|
15
|
-
protected
|
|
16
|
-
protected
|
|
13
|
+
protected requireDynamoTableRefs: boolean;
|
|
14
|
+
protected requireAuthorizer: boolean;
|
|
15
|
+
protected authorizer?: TsgAuthorizerType;
|
|
17
16
|
constructor(scope: Construct, config: AppConfig, gatewayApi: IRestApi, layers?: LayerVersion[] | undefined, tables?: ITable[] | undefined);
|
|
18
17
|
protected createResource(scope: Construct): any[] | null;
|
|
19
18
|
protected createOutput<T>(scope: Construct, createdAssets: T[]): void;
|
|
@@ -11,13 +11,12 @@ const createRoutes_1 = require("../helpers/createRoutes");
|
|
|
11
11
|
class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
|
|
12
12
|
constructor(scope, config, gatewayApi, layers, tables) {
|
|
13
13
|
super(scope, config);
|
|
14
|
-
this.config = config;
|
|
15
14
|
this.gatewayApi = gatewayApi;
|
|
16
15
|
this.layers = layers;
|
|
17
16
|
this.tables = tables;
|
|
18
17
|
this.requireDynamoTableRefs = (this.config.RESOURCES.DYNAMO?.TABLE_REFS?.length ?? 0 > 0) ? true : false;
|
|
19
18
|
this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && this.config.RESOURCES.AUTHORIZER.type) ? true : false;
|
|
20
|
-
console.log('this.config
|
|
19
|
+
console.log('this.config', this.config);
|
|
21
20
|
if (this.requireAuthorizer) {
|
|
22
21
|
this.authorizer = this.config.RESOURCES.AUTHORIZER?.type;
|
|
23
22
|
}
|
|
@@ -87,4 +86,4 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
|
|
|
87
86
|
}
|
|
88
87
|
}
|
|
89
88
|
exports.CreateApiAndAttachLambdas = CreateApiAndAttachLambdas;
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CreateApiAndAttachLambdas.js","sourceRoot":"","sources":["../../../src/resources/gateway/CreateApiAndAttachLambdas.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAIpD,4EAAyE;AAEzE,sFAAmF;AACnF,6CAA4C;AAC5C,oFAAiF;AACjF,yDAAsD;AAKtD,0DAAiD;AAEjD,MAAa,yBAA0B,SAAQ,2BAA6B;IAMxE,YAAY,KAAgB,EACd,MAAiB,EACV,UAAoB,EACpB,MAAuB,EACvB,MAAiB;QAClC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAJX,WAAM,GAAN,MAAM,CAAW;QACV,eAAU,GAAV,UAAU,CAAU;QACpB,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAW;QAGlC,IAAI,CAAC,sBAAsB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QACzG,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QAEpH,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAE5D,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC;SAC5D;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACtF;QAGD,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAES,cAAc,CAAC,KAAgB;QAErC,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,YAAY,CAAI,KAAgB,EAAE,aAAkB;QAC1D,OAAO;IACX,CAAC;IAEO,MAAM;QAEV,IAAI,UAAU,GAAoD,SAAS,CAAC;QAE5E,oBAAoB;QACpB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;SACvC;QAED,iBAAiB;QACjB,MAAM,OAAO,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEvE,gDAAgD;QAChD,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;SAC3D;QAED,uDAAuD;QACvD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAE1E,OAAO,OAAO,CAAC,OAAO,CAAC;IAC3B,CAAC;IAEO,gBAAgB;QAEpB,IAAI,UAAU,GAAoD,SAAS,CAAC;QAE5E,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,KAAK,qCAAiB,CAAC,gBAAgB,EAAE;YAElF,UAAU,GAAG,IAAI,6CAAqB,CAAC,IAAI,CAAC,KAAK,EAC7C,IAAI,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YAE/B,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACzC,UAAU,CAAC,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAErD,OAAO,UAAU,CAAC;SAErB;aAAM;YACH,UAAU,GAAG,IAAI,2CAAoB,CAAC,IAAI,CAAC,KAAK,EAC5C,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAsC,CAAC;YAExD,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACzC,UAAU,CAAC,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAErD,OAAO,UAAU,CAAC;SACrB;IACL,CAAC;IAEO,oBAAoB,CAAC,MAAgB,EAAE,OAAyB;QAEpE,IAAI,MAAM,EAAE;YACR,OAAO,CAAC,OAAO,CAAC,CAAC,MAAsB,EAAE,EAAE;gBAEvC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,EAAE;oBAE7B,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAErC,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAEO,SAAS,CAAC,MAAiB,EAC/B,OAAiB,EACjB,OAAyB,EACzB,UAA8C;QAE9C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAmB,EAAE,EAAE;YAErD,MAAM,QAAQ,GAAG,2BAAY,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAEhE,IAAI,CAAC,QAAQ,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACxC;YACD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;YAE7D,IAAI,CAAC,UAAU,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;aACxD;YAED,qBAAM,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAEjE,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAzHD,8DAyHC","sourcesContent":["import { Construct } from \"constructs\";\nimport { BaseResource } from \"../base/baseResource\";\nimport { ITable } from \"aws-cdk-lib/aws-dynamodb\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { ApiLambdaResult } from \"../../interfaces/ApiLambdaResult\";\nimport { TsgAuthorizerType } from \"../../config/types/TsgAuthorizerType\";\nimport { IRestApi, RequestAuthorizer, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { TsgJwtTokenAuthorizer } from \"../lambda-authorizer/TsgJwtTokenAuthorizer\";\nimport { RemovalPolicy } from \"aws-cdk-lib\";\nimport { TsgRequestAuthorizer } from \"../lambda-authorizer/TsgRequestAuthorizer\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { TsgLambdaProp } from \"../../config/types\";\nimport { Routes } from \"../helpers/createRoutes\";\n\nexport class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult>{\n\n    protected readonly requireDynamoTableRefs: boolean;\n    protected readonly requireAuthorizer: boolean;\n    protected readonly authorizer?: TsgAuthorizerType;\n\n    constructor(scope: Construct,\n        protected config: AppConfig,\n        private readonly gatewayApi: IRestApi,\n        private readonly layers?: LayerVersion[],\n        private readonly tables?: ITable[]) {\n        super(scope, config);\n\n        this.requireDynamoTableRefs = (this.config.RESOURCES.DYNAMO?.TABLE_REFS?.length ?? 0 > 0) ? true : false;\n        this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && this.config.RESOURCES.AUTHORIZER.type) ? true : false;\n\n        console.log('this.config.RESOURCES', this.config.RESOURCES);\n        \n        if (this.requireAuthorizer) {\n            this.authorizer = this.config.RESOURCES.AUTHORIZER?.type;\n        } else {\n            throw new Error(`You must provide an authorizer type if a Authorizer is required`);\n        }\n\n\n        this.onInit();\n    }\n\n    protected createResource(scope: Construct): any[] | null {\n\n        return null;\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        return;\n    }\n\n    private onInit() {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = this.createAuthorizer()\n        }\n\n        // Create Lambdas\n        const lambdas = new CreateLambda(this.scope, this.config, this.layers);\n        \n        // Give Access to Lambdds to All DynamoDb Tables\n        if (this.tables) {\n            this.assignAccessToTables(this.tables, lambdas.Lambdas);\n        }\n\n        // Create Routes on API Gateway for Lambdas from config\n        this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer);\n\n        return lambdas.Lambdas;\n    }\n\n    private createAuthorizer() {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;\n\n        if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.TOKEN_AUTHORIZER) {\n\n            authorizer = new TsgJwtTokenAuthorizer(this.scope,\n                this.config).JwtAuthorizer;\n\n            authorizer._attachToApi(this.gatewayApi);\n            authorizer.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n\n        } else {\n            authorizer = new TsgRequestAuthorizer(this.scope,\n                this.config).RequestAuthorizer as RequestAuthorizer;\n\n            authorizer._attachToApi(this.gatewayApi);\n            authorizer.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n        }\n    }\n\n    private assignAccessToTables(tables: ITable[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            lambdas.forEach((lambda: NodejsFunction) => {\n\n                tables.forEach((table: ITable) => {\n\n                    table.grantReadWriteData(lambda);\n\n                });\n            });\n        }\n    }\n\n    private AddRoutes(config: AppConfig,\n        gateway: IRestApi,\n        lambdas: NodejsFunction[],\n        authorizer?: TokenAuthorizer|RequestAuthorizer) {\n\n        config.RESOURCES.LAMBDA?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop, this.config);\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}"]}
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CreateApiAndAttachLambdas.js","sourceRoot":"","sources":["../../../src/resources/gateway/CreateApiAndAttachLambdas.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAIpD,4EAAyE;AAEzE,sFAAmF;AACnF,6CAA4C;AAC5C,oFAAiF;AACjF,yDAAsD;AAKtD,0DAAiD;AAEjD,MAAa,yBAA0B,SAAQ,2BAA6B;IAMxE,YAAY,KAAgB,EACxB,MAAiB,EACA,UAAoB,EACpB,MAAuB,EACvB,MAAiB;QAClC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAHJ,eAAU,GAAV,UAAU,CAAU;QACpB,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAW;QAGlC,IAAI,CAAC,sBAAsB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QACzG,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QAEpH,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC;SAC5D;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACtF;QAGD,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAES,cAAc,CAAC,KAAgB;QAErC,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,YAAY,CAAI,KAAgB,EAAE,aAAkB;QAC1D,OAAO;IACX,CAAC;IAEO,MAAM;QAEV,IAAI,UAAU,GAAoD,SAAS,CAAC;QAE5E,oBAAoB;QACpB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;SACvC;QAED,iBAAiB;QACjB,MAAM,OAAO,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEvE,gDAAgD;QAChD,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;SAC3D;QAED,uDAAuD;QACvD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAE1E,OAAO,OAAO,CAAC,OAAO,CAAC;IAC3B,CAAC;IAEO,gBAAgB;QAEpB,IAAI,UAAU,GAAoD,SAAS,CAAC;QAE5E,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,KAAK,qCAAiB,CAAC,gBAAgB,EAAE;YAElF,UAAU,GAAG,IAAI,6CAAqB,CAAC,IAAI,CAAC,KAAK,EAC7C,IAAI,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YAE/B,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACzC,UAAU,CAAC,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAErD,OAAO,UAAU,CAAC;SAErB;aAAM;YACH,UAAU,GAAG,IAAI,2CAAoB,CAAC,IAAI,CAAC,KAAK,EAC5C,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAsC,CAAC;YAExD,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACzC,UAAU,CAAC,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAErD,OAAO,UAAU,CAAC;SACrB;IACL,CAAC;IAEO,oBAAoB,CAAC,MAAgB,EAAE,OAAyB;QAEpE,IAAI,MAAM,EAAE;YACR,OAAO,CAAC,OAAO,CAAC,CAAC,MAAsB,EAAE,EAAE;gBAEvC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,EAAE;oBAE7B,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAErC,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAEO,SAAS,CAAC,MAAiB,EAC/B,OAAiB,EACjB,OAAyB,EACzB,UAA8C;QAE9C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAmB,EAAE,EAAE;YAErD,MAAM,QAAQ,GAAG,2BAAY,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAEhE,IAAI,CAAC,QAAQ,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACxC;YACD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;YAE7D,IAAI,CAAC,UAAU,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;aACxD;YAED,qBAAM,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAEjE,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAzHD,8DAyHC","sourcesContent":["import { Construct } from \"constructs\";\nimport { BaseResource } from \"../base/baseResource\";\nimport { ITable } from \"aws-cdk-lib/aws-dynamodb\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { ApiLambdaResult } from \"../../interfaces/ApiLambdaResult\";\nimport { TsgAuthorizerType } from \"../../config/types/TsgAuthorizerType\";\nimport { IRestApi, RequestAuthorizer, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { TsgJwtTokenAuthorizer } from \"../lambda-authorizer/TsgJwtTokenAuthorizer\";\nimport { RemovalPolicy } from \"aws-cdk-lib\";\nimport { TsgRequestAuthorizer } from \"../lambda-authorizer/TsgRequestAuthorizer\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { TsgLambdaProp } from \"../../config/types\";\nimport { Routes } from \"../helpers/createRoutes\";\n\nexport class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult>{\n\n    protected requireDynamoTableRefs: boolean;\n    protected requireAuthorizer: boolean;\n    protected authorizer?: TsgAuthorizerType;\n\n    constructor(scope: Construct,\n        config: AppConfig,\n        private readonly gatewayApi: IRestApi,\n        private readonly layers?: LayerVersion[],\n        private readonly tables?: ITable[]) {\n        super(scope, config);\n\n        this.requireDynamoTableRefs = (this.config.RESOURCES.DYNAMO?.TABLE_REFS?.length ?? 0 > 0) ? true : false;\n        this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && this.config.RESOURCES.AUTHORIZER.type) ? true : false;\n\n        console.log('this.config', this.config);\n\n        if (this.requireAuthorizer) {\n            this.authorizer = this.config.RESOURCES.AUTHORIZER?.type;\n        } else {\n            throw new Error(`You must provide an authorizer type if a Authorizer is required`);\n        }\n\n\n        this.onInit();\n    }\n\n    protected createResource(scope: Construct): any[] | null {\n\n        return null;\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        return;\n    }\n\n    private onInit() {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = this.createAuthorizer()\n        }\n\n        // Create Lambdas\n        const lambdas = new CreateLambda(this.scope, this.config, this.layers);\n        \n        // Give Access to Lambdds to All DynamoDb Tables\n        if (this.tables) {\n            this.assignAccessToTables(this.tables, lambdas.Lambdas);\n        }\n\n        // Create Routes on API Gateway for Lambdas from config\n        this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer);\n\n        return lambdas.Lambdas;\n    }\n\n    private createAuthorizer() {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;\n\n        if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.TOKEN_AUTHORIZER) {\n\n            authorizer = new TsgJwtTokenAuthorizer(this.scope,\n                this.config).JwtAuthorizer;\n\n            authorizer._attachToApi(this.gatewayApi);\n            authorizer.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n\n        } else {\n            authorizer = new TsgRequestAuthorizer(this.scope,\n                this.config).RequestAuthorizer as RequestAuthorizer;\n\n            authorizer._attachToApi(this.gatewayApi);\n            authorizer.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n        }\n    }\n\n    private assignAccessToTables(tables: ITable[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            lambdas.forEach((lambda: NodejsFunction) => {\n\n                tables.forEach((table: ITable) => {\n\n                    table.grantReadWriteData(lambda);\n\n                });\n            });\n        }\n    }\n\n    private AddRoutes(config: AppConfig,\n        gateway: IRestApi,\n        lambdas: NodejsFunction[],\n        authorizer?: TokenAuthorizer|RequestAuthorizer) {\n\n        config.RESOURCES.LAMBDA?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop, this.config);\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}"]}
|
package/package.json
CHANGED
package/src/config/AppConfig.ts
CHANGED
|
@@ -19,7 +19,7 @@ export class MicroService extends Construct {
|
|
|
19
19
|
super(scope, id);
|
|
20
20
|
|
|
21
21
|
console.table(props);
|
|
22
|
-
|
|
22
|
+
|
|
23
23
|
this.appConfig = new AppConfig(props);
|
|
24
24
|
console.log('this.appConfig', this.appConfig);
|
|
25
25
|
|
|
@@ -29,12 +29,12 @@ export class MicroService extends Construct {
|
|
|
29
29
|
this.hasLambdaLayers = (props.RESOURCES.LAMBDA_LAYERS &&
|
|
30
30
|
props.RESOURCES.LAMBDA_LAYERS.length > 0) ? true : false;
|
|
31
31
|
|
|
32
|
-
this.onInit(scope
|
|
32
|
+
this.onInit(scope);
|
|
33
33
|
|
|
34
34
|
this.createTag(scope)
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
private onInit(scope: Construct
|
|
37
|
+
private onInit(scope: Construct) {
|
|
38
38
|
|
|
39
39
|
let tables: Table[] | undefined = undefined;
|
|
40
40
|
let commonLayers: LayerVersion[] | undefined = undefined;
|
|
@@ -42,11 +42,11 @@ export class MicroService extends Construct {
|
|
|
42
42
|
if (process.env.SECRET_MANAGER_ARN) {
|
|
43
43
|
// throw new Error(`You must provide the ARN for the your Configuration Secret
|
|
44
44
|
// Manager`);
|
|
45
|
-
const secretMgr = getSecretManager(scope,
|
|
45
|
+
const secretMgr = getSecretManager(scope, this.appConfig, process.env.SECRET_MANAGER_ARN);
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
if (this.hasLambdaLayers) {
|
|
49
|
-
commonLayers = createCommonLayer(scope,
|
|
49
|
+
commonLayers = createCommonLayer(scope, this.appConfig);
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
const gateway = new Api(scope, this.appConfig).APIs;
|
|
@@ -60,9 +60,12 @@ export class MicroService extends Construct {
|
|
|
60
60
|
tables = dynamo.CreatedTables;
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
+
try{
|
|
63
64
|
// CREATE API GATEWAY AND LAMBDA HERE
|
|
64
65
|
const apiGateway = new CreateApiAndAttachLambdas(scope, this.appConfig, gateway[0], layers,tables);
|
|
65
|
-
|
|
66
|
+
} catch (err) {
|
|
67
|
+
console.error(err);
|
|
68
|
+
}
|
|
66
69
|
}
|
|
67
70
|
|
|
68
71
|
protected createTag(scope: Construct) {
|
|
@@ -17,12 +17,12 @@ import { Routes } from "../helpers/createRoutes";
|
|
|
17
17
|
|
|
18
18
|
export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult>{
|
|
19
19
|
|
|
20
|
-
protected
|
|
21
|
-
protected
|
|
22
|
-
protected
|
|
20
|
+
protected requireDynamoTableRefs: boolean;
|
|
21
|
+
protected requireAuthorizer: boolean;
|
|
22
|
+
protected authorizer?: TsgAuthorizerType;
|
|
23
23
|
|
|
24
24
|
constructor(scope: Construct,
|
|
25
|
-
|
|
25
|
+
config: AppConfig,
|
|
26
26
|
private readonly gatewayApi: IRestApi,
|
|
27
27
|
private readonly layers?: LayerVersion[],
|
|
28
28
|
private readonly tables?: ITable[]) {
|
|
@@ -31,8 +31,8 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult>{
|
|
|
31
31
|
this.requireDynamoTableRefs = (this.config.RESOURCES.DYNAMO?.TABLE_REFS?.length ?? 0 > 0) ? true : false;
|
|
32
32
|
this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && this.config.RESOURCES.AUTHORIZER.type) ? true : false;
|
|
33
33
|
|
|
34
|
-
console.log('this.config
|
|
35
|
-
|
|
34
|
+
console.log('this.config', this.config);
|
|
35
|
+
|
|
36
36
|
if (this.requireAuthorizer) {
|
|
37
37
|
this.authorizer = this.config.RESOURCES.AUTHORIZER?.type;
|
|
38
38
|
} else {
|