@sylvesterllc/aws-constructs 1.0.63 → 1.0.65

package/__tests__/app-config.test.ts

@@ -15,10 +15,16 @@ describe('app Config', () => {
 
     test('Application Config', () => {       
         
+        
+        expect(appConfig!.RESOURCES.AUTHORIZER).toBeTruthy();
+    });
+
+    test.skip('Application Config', () => {       
+        
         expect(appConfig!.RESOURCES.AUTHORIZER).toBeTruthy();
     });
 
-    test('Require Authorizer', () => {
+    test.skip('Require Authorizer', () => {
 
         const requireAuthorizer = (appConfig!.RESOURCES.AUTHORIZER && appConfig!.RESOURCES.AUTHORIZER.type) ? true : false;
         expect(requireAuthorizer).toBe(true);   

package/dist/constructs/MicroService.js

@@ -50,6 +50,8 @@ class MicroService extends constructs_1.Construct {
         if (this.requireSeedDatabase) {
             (0, createSeedDatabaseCustomResource_1.createSeedDatabaseCustomResource)(scope, this.appConfig, tables[0], layers);
         }
+        console.log('myConfig', this.appConfig);
+        console.log('Authorizer Type::: ', this.appConfig.RESOURCES.AUTHORIZER?.type);
         // CREATE API GATEWAY AND LAMBDA HERE 
         const apiGateway = new CreateApiAndAttachLambdas_1.CreateApiAndAttachLambdas(scope, this.appConfig, gateway[0], layers, tables);
     }
@@ -59,4 +61,4 @@ class MicroService extends constructs_1.Construct {
     }
 }
 exports.MicroService = MicroService;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWljcm9TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnN0cnVjdHMvTWljcm9TZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJDQUF1QztBQUV2QyxxRUFBb0U7QUFDcEUsOERBQXFEO0FBQ3JELGtFQUFnRTtBQUNoRSw4RUFBMkU7QUFDM0UsbURBQWdEO0FBQ2hELDZDQUFtQztBQUVuQyw4RkFBMkY7QUFDM0YsbUhBQWdIO0FBQ2hILE1BQWEsWUFBYSxTQUFRLHNCQUFTO0lBRXBCLG1CQUFtQixDQUFVO0lBQ3RDLG1CQUFtQixHQUFZLEtBQUssQ0FBQztJQUM1QixlQUFlLEdBQVksS0FBSyxDQUFDO0lBQzFDLFNBQVMsQ0FBWTtJQUUvQixZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXdCO1FBQzlELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLHFCQUFTLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFFNUIsSUFBSSxDQUFDLG1CQUFtQixHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTTtZQUN0RCxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUU3RCxJQUFJLENBQUMsbUJBQW1CLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxpQkFBaUI7WUFDakUsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1FBRXZELElBQUksQ0FBQyxlQUFlLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLGFBQWE7WUFDakQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUU3RCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRW5CLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDekIsQ0FBQztJQUVPLE1BQU0sQ0FBQyxLQUFnQjtRQUUzQixJQUFJLE1BQU0sR0FBd0IsU0FBUyxDQUFDO1FBQzVDLElBQUksWUFBWSxHQUErQixTQUFTLENBQUM7UUFFekQsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixFQUFFO1lBQ2hDLCtFQUErRTtZQUMvRSx1QkFBdUI7WUFDdEIsTUFBTSxTQUFTLEdBQUcsSUFBQSxrQ0FBZ0IsRUFBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUM7U0FDOUY7UUFFRCxJQUFJLElBQUksQ0FBQyxlQUFlLEVBQUU7WUFDdEIsWUFBWSxHQUFHLElBQUEscUNBQWlCLEVBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUMzRDtRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksZUFBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBRXBELE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQztRQUU1QixzQ0FBc0M7UUFDdEMsSUFBSSxJQUFJLENBQUMsbUJBQW1CLEVBQUU7WUFDMUIsTUFBTSxNQUFNLEdBQUcsSUFBSSw2QkFBYyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7WUFFekQsTUFBTSxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUM7U0FDakM7UUFFRCxJQUFJLElBQUksQ0FBQyxtQkFBbUIsRUFBRTtZQUMxQixJQUFBLG1FQUFnQyxFQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLE1BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztTQUMvRTtRQUVELHNDQUFzQztRQUN0QyxNQUFNLFVBQVUsR0FBRyxJQUFJLHFEQUF5QixDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUMsTUFBTSxDQUFDLENBQUM7SUFFdkcsQ0FBQztJQUVTLFNBQVMsQ0FBQyxLQUFnQjtRQUNoQyxrQkFBSSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEQsa0JBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLGVBQWUsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2xFLENBQUM7Q0FDSjtBQXBFRCxvQ0FvRUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUYWJsZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZHluYW1vZGJcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBNaWNyb3NlcnZpY2VQcm9wcyB9IGZyb20gXCIuLi9pbnRlcmZhY2VzL01pY3Jvc2VydmljZVByb3BzXCI7XG5pbXBvcnQgeyBDcmVhdGVEeW5hbW9EYiB9IGZyb20gXCIuLi9yZXNvdXJjZXMvZHluYW1vZGIvQ3JlYXRlRHluYW1vXCI7XG5pbXBvcnQgeyBBcGkgfSBmcm9tIFwiLi4vcmVzb3VyY2VzL2dhdGV3YXkvY3JlYXRlQXBpXCI7XG5pbXBvcnQgeyBnZXRTZWNyZXRNYW5hZ2VyIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9zZWN1cml0eU1hbmFnZXJcIjtcbmltcG9ydCB7IGNyZWF0ZUNvbW1vbkxheWVyIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9oZWxwZXJzL2NyZWF0ZUNvbW1vbkxheWVyXCI7XG5pbXBvcnQgeyBBcHBDb25maWcgfSBmcm9tIFwiLi4vY29uZmlnL0FwcENvbmZpZ1wiO1xuaW1wb3J0IHsgVGFncyB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgTGF5ZXJWZXJzaW9uIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1sYW1iZGFcIjtcbmltcG9ydCB7IENyZWF0ZUFwaUFuZEF0dGFjaExhbWJkYXMgfSBmcm9tIFwiLi4vcmVzb3VyY2VzL2dhdGV3YXkvQ3JlYXRlQXBpQW5kQXR0YWNoTGFtYmRhc1wiO1xuaW1wb3J0IHsgY3JlYXRlU2VlZERhdGFiYXNlQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiLi4vcmVzb3VyY2VzL2N1c3RvbVJlc291cmNlL2NyZWF0ZVNlZWREYXRhYmFzZUN1c3RvbVJlc291cmNlXCI7XG5leHBvcnQgY2xhc3MgTWljcm9TZXJ2aWNlIGV4dGVuZHMgQ29uc3RydWN0IHtcblxuICAgIHByb3RlY3RlZCByZWFkb25seSByZXF1aXJlRHluYW1vVGFibGVzOiBib29sZWFuO1xuICAgIHByb3RlY3RlZCByZXF1aXJlU2VlZERhdGFiYXNlOiBib29sZWFuID0gZmFsc2U7XG4gICAgcHJvdGVjdGVkIHJlYWRvbmx5IGhhc0xhbWJkYUxheWVyczogYm9vbGVhbiA9IGZhbHNlOyAgXG4gICAgcHJvdGVjdGVkIGFwcENvbmZpZzogQXBwQ29uZmlnO1xuXG4gICAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzKSB7XG4gICAgICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICAgICAgdGhpcy5hcHBDb25maWcgPSBuZXcgQXBwQ29uZmlnKHByb3BzKTsgIFxuICAgICAgICBcbiAgICAgICAgY29uc29sZS5sb2coJ3RoaXMuYXBwQ29uZmlnJywgdGhpcy5hcHBDb25maWcpO1xuICAgICAgICBjb25zb2xlLmxvZygncHJvcHMnLCBwcm9wcyk7XG4gICAgICAgIFxuICAgICAgICB0aGlzLnJlcXVpcmVEeW5hbW9UYWJsZXMgPSAocHJvcHMuUkVTT1VSQ0VTLkRZTkFNTz8uVEFCTEVTICYmXG4gICAgICAgICAgICBwcm9wcy5SRVNPVVJDRVMuRFlOQU1PLlRBQkxFUy5sZW5ndGggPiAwKSA/IHRydWUgOiBmYWxzZTtcblxuICAgICAgICB0aGlzLnJlcXVpcmVTZWVkRGF0YWJhc2UgPSAocHJvcHMuUkVTT1VSQ0VTLkRZTkFNTz8uVVNFX1NFRURfREFUQUJBU0UgJiYgXG4gICAgICAgICAgICBwcm9wcy5SRVNPVVJDRVMuRFlOQU1PLlNFRURfTEFNQkRBKSA/IHRydWUgOiBmYWxzZTtcblxuICAgICAgICB0aGlzLmhhc0xhbWJkYUxheWVycyA9IChwcm9wcy5SRVNPVVJDRVMuTEFNQkRBX0xBWUVSUyAmJiBcbiAgICAgICAgICAgIHByb3BzLlJFU09VUkNFUy5MQU1CREFfTEFZRVJTLmxlbmd0aCA+IDApID8gdHJ1ZSA6IGZhbHNlO1xuXG4gICAgICAgIHRoaXMub25Jbml0KHNjb3BlKTtcblxuICAgICAgICB0aGlzLmNyZWF0ZVRhZyhzY29wZSlcbiAgICB9XG5cbiAgICBwcml2YXRlIG9uSW5pdChzY29wZTogQ29uc3RydWN0KSB7XG5cbiAgICAgICAgbGV0IHRhYmxlczogVGFibGVbXSB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZDtcbiAgICAgICAgbGV0IGNvbW1vbkxheWVyczogTGF5ZXJWZXJzaW9uW10gfCB1bmRlZmluZWQgPSB1bmRlZmluZWQ7XG5cbiAgICAgICAgaWYgKHByb2Nlc3MuZW52LlNFQ1JFVF9NQU5BR0VSX0FSTikge1xuICAgICAgICAgICAgLy8gdGhyb3cgbmV3IEVycm9yKGBZb3UgbXVzdCBwcm92aWRlIHRoZSBBUk4gZm9yIHRoZSB5b3VyIENvbmZpZ3VyYXRpb24gU2VjcmV0IFxuICAgICAgICAgICAgLy8gICAgIE1hbmFnZXJgKTsgICAgICBcbiAgICAgICAgICAgICBjb25zdCBzZWNyZXRNZ3IgPSBnZXRTZWNyZXRNYW5hZ2VyKHNjb3BlLCB0aGlzLmFwcENvbmZpZywgcHJvY2Vzcy5lbnYuU0VDUkVUX01BTkFHRVJfQVJOKTsgICAgICAgICAgICBcbiAgICAgICAgfVxuXG4gICAgICAgIGlmICh0aGlzLmhhc0xhbWJkYUxheWVycykge1xuICAgICAgICAgICAgY29tbW9uTGF5ZXJzID0gY3JlYXRlQ29tbW9uTGF5ZXIoc2NvcGUsIHRoaXMuYXBwQ29uZmlnKTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnN0IGdhdGV3YXkgPSBuZXcgQXBpKHNjb3BlLCB0aGlzLmFwcENvbmZpZykuQVBJcztcblxuICAgICAgICBjb25zdCBsYXllcnMgPSBjb21tb25MYXllcnM7XG5cbiAgICAgICAgLy8gQ3JlYXRlcyBEeW5hbW9EYiBUYWJsZXMgaWYgcmVxdWlyZWRcbiAgICAgICAgaWYgKHRoaXMucmVxdWlyZUR5bmFtb1RhYmxlcykge1xuICAgICAgICAgICAgY29uc3QgZHluYW1vID0gbmV3IENyZWF0ZUR5bmFtb0RiKHNjb3BlLCB0aGlzLmFwcENvbmZpZyk7XG5cbiAgICAgICAgICAgIHRhYmxlcyA9IGR5bmFtby5DcmVhdGVkVGFibGVzO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKHRoaXMucmVxdWlyZVNlZWREYXRhYmFzZSkge1xuICAgICAgICAgICAgY3JlYXRlU2VlZERhdGFiYXNlQ3VzdG9tUmVzb3VyY2Uoc2NvcGUsIHRoaXMuYXBwQ29uZmlnLCB0YWJsZXMhWzBdLCBsYXllcnMpO1xuICAgICAgICB9XG4gICAgICAgIFxuICAgICAgICAvLyBDUkVBVEUgQVBJIEdBVEVXQVkgQU5EIExBTUJEQSBIRVJFIFxuICAgICAgICBjb25zdCBhcGlHYXRld2F5ID0gbmV3IENyZWF0ZUFwaUFuZEF0dGFjaExhbWJkYXMoc2NvcGUsIHRoaXMuYXBwQ29uZmlnLCBnYXRld2F5WzBdLCBsYXllcnMsdGFibGVzKTtcbiAgICAgICBcbiAgICB9XG5cbiAgICBwcm90ZWN0ZWQgY3JlYXRlVGFnKHNjb3BlOiBDb25zdHJ1Y3QpIHtcbiAgICAgICAgVGFncy5vZihzY29wZSkuYWRkKCdBcHAnLCB0aGlzLmFwcENvbmZpZy5BcHBOYW1lKTtcbiAgICAgICAgVGFncy5vZihzY29wZSkuYWRkKCdSZXNvdWNlUHJlZml4JywgdGhpcy5hcHBDb25maWcuQXBwUHJlZml4KTtcbiAgICB9XG59Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWljcm9TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnN0cnVjdHMvTWljcm9TZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJDQUF1QztBQUV2QyxxRUFBb0U7QUFDcEUsOERBQXFEO0FBQ3JELGtFQUFnRTtBQUNoRSw4RUFBMkU7QUFDM0UsbURBQWdEO0FBQ2hELDZDQUFtQztBQUVuQyw4RkFBMkY7QUFDM0YsbUhBQWdIO0FBQ2hILE1BQWEsWUFBYSxTQUFRLHNCQUFTO0lBRXBCLG1CQUFtQixDQUFVO0lBQ3RDLG1CQUFtQixHQUFZLEtBQUssQ0FBQztJQUM1QixlQUFlLEdBQVksS0FBSyxDQUFDO0lBQzFDLFNBQVMsQ0FBWTtJQUUvQixZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXdCO1FBQzlELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLHFCQUFTLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFFNUIsSUFBSSxDQUFDLG1CQUFtQixHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTTtZQUN0RCxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUU3RCxJQUFJLENBQUMsbUJBQW1CLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxpQkFBaUI7WUFDakUsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1FBRXZELElBQUksQ0FBQyxlQUFlLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLGFBQWE7WUFDakQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUU3RCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRW5CLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDekIsQ0FBQztJQUVPLE1BQU0sQ0FBQyxLQUFnQjtRQUUzQixJQUFJLE1BQU0sR0FBd0IsU0FBUyxDQUFDO1FBQzVDLElBQUksWUFBWSxHQUErQixTQUFTLENBQUM7UUFFekQsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixFQUFFO1lBQ2hDLCtFQUErRTtZQUMvRSx1QkFBdUI7WUFDdEIsTUFBTSxTQUFTLEdBQUcsSUFBQSxrQ0FBZ0IsRUFBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUM7U0FDOUY7UUFFRCxJQUFJLElBQUksQ0FBQyxlQUFlLEVBQUU7WUFDdEIsWUFBWSxHQUFHLElBQUEscUNBQWlCLEVBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUMzRDtRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksZUFBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBRXBELE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQztRQUU1QixzQ0FBc0M7UUFDdEMsSUFBSSxJQUFJLENBQUMsbUJBQW1CLEVBQUU7WUFDMUIsTUFBTSxNQUFNLEdBQUcsSUFBSSw2QkFBYyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7WUFFekQsTUFBTSxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUM7U0FDakM7UUFFRCxJQUFJLElBQUksQ0FBQyxtQkFBbUIsRUFBRTtZQUMxQixJQUFBLG1FQUFnQyxFQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLE1BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztTQUMvRTtRQUVNLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUV4QyxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQTtRQUNwRixzQ0FBc0M7UUFDdEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxxREFBeUIsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXZHLENBQUM7SUFFUyxTQUFTLENBQUMsS0FBZ0I7UUFDaEMsa0JBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xELGtCQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNsRSxDQUFDO0NBQ0o7QUF2RUQsb0NBdUVDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVGFibGUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWR5bmFtb2RiXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHsgTWljcm9zZXJ2aWNlUHJvcHMgfSBmcm9tIFwiLi4vaW50ZXJmYWNlcy9NaWNyb3NlcnZpY2VQcm9wc1wiO1xuaW1wb3J0IHsgQ3JlYXRlRHluYW1vRGIgfSBmcm9tIFwiLi4vcmVzb3VyY2VzL2R5bmFtb2RiL0NyZWF0ZUR5bmFtb1wiO1xuaW1wb3J0IHsgQXBpIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9nYXRld2F5L2NyZWF0ZUFwaVwiO1xuaW1wb3J0IHsgZ2V0U2VjcmV0TWFuYWdlciB9IGZyb20gXCIuLi9yZXNvdXJjZXMvc2VjdXJpdHlNYW5hZ2VyXCI7XG5pbXBvcnQgeyBjcmVhdGVDb21tb25MYXllciB9IGZyb20gXCIuLi9yZXNvdXJjZXMvaGVscGVycy9jcmVhdGVDb21tb25MYXllclwiO1xuaW1wb3J0IHsgQXBwQ29uZmlnIH0gZnJvbSBcIi4uL2NvbmZpZy9BcHBDb25maWdcIjtcbmltcG9ydCB7IFRhZ3MgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IExheWVyVmVyc2lvbiB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtbGFtYmRhXCI7XG5pbXBvcnQgeyBDcmVhdGVBcGlBbmRBdHRhY2hMYW1iZGFzIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9nYXRld2F5L0NyZWF0ZUFwaUFuZEF0dGFjaExhbWJkYXNcIjtcbmltcG9ydCB7IGNyZWF0ZVNlZWREYXRhYmFzZUN1c3RvbVJlc291cmNlIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9jdXN0b21SZXNvdXJjZS9jcmVhdGVTZWVkRGF0YWJhc2VDdXN0b21SZXNvdXJjZVwiO1xuZXhwb3J0IGNsYXNzIE1pY3JvU2VydmljZSBleHRlbmRzIENvbnN0cnVjdCB7XG5cbiAgICBwcm90ZWN0ZWQgcmVhZG9ubHkgcmVxdWlyZUR5bmFtb1RhYmxlczogYm9vbGVhbjtcbiAgICBwcm90ZWN0ZWQgcmVxdWlyZVNlZWREYXRhYmFzZTogYm9vbGVhbiA9IGZhbHNlO1xuICAgIHByb3RlY3RlZCByZWFkb25seSBoYXNMYW1iZGFMYXllcnM6IGJvb2xlYW4gPSBmYWxzZTsgIFxuICAgIHByb3RlY3RlZCBhcHBDb25maWc6IEFwcENvbmZpZztcblxuICAgIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBNaWNyb3NlcnZpY2VQcm9wcykge1xuICAgICAgICBzdXBlcihzY29wZSwgaWQpO1xuXG4gICAgICAgIHRoaXMuYXBwQ29uZmlnID0gbmV3IEFwcENvbmZpZyhwcm9wcyk7ICBcbiAgICAgICAgXG4gICAgICAgIGNvbnNvbGUubG9nKCd0aGlzLmFwcENvbmZpZycsIHRoaXMuYXBwQ29uZmlnKTtcbiAgICAgICAgY29uc29sZS5sb2coJ3Byb3BzJywgcHJvcHMpO1xuICAgICAgICBcbiAgICAgICAgdGhpcy5yZXF1aXJlRHluYW1vVGFibGVzID0gKHByb3BzLlJFU09VUkNFUy5EWU5BTU8/LlRBQkxFUyAmJlxuICAgICAgICAgICAgcHJvcHMuUkVTT1VSQ0VTLkRZTkFNTy5UQUJMRVMubGVuZ3RoID4gMCkgPyB0cnVlIDogZmFsc2U7XG5cbiAgICAgICAgdGhpcy5yZXF1aXJlU2VlZERhdGFiYXNlID0gKHByb3BzLlJFU09VUkNFUy5EWU5BTU8/LlVTRV9TRUVEX0RBVEFCQVNFICYmIFxuICAgICAgICAgICAgcHJvcHMuUkVTT1VSQ0VTLkRZTkFNTy5TRUVEX0xBTUJEQSkgPyB0cnVlIDogZmFsc2U7XG5cbiAgICAgICAgdGhpcy5oYXNMYW1iZGFMYXllcnMgPSAocHJvcHMuUkVTT1VSQ0VTLkxBTUJEQV9MQVlFUlMgJiYgXG4gICAgICAgICAgICBwcm9wcy5SRVNPVVJDRVMuTEFNQkRBX0xBWUVSUy5sZW5ndGggPiAwKSA/IHRydWUgOiBmYWxzZTtcblxuICAgICAgICB0aGlzLm9uSW5pdChzY29wZSk7XG5cbiAgICAgICAgdGhpcy5jcmVhdGVUYWcoc2NvcGUpXG4gICAgfVxuXG4gICAgcHJpdmF0ZSBvbkluaXQoc2NvcGU6IENvbnN0cnVjdCkge1xuXG4gICAgICAgIGxldCB0YWJsZXM6IFRhYmxlW10gfCB1bmRlZmluZWQgPSB1bmRlZmluZWQ7XG4gICAgICAgIGxldCBjb21tb25MYXllcnM6IExheWVyVmVyc2lvbltdIHwgdW5kZWZpbmVkID0gdW5kZWZpbmVkO1xuXG4gICAgICAgIGlmIChwcm9jZXNzLmVudi5TRUNSRVRfTUFOQUdFUl9BUk4pIHtcbiAgICAgICAgICAgIC8vIHRocm93IG5ldyBFcnJvcihgWW91IG11c3QgcHJvdmlkZSB0aGUgQVJOIGZvciB0aGUgeW91ciBDb25maWd1cmF0aW9uIFNlY3JldCBcbiAgICAgICAgICAgIC8vICAgICBNYW5hZ2VyYCk7ICAgICAgXG4gICAgICAgICAgICAgY29uc3Qgc2VjcmV0TWdyID0gZ2V0U2VjcmV0TWFuYWdlcihzY29wZSwgdGhpcy5hcHBDb25maWcsIHByb2Nlc3MuZW52LlNFQ1JFVF9NQU5BR0VSX0FSTik7ICAgICAgICAgICAgXG4gICAgICAgIH1cblxuICAgICAgICBpZiAodGhpcy5oYXNMYW1iZGFMYXllcnMpIHtcbiAgICAgICAgICAgIGNvbW1vbkxheWVycyA9IGNyZWF0ZUNvbW1vbkxheWVyKHNjb3BlLCB0aGlzLmFwcENvbmZpZyk7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBnYXRld2F5ID0gbmV3IEFwaShzY29wZSwgdGhpcy5hcHBDb25maWcpLkFQSXM7XG5cbiAgICAgICAgY29uc3QgbGF5ZXJzID0gY29tbW9uTGF5ZXJzO1xuXG4gICAgICAgIC8vIENyZWF0ZXMgRHluYW1vRGIgVGFibGVzIGlmIHJlcXVpcmVkXG4gICAgICAgIGlmICh0aGlzLnJlcXVpcmVEeW5hbW9UYWJsZXMpIHtcbiAgICAgICAgICAgIGNvbnN0IGR5bmFtbyA9IG5ldyBDcmVhdGVEeW5hbW9EYihzY29wZSwgdGhpcy5hcHBDb25maWcpO1xuXG4gICAgICAgICAgICB0YWJsZXMgPSBkeW5hbW8uQ3JlYXRlZFRhYmxlcztcbiAgICAgICAgfVxuXG4gICAgICAgIGlmICh0aGlzLnJlcXVpcmVTZWVkRGF0YWJhc2UpIHtcbiAgICAgICAgICAgIGNyZWF0ZVNlZWREYXRhYmFzZUN1c3RvbVJlc291cmNlKHNjb3BlLCB0aGlzLmFwcENvbmZpZywgdGFibGVzIVswXSwgbGF5ZXJzKTtcbiAgICAgICAgfVxuXG4gICAgICAgICAgICAgICBjb25zb2xlLmxvZygnbXlDb25maWcnLCB0aGlzLmFwcENvbmZpZyk7XG5cbiAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKCdBdXRob3JpemVyIFR5cGU6OjogJywgdGhpcy5hcHBDb25maWcuUkVTT1VSQ0VTLkFVVEhPUklaRVI/LnR5cGUpXG4gICAgICAgIC8vIENSRUFURSBBUEkgR0FURVdBWSBBTkQgTEFNQkRBIEhFUkUgXG4gICAgICAgIGNvbnN0IGFwaUdhdGV3YXkgPSBuZXcgQ3JlYXRlQXBpQW5kQXR0YWNoTGFtYmRhcyhzY29wZSwgdGhpcy5hcHBDb25maWcsIGdhdGV3YXlbMF0sIGxheWVycyx0YWJsZXMpO1xuICAgICAgIFxuICAgIH1cblxuICAgIHByb3RlY3RlZCBjcmVhdGVUYWcoc2NvcGU6IENvbnN0cnVjdCkge1xuICAgICAgICBUYWdzLm9mKHNjb3BlKS5hZGQoJ0FwcCcsIHRoaXMuYXBwQ29uZmlnLkFwcE5hbWUpO1xuICAgICAgICBUYWdzLm9mKHNjb3BlKS5hZGQoJ1Jlc291Y2VQcmVmaXgnLCB0aGlzLmFwcENvbmZpZy5BcHBQcmVmaXgpO1xuICAgIH1cbn0iXX0=

package/dist/interfaces/ApiLambdaResult.d.ts

@@ -1,4 +1,5 @@
-import { IRestApi } from "aws-cdk-lib/aws-apigateway";
+import { IRestApi, RequestAuthorizer, TokenAuthorizer } from "aws-cdk-lib/aws-apigateway";
 export interface ApiLambdaResult {
     api: IRestApi;
+    authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null;
 }

package/dist/interfaces/ApiLambdaResult.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpTGFtYmRhUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ludGVyZmFjZXMvQXBpTGFtYmRhUmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJUmVzdEFwaSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtYXBpZ2F0ZXdheVwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIEFwaUxhbWJkYVJlc3VsdCB7XG4gICAgYXBpOiAgSVJlc3RBcGk7XG4gICAgXG59Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpTGFtYmRhUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ludGVyZmFjZXMvQXBpTGFtYmRhUmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUb2tlbiB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgSVJlc3RBcGksIFJlcXVlc3RBdXRob3JpemVyLCBUb2tlbkF1dGhvcml6ZXIgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWFwaWdhdGV3YXlcIjtcblxuZXhwb3J0IGludGVyZmFjZSBBcGlMYW1iZGFSZXN1bHQge1xuICAgIGFwaTogIElSZXN0QXBpO1xuICAgIGF1dGhvcml6ZXI6IFRva2VuQXV0aG9yaXplciB8IFJlcXVlc3RBdXRob3JpemVyIHwgdW5kZWZpbmVkIHwgbnVsbDtcbn0iXX0=

package/dist/resources/gateway/CreateApiAndAttachLambdas.d.ts

@@ -13,9 +13,8 @@ export declare class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaRes
     protected requireAuthorizer: boolean;
     protected authorizer?: TsgAuthorizerType;
     constructor(scope: Construct, config: AppConfig, gatewayApi: IRestApi, layers?: LayerVersion[] | undefined, tables?: ITable[] | undefined);
-    protected createResource(scope: Construct): any[] | null;
+    protected createResource(scope: Construct): ApiLambdaResult[] | null;
     protected createOutput<T>(scope: Construct, createdAssets: T[]): void;
-    private onInit;
     private createAuthorizer;
     private assignAccessToTables;
     private AddRoutes;

package/dist/resources/gateway/CreateApiAndAttachLambdas.js

@@ -19,6 +19,7 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
         this.gatewayApi = gatewayApi;
         this.layers = layers;
         this.tables = tables;
+        console.log('### CreateApiAndAttachLambdas ### Constructor ###: ', config);
         this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER &&
             this.config.RESOURCES.AUTHORIZER.type) ? true : false;
         if (this.requireAuthorizer) {
@@ -27,15 +28,9 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
         else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {
             throw new Error(`You must provide an authorizer type if a Authorizer is required`);
         }
-        this.onInit();
+        this.createdResources = this.createResource(scope);
     }
     createResource(scope) {
-        return null;
-    }
-    createOutput(scope, createdAssets) {
-        return;
-    }
-    onInit() {
         let authorizer = undefined;
         // Create Authorizer
         if (this.requireAuthorizer) {
@@ -49,7 +44,18 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
         }
         // Create Routes on API Gateway for Lambdas from config
         this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer || undefined);
-        return lambdas.Lambdas;
+        const result = {
+            api: this.gatewayApi,
+            authorizer: authorizer
+        };
+        return [result];
+    }
+    createOutput(scope, createdAssets) {
+        this.createdResources.forEach((x, idx) => {
+            new aws_cdk_lib_1.CfnOutput(scope, `Authorizerr-${idx}`, {
+                value: x.authorizer?.authorizerArn
+            });
+        });
     }
     createAuthorizer() {
         let authorizer = undefined;
@@ -91,4 +97,4 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
     }
 }
 exports.CreateApiAndAttachLambdas = CreateApiAndAttachLambdas;
-//# 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;IAO5D;IACA;IACA;IAPF,iBAAiB,CAAU;IAC3B,UAAU,CAAqB;IAEzC,YAAY,KAAgB,EACxB,MAAiB,EACT,UAAoB,EACpB,MAAuB,EACvB,MAAiB;QACzB,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAHb,eAAU,GAAV,UAAU,CAAU;QACpB,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAW;QAGzB,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU;YACtD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QAE1D,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC;SAC5D;aAAM,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE;YACnF,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACtF;QAED,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,GAA2D,SAAS,CAAC;QAEnF,oBAAoB;QACpB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;SACxC;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,IAAI,SAAS,CAAC,CAAC;QAEvF,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,EAAE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,UAAU,EAAE,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAEtD,OAAO,UAAU,CAAC;SAErB;aAAM,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,KAAK,qCAAiB,CAAC,kBAAkB,EAAE;YAC3F,UAAU,GAAG,IAAI,2CAAoB,CAAC,IAAI,CAAC,KAAK,EAC5C,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAsC,CAAC;YAExD,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,UAAU,EAAE,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAEtD,OAAO,UAAU,CAAC;SACrB;QACD,OAAO,IAAI,CAAC;IAChB,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;QACjE,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AArHD,8DAqHC","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 requireAuthorizer: boolean;\n    protected authorizer?: TsgAuthorizerType;\n\n    constructor(scope: Construct,\n        config: AppConfig,\n        private gatewayApi: IRestApi,\n        private layers?: LayerVersion[],\n        private tables?: ITable[]) {\n        super(scope, config);\n\n        this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && \n            this.config.RESOURCES.AUTHORIZER.type) ? true : false;       \n\n        if (this.requireAuthorizer) {\n            this.authorizer = this.config.RESOURCES.AUTHORIZER?.type;\n        } else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {\n            throw new Error(`You must provide an authorizer type if a Authorizer is required`);\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 | null = 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 || undefined);\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 if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.REQUEST_AUTHORIZER) {\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        return null;\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}"]}
+//# 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,6CAAuD;AACvD,oFAAiF;AACjF,yDAAsD;AAKtD,0DAAiD;AAEjD,MAAa,yBAA0B,SAAQ,2BAA6B;IAO5D;IACA;IACA;IAPF,iBAAiB,CAAU;IAC3B,UAAU,CAAqB;IAEzC,YAAY,KAAgB,EACxB,MAAiB,EACT,UAAoB,EACpB,MAAuB,EACvB,MAAiB;QACzB,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAHb,eAAU,GAAV,UAAU,CAAU;QACpB,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAW;QAGzB,OAAO,CAAC,GAAG,CAAC,qDAAqD,EAAE,MAAM,CAAC,CAAC;QAE3E,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU;YACtD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QAE1D,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC;SAC5D;aAAM,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE;YACnF,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACtF;QAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAE,CAAC;IACxD,CAAC;IAES,cAAc,CAAC,KAAgB;QAErC,IAAI,UAAU,GAA2D,SAAS,CAAC;QAEnF,oBAAoB;QACpB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;SACxC;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,IAAI,SAAS,CAAC,CAAC;QAEvF,MAAM,MAAM,GAAoB;YAC5B,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,UAAU,EAAE,UAAU;SACzB,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAES,YAAY,CAAI,KAAgB,EAAE,aAAkB;QAE1D,IAAI,CAAC,gBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;YACtC,IAAI,uBAAS,CAAC,KAAK,EAAE,eAAe,GAAG,EAAE,EAAE;gBACvC,KAAK,EAAE,CAAC,CAAC,UAAU,EAAE,aAAc;aACtC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,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,EAAE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,UAAU,EAAE,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAEtD,OAAO,UAAU,CAAC;SAErB;aAAM,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,KAAK,qCAAiB,CAAC,kBAAkB,EAAE;YAC3F,UAAU,GAAG,IAAI,2CAAoB,CAAC,IAAI,CAAC,KAAK,EAC5C,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAsC,CAAC;YAExD,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,UAAU,EAAE,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAEtD,OAAO,UAAU,CAAC;SACrB;QACD,OAAO,IAAI,CAAC;IAChB,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;QACjE,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA3HD,8DA2HC","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 { CfnOutput, 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 requireAuthorizer: boolean;\n    protected authorizer?: TsgAuthorizerType;\n\n    constructor(scope: Construct,\n        config: AppConfig,\n        private gatewayApi: IRestApi,\n        private layers?: LayerVersion[],\n        private tables?: ITable[]) {\n        super(scope, config);\n\n        console.log('### CreateApiAndAttachLambdas ### Constructor ###: ', config);\n        \n        this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && \n            this.config.RESOURCES.AUTHORIZER.type) ? true : false;       \n\n        if (this.requireAuthorizer) {\n            this.authorizer = this.config.RESOURCES.AUTHORIZER?.type;\n        } else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {\n            throw new Error(`You must provide an authorizer type if a Authorizer is required`);\n        }\n\n        this.createdResources = this.createResource(scope)!;\n    }\n\n    protected createResource(scope: Construct): ApiLambdaResult[] | null {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null = 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 || undefined);\n\n        const result: ApiLambdaResult = {\n            api: this.gatewayApi,\n            authorizer: authorizer\n        };\n        return [result];\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        \n        this.createdResources!.forEach((x, idx) => {\n            new CfnOutput(scope, `Authorizerr-${idx}`, {\n                value: x.authorizer?.authorizerArn!\n            });\n        });\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 if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.REQUEST_AUTHORIZER) {\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        return null;\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}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sylvesterllc/aws-constructs",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "description": "AWS Constructs",
   "main": "dist/index.js",
   "keywords": [

package/src/constructs/MicroService.ts

@@ -68,7 +68,10 @@ export class MicroService extends Construct {
         if (this.requireSeedDatabase) {
             createSeedDatabaseCustomResource(scope, this.appConfig, tables![0], layers);
         }
-        
+
+               console.log('myConfig', this.appConfig);
+
+               console.log('Authorizer Type::: ', this.appConfig.RESOURCES.AUTHORIZER?.type)
         // CREATE API GATEWAY AND LAMBDA HERE 
         const apiGateway = new CreateApiAndAttachLambdas(scope, this.appConfig, gateway[0], layers,tables);
        

package/src/interfaces/ApiLambdaResult.ts

@@ -1,6 +1,7 @@
-import { IRestApi } from "aws-cdk-lib/aws-apigateway";
+import { Token } from "aws-cdk-lib";
+import { IRestApi, RequestAuthorizer, TokenAuthorizer } from "aws-cdk-lib/aws-apigateway";
 
 export interface ApiLambdaResult {
     api:  IRestApi;
-    
+    authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null;
 }

package/src/resources/gateway/CreateApiAndAttachLambdas.ts

@@ -6,7 +6,7 @@ import { ApiLambdaResult } from "../../interfaces/ApiLambdaResult";
 import { TsgAuthorizerType } from "../../config/types/TsgAuthorizerType";
 import { IRestApi, RequestAuthorizer, TokenAuthorizer } from "aws-cdk-lib/aws-apigateway";
 import { TsgJwtTokenAuthorizer } from "../lambda-authorizer/TsgJwtTokenAuthorizer";
-import { RemovalPolicy } from "aws-cdk-lib";
+import { CfnOutput, RemovalPolicy } from "aws-cdk-lib";
 import { TsgRequestAuthorizer } from "../lambda-authorizer/TsgRequestAuthorizer";
 import { CreateLambda } from "../lambda/createLambda";
 import { TsgLambdaProps } from "../../config/types/TsgLambdaProps";
@@ -27,6 +27,8 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
         private tables?: ITable[]) {
         super(scope, config);
 
+        console.log('### CreateApiAndAttachLambdas ### Constructor ###: ', config);
+        
         this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && 
             this.config.RESOURCES.AUTHORIZER.type) ? true : false;       
 
@@ -36,19 +38,10 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
             throw new Error(`You must provide an authorizer type if a Authorizer is required`);
         }
 
-        this.onInit();
+        this.createdResources = this.createResource(scope)!;
     }
 
-    protected createResource(scope: Construct): any[] | null {
-
-        return null;
-    }
-
-    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {
-        return;
-    }
-
-    private onInit() {
+    protected createResource(scope: Construct): ApiLambdaResult[] | null {
 
         let authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null = undefined;
 
@@ -68,9 +61,22 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
         // Create Routes on API Gateway for Lambdas from config
         this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer || undefined);
 
-        return lambdas.Lambdas;
+        const result: ApiLambdaResult = {
+            api: this.gatewayApi,
+            authorizer: authorizer
+        };
+        return [result];
     }
 
+    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {
+        
+        this.createdResources!.forEach((x, idx) => {
+            new CfnOutput(scope, `Authorizerr-${idx}`, {
+                value: x.authorizer?.authorizerArn!
+            });
+        });
+    }    
+
     private createAuthorizer() {
 
         let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;