@sylvesterllc/aws-constructs 1.0.116 → 1.0.117

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/helpers/logger.js +1 -1
  2. package/dist/resources/certificate/createCertificate.js +4 -4
  3. package/dist/resources/gateway/createApi.js +2 -2
  4. package/package.json +1 -1
  5. package/src/helpers/logger.ts +0 -1
  6. package/src/resources/certificate/createCertificate.ts +3 -3
  7. package/src/resources/gateway/createApi.ts +1 -1
package/dist/helpers/logger.js CHANGED
@@ -13,4 +13,4 @@ class Logger {
13
13
  }
14
14
  }
15
15
  exports.Logger = Logger;
16
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hlbHBlcnMvbG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLE1BQWEsTUFBTTtJQUVLO0lBQXBCLFlBQW9CLFFBQWlCLEtBQUs7UUFBdEIsVUFBSyxHQUFMLEtBQUssQ0FBaUI7SUFBSSxDQUFDO0lBRXhDLEdBQUcsQ0FBQyxPQUFlO1FBRXRCLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN6QixDQUFDO0lBRUwsQ0FBQztDQUNKO0FBWEQsd0JBV0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZWJ1ZyB9IGZyb20gXCJjb25zb2xlXCI7XG5cbmV4cG9ydCBjbGFzcyBMb2dnZXIge1xuXG4gICAgY29uc3RydWN0b3IocHJpdmF0ZSBkZWJ1ZzogYm9vbGVhbiA9IGZhbHNlKSB7IH1cblxuICAgIHB1YmxpYyBsb2cobWVzc2FnZTogc3RyaW5nKSB7XG5cbiAgICAgICAgaWYgKHRoaXMuZGVidWcpIHtcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKG1lc3NhZ2UpO1xuICAgICAgICB9XG5cbiAgICB9XG59Il19
16
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hlbHBlcnMvbG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLE1BQWEsTUFBTTtJQUVLO0lBQXBCLFlBQW9CLFFBQWlCLEtBQUs7UUFBdEIsVUFBSyxHQUFMLEtBQUssQ0FBaUI7SUFBSSxDQUFDO0lBRXhDLEdBQUcsQ0FBQyxPQUFlO1FBRXRCLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN6QixDQUFDO0lBQ0wsQ0FBQztDQUNKO0FBVkQsd0JBVUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZWJ1ZyB9IGZyb20gXCJjb25zb2xlXCI7XG5cbmV4cG9ydCBjbGFzcyBMb2dnZXIge1xuXG4gICAgY29uc3RydWN0b3IocHJpdmF0ZSBkZWJ1ZzogYm9vbGVhbiA9IGZhbHNlKSB7IH1cblxuICAgIHB1YmxpYyBsb2cobWVzc2FnZTogc3RyaW5nKSB7XG5cbiAgICAgICAgaWYgKHRoaXMuZGVidWcpIHtcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKG1lc3NhZ2UpO1xuICAgICAgICB9XG4gICAgfVxufSJdfQ==
package/dist/resources/certificate/createCertificate.js CHANGED
@@ -23,16 +23,16 @@ class CreateCertificate {
23
23
  }
24
24
  generateApiCertificate(scope, props) {
25
25
  const hostedZone = aws_route53_1.HostedZone.fromHostedZoneId(scope, `api.c1.dev.convergeone.io-hosted-zone`, 'Z0508834Q8E4TWFVG990');
26
- const domainName = props.DNS?.SubDomainNameForApi;
26
+ const domainName = `${props.DNS?.SubDomainNameForApi}.${props.DNS?.SubDomainName}`;
27
27
  console.log('domainName: ', domainName);
28
28
  const cert = new aws_certificatemanager_1.Certificate(scope, `${props.DNS?.SubDomainName}-certificate`, {
29
- domainName: `${props.DNS?.SubDomainNameForApi}.${props.DNS?.SubDomainName}`,
29
+ domainName: domainName,
30
30
  validation: aws_certificatemanager_1.CertificateValidation.fromDnsMultiZone({
31
- [props.DNS?.SubDomainName]: hostedZone
31
+ [domainName]: hostedZone
32
32
  })
33
33
  });
34
34
  return cert;
35
35
  }
36
36
  }
37
37
  exports.CreateCertificate = CreateCertificate;
38
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQ2VydGlmaWNhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2NlcnRpZmljYXRlL2NyZWF0ZUNlcnRpZmljYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUE0QztBQUM1QywrRUFBK0g7QUFDL0gseURBQWtFO0FBT2xFLE1BQWEsaUJBQWlCO0lBRXJCLFdBQVcsQ0FBZTtJQUVqQyxZQUFZLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QjtRQUU3RSx5RUFBeUU7UUFFekUsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsc0JBQXNCLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRTdELElBQUksQ0FBQyxXQUFXLENBQUMsa0JBQWtCLENBQUMsMkJBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUU3RCxDQUFDO0lBRUQsbUJBQW1CLENBQUMsS0FBZ0IsRUFBRSxLQUF3QixFQUFFLFVBQXVCO1FBRXJGLE1BQU0sYUFBYSxHQUFHLHdCQUFVLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLHVDQUF1QyxFQUM5RixzQkFBc0IsQ0FBQyxDQUFDO1FBRTFCLE1BQU0sSUFBSSxHQUFHLElBQUksb0NBQVcsQ0FBQyxLQUFLLEVBQUUsNEJBQTRCLEVBQUU7WUFDaEUsVUFBVSxFQUFFLDJCQUEyQjtZQUN2QyxVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsb0JBQW9CLENBQUMsRUFBRSxhQUFhO2FBQ3RDLENBQUM7U0FDSCxDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxzQkFBc0IsQ0FBQyxLQUFnQixFQUFFLEtBQXdCO1FBRS9ELE1BQU0sVUFBVSxHQUFHLHdCQUFVLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLHVDQUF1QyxFQUMzRixzQkFBc0IsQ0FBQyxDQUFDO1FBRTFCLE1BQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxHQUFHLEVBQUUsbUJBQW1CLENBQUM7UUFFbEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFFeEMsTUFBTSxJQUFJLEdBQUcsSUFBSSxvQ0FBVyxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUssQ0FBQyxHQUFHLEVBQUUsYUFBYSxjQUFjLEVBQUU7WUFDN0UsVUFBVSxFQUFFLEdBQUcsS0FBSyxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLGFBQWEsRUFBRTtZQUMzRSxVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxhQUF1QixDQUFDLEVBQUUsVUFBVTthQUNqRCxDQUFDO1NBQ0gsQ0FBQyxDQUFDO1FBRUgsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0NBQ0Y7QUE5Q0QsOENBOENDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQ2VydGlmaWNhdGUsIENlcnRpZmljYXRlVmFsaWRhdGlvbiwgRG5zVmFsaWRhdGVkQ2VydGlmaWNhdGUsIElDZXJ0aWZpY2F0ZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtY2VydGlmaWNhdGVtYW5hZ2VyXCI7XG5pbXBvcnQgeyBIb3N0ZWRab25lLCBJSG9zdGVkWm9uZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3Mtcm91dGU1M1wiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IE1pY3Jvc2VydmljZVByb3BzIH0gZnJvbSBcIi4uLy4uL2ludGVyZmFjZXMvTWljcm9zZXJ2aWNlUHJvcHNcIjtcbmltcG9ydCB7IGVudmlyb25tZW50U3VmZml4Rm9yRG9tYWluIH0gZnJvbSBcIi4uLy4uL2hlbHBlcnMvdXRpbC1oZWxwZXJcIjtcbmltcG9ydCB7IEVudmlyb25tZW50IH0gZnJvbSBcIi4uLy4uL2NvbmZpZy9FbnZpcm9ubWVudHNcIjtcblxuXG5leHBvcnQgY2xhc3MgQ3JlYXRlQ2VydGlmaWNhdGUge1xuXG4gIHB1YmxpYyBjZXJ0aWZpY2F0ZTogSUNlcnRpZmljYXRlO1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIHByb3BzOiBNaWNyb3NlcnZpY2VQcm9wcywgaG9zdGVkWm9uZTogSUhvc3RlZFpvbmUpIHtcblxuICAgIC8vIHRoaXMuY2VydGlmaWNhdGUgPSB0aGlzLmdlbmVyYXRlQ2VydGlmaWNhdGUoc2NvcGUsIHByb3BzLCBob3N0ZWRab25lKTtcblxuICAgIHRoaXMuY2VydGlmaWNhdGUgPSB0aGlzLmdlbmVyYXRlQXBpQ2VydGlmaWNhdGUoc2NvcGUsIHByb3BzKTtcblxuICAgIHRoaXMuY2VydGlmaWNhdGUuYXBwbHlSZW1vdmFsUG9saWN5KFJlbW92YWxQb2xpY3kuREVTVFJPWSk7XG5cbiAgfVxuXG4gIGdlbmVyYXRlQ2VydGlmaWNhdGUoc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzLCBob3N0ZWRab25lOiBJSG9zdGVkWm9uZSkge1xuXG4gICAgY29uc3QgZGV2SG9zdGVkWm9uZSA9IEhvc3RlZFpvbmUuZnJvbUhvc3RlZFpvbmVJZChzY29wZSwgYGFwaS5jMS5kZXYuY29udmVyZ2VvbmUuaW8taG9zdGVkLXpvbmVgLFxuICAgICAgJ1owNTA4ODM0UThFNFRXRlZHOTkwJyk7XG5cbiAgICBjb25zdCBjZXJ0ID0gbmV3IENlcnRpZmljYXRlKHNjb3BlLCBgYXBpLWMxLWRldi1hcGktY2VydGlmaWNhdGVgLCB7XG4gICAgICBkb21haW5OYW1lOiBgYzEuYXBpLmRldi5jb252ZXJnZW9uZS5pb2AsXG4gICAgICB2YWxpZGF0aW9uOiBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24uZnJvbURuc011bHRpWm9uZSh7XG4gICAgICAgIFtgZGV2LmNvbnZlcmdlb25lLmlvYF06IGRldkhvc3RlZFpvbmVcbiAgICAgIH0pXG4gICAgfSk7XG4gICAgcmV0dXJuIGNlcnQ7XG4gIH1cblxuICBnZW5lcmF0ZUFwaUNlcnRpZmljYXRlKHNjb3BlOiBDb25zdHJ1Y3QsIHByb3BzOiBNaWNyb3NlcnZpY2VQcm9wcykge1xuXG4gICAgY29uc3QgaG9zdGVkWm9uZSA9IEhvc3RlZFpvbmUuZnJvbUhvc3RlZFpvbmVJZChzY29wZSwgYGFwaS5jMS5kZXYuY29udmVyZ2VvbmUuaW8taG9zdGVkLXpvbmVgLFxuICAgICAgJ1owNTA4ODM0UThFNFRXRlZHOTkwJyk7XG5cbiAgICBjb25zdCBkb21haW5OYW1lID0gcHJvcHMuRE5TPy5TdWJEb21haW5OYW1lRm9yQXBpO1xuXG4gICAgY29uc29sZS5sb2coJ2RvbWFpbk5hbWU6ICcsIGRvbWFpbk5hbWUpO1xuXG4gICAgY29uc3QgY2VydCA9IG5ldyBDZXJ0aWZpY2F0ZShzY29wZSwgYCR7cHJvcHMuRE5TPy5TdWJEb21haW5OYW1lfS1jZXJ0aWZpY2F0ZWAsIHtcbiAgICAgIGRvbWFpbk5hbWU6IGAke3Byb3BzLkROUz8uU3ViRG9tYWluTmFtZUZvckFwaX0uJHtwcm9wcy5ETlM/LlN1YkRvbWFpbk5hbWV9YCxcbiAgICAgIHZhbGlkYXRpb246IENlcnRpZmljYXRlVmFsaWRhdGlvbi5mcm9tRG5zTXVsdGlab25lKHtcbiAgICAgICAgW3Byb3BzLkROUz8uU3ViRG9tYWluTmFtZSBhcyBzdHJpbmddOiBob3N0ZWRab25lXG4gICAgICB9KVxuICAgIH0pO1xuXG4gICAgcmV0dXJuIGNlcnQ7XG4gIH1cbn0iXX0=
38
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQ2VydGlmaWNhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2NlcnRpZmljYXRlL2NyZWF0ZUNlcnRpZmljYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUE0QztBQUM1QywrRUFBK0g7QUFDL0gseURBQWtFO0FBT2xFLE1BQWEsaUJBQWlCO0lBRXJCLFdBQVcsQ0FBZTtJQUVqQyxZQUFZLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QjtRQUU3RSx5RUFBeUU7UUFFekUsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsc0JBQXNCLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRTdELElBQUksQ0FBQyxXQUFXLENBQUMsa0JBQWtCLENBQUMsMkJBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUU3RCxDQUFDO0lBRUQsbUJBQW1CLENBQUMsS0FBZ0IsRUFBRSxLQUF3QixFQUFFLFVBQXVCO1FBRXJGLE1BQU0sYUFBYSxHQUFHLHdCQUFVLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLHVDQUF1QyxFQUM5RixzQkFBc0IsQ0FBQyxDQUFDO1FBRTFCLE1BQU0sSUFBSSxHQUFHLElBQUksb0NBQVcsQ0FBQyxLQUFLLEVBQUUsNEJBQTRCLEVBQUU7WUFDaEUsVUFBVSxFQUFFLDJCQUEyQjtZQUN2QyxVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsb0JBQW9CLENBQUMsRUFBRSxhQUFhO2FBQ3RDLENBQUM7U0FDSCxDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxzQkFBc0IsQ0FBQyxLQUFnQixFQUFFLEtBQXdCO1FBRS9ELE1BQU0sVUFBVSxHQUFHLHdCQUFVLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLHVDQUF1QyxFQUMzRixzQkFBc0IsQ0FBQyxDQUFDO1FBRTFCLE1BQU0sVUFBVSxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLGFBQWEsRUFBRSxDQUFDO1FBRW5GLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRXhDLE1BQU0sSUFBSSxHQUFHLElBQUksb0NBQVcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxLQUFLLENBQUMsR0FBRyxFQUFFLGFBQWEsY0FBYyxFQUFFO1lBQzdFLFVBQVUsRUFBRSxVQUFVO1lBQ3RCLFVBQVUsRUFBRSw4Q0FBcUIsQ0FBQyxnQkFBZ0IsQ0FBQztnQkFDakQsQ0FBQyxVQUFVLENBQUMsRUFBRSxVQUFVO2FBQ3pCLENBQUM7U0FDSCxDQUFDLENBQUM7UUFFSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7Q0FDRjtBQTlDRCw4Q0E4Q0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSZW1vdmFsUG9saWN5IH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBDZXJ0aWZpY2F0ZSwgQ2VydGlmaWNhdGVWYWxpZGF0aW9uLCBEbnNWYWxpZGF0ZWRDZXJ0aWZpY2F0ZSwgSUNlcnRpZmljYXRlIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1jZXJ0aWZpY2F0ZW1hbmFnZXJcIjtcbmltcG9ydCB7IEhvc3RlZFpvbmUsIElIb3N0ZWRab25lIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1yb3V0ZTUzXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHsgTWljcm9zZXJ2aWNlUHJvcHMgfSBmcm9tIFwiLi4vLi4vaW50ZXJmYWNlcy9NaWNyb3NlcnZpY2VQcm9wc1wiO1xuaW1wb3J0IHsgZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4gfSBmcm9tIFwiLi4vLi4vaGVscGVycy91dGlsLWhlbHBlclwiO1xuaW1wb3J0IHsgRW52aXJvbm1lbnQgfSBmcm9tIFwiLi4vLi4vY29uZmlnL0Vudmlyb25tZW50c1wiO1xuXG5cbmV4cG9ydCBjbGFzcyBDcmVhdGVDZXJ0aWZpY2F0ZSB7XG5cbiAgcHVibGljIGNlcnRpZmljYXRlOiBJQ2VydGlmaWNhdGU7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzLCBob3N0ZWRab25lOiBJSG9zdGVkWm9uZSkge1xuXG4gICAgLy8gdGhpcy5jZXJ0aWZpY2F0ZSA9IHRoaXMuZ2VuZXJhdGVDZXJ0aWZpY2F0ZShzY29wZSwgcHJvcHMsIGhvc3RlZFpvbmUpO1xuXG4gICAgdGhpcy5jZXJ0aWZpY2F0ZSA9IHRoaXMuZ2VuZXJhdGVBcGlDZXJ0aWZpY2F0ZShzY29wZSwgcHJvcHMpO1xuXG4gICAgdGhpcy5jZXJ0aWZpY2F0ZS5hcHBseVJlbW92YWxQb2xpY3koUmVtb3ZhbFBvbGljeS5ERVNUUk9ZKTtcblxuICB9XG5cbiAgZ2VuZXJhdGVDZXJ0aWZpY2F0ZShzY29wZTogQ29uc3RydWN0LCBwcm9wczogTWljcm9zZXJ2aWNlUHJvcHMsIGhvc3RlZFpvbmU6IElIb3N0ZWRab25lKSB7XG5cbiAgICBjb25zdCBkZXZIb3N0ZWRab25lID0gSG9zdGVkWm9uZS5mcm9tSG9zdGVkWm9uZUlkKHNjb3BlLCBgYXBpLmMxLmRldi5jb252ZXJnZW9uZS5pby1ob3N0ZWQtem9uZWAsXG4gICAgICAnWjA1MDg4MzRROEU0VFdGVkc5OTAnKTtcblxuICAgIGNvbnN0IGNlcnQgPSBuZXcgQ2VydGlmaWNhdGUoc2NvcGUsIGBhcGktYzEtZGV2LWFwaS1jZXJ0aWZpY2F0ZWAsIHtcbiAgICAgIGRvbWFpbk5hbWU6IGBjMS5hcGkuZGV2LmNvbnZlcmdlb25lLmlvYCxcbiAgICAgIHZhbGlkYXRpb246IENlcnRpZmljYXRlVmFsaWRhdGlvbi5mcm9tRG5zTXVsdGlab25lKHtcbiAgICAgICAgW2BkZXYuY29udmVyZ2VvbmUuaW9gXTogZGV2SG9zdGVkWm9uZVxuICAgICAgfSlcbiAgICB9KTtcbiAgICByZXR1cm4gY2VydDtcbiAgfVxuXG4gIGdlbmVyYXRlQXBpQ2VydGlmaWNhdGUoc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzKSB7XG5cbiAgICBjb25zdCBob3N0ZWRab25lID0gSG9zdGVkWm9uZS5mcm9tSG9zdGVkWm9uZUlkKHNjb3BlLCBgYXBpLmMxLmRldi5jb252ZXJnZW9uZS5pby1ob3N0ZWQtem9uZWAsXG4gICAgICAnWjA1MDg4MzRROEU0VFdGVkc5OTAnKTtcblxuICAgIGNvbnN0IGRvbWFpbk5hbWUgPSBgJHtwcm9wcy5ETlM/LlN1YkRvbWFpbk5hbWVGb3JBcGl9LiR7cHJvcHMuRE5TPy5TdWJEb21haW5OYW1lfWA7XG5cbiAgICBjb25zb2xlLmxvZygnZG9tYWluTmFtZTogJywgZG9tYWluTmFtZSk7XG5cbiAgICBjb25zdCBjZXJ0ID0gbmV3IENlcnRpZmljYXRlKHNjb3BlLCBgJHtwcm9wcy5ETlM/LlN1YkRvbWFpbk5hbWV9LWNlcnRpZmljYXRlYCwge1xuICAgICAgZG9tYWluTmFtZTogZG9tYWluTmFtZSxcbiAgICAgIHZhbGlkYXRpb246IENlcnRpZmljYXRlVmFsaWRhdGlvbi5mcm9tRG5zTXVsdGlab25lKHtcbiAgICAgICAgW2RvbWFpbk5hbWVdOiBob3N0ZWRab25lXG4gICAgICB9KVxuICAgIH0pO1xuXG4gICAgcmV0dXJuIGNlcnQ7XG4gIH1cbn0iXX0=
package/dist/resources/gateway/createApi.js CHANGED
@@ -20,7 +20,7 @@ class Api extends baseResource_1.BaseResource {
20
20
  }
21
21
  createApi(scope) {
22
22
  if (this.config.DNS) {
23
- console.log('### DNS is true ###');
23
+ // console.log('### DNS is true ###');
24
24
  const zone = this.getZone(this.scope, this.config);
25
25
  const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));
26
26
  this.createARecord(scope, zone, api);
@@ -136,4 +136,4 @@ class Api extends baseResource_1.BaseResource {
136
136
  }
137
137
  }
138
138
  exports.Api = Api;
139
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createApi.js","sourceRoot":"","sources":["../../../src/resources/gateway/createApi.ts"],"names":[],"mappings":";;;AAAA,6CAA4D;AAC5D,+DAAuL;AACvL,yDAAyF;AACzF,yEAA+E;AAK/E,uDAAoD;AACpD,wEAAqE;AACrE,iDAA2C;AAI3C,MAAa,GAAI,SAAQ,2BAAsB;IAEnC,WAAW,CAAc;IAGjC,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,YAAY,KAAgB,EAAE,MAAiB;QAC3C,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAErB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAEnD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC;IAEO,SAAS,CAAC,KAAgB;QAC9B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAElB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAEnC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAEnD,MAAM,GAAG,GAAG,IAAI,wBAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YAEpG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAErC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAEpC,OAAO,GAAG,CAAC;QAEf,CAAC;aAAM,CAAC;YAEJ,MAAM,GAAG,GAAG,IAAI,wBAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,uBAAuB,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;YAE5G,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAEpC,OAAO,GAAG,CAAC;QACf,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,IAAkB;QAErC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAElB,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpE,MAAM,KAAK,GAAiB;gBACxB,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;gBAC/D,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW;gBACxC,UAAU,EAAE;oBACR,UAAU,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE;oBACrF,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,YAAY,EAAE,6BAAY,CAAC,IAAI;oBAC/B,cAAc,EAAE,+BAAc,CAAC,OAAO;iBACzC;gBACD,gCAAgC;gBAChC,0BAA0B;gBAC1B,sCAAsC;gBACtC,OAAO;gBACP,kBAAkB;gBAClB,2BAA2B,EAAE,IAAI,CAAC,WAAW;aAChD,CAAC;YAEF,OAAO,KAAK,CAAC;QACjB,CAAC;aAAM,CAAC;YACJ,MAAM,KAAK,GAAiB;gBACxB,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;gBAC/D,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW;gBACxC,2BAA2B,EAAE,IAAI,CAAC,WAAW;aAChD,CAAC;YAEF,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IAEO,wBAAwB;QAE5B,MAAM,WAAW,GAAgB;YAC7B,YAAY,EAAE;gBACV,GAAG;aACN;YACD,YAAY,EAAE,qBAAI,CAAC,WAAW;YAC9B,gBAAgB,EAAE,IAAI;YACtB,YAAY,EAAE,qBAAI,CAAC,WAAW;SACjC,CAAC;QAEF,OAAO,WAAW,CAAC;IACvB,CAAC;IAEO,cAAc,CAAC,MAAiB;QACpC,qDAAqD;QACrD,OAAO,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,KAAK,IAAI,CAAC,CAAC;IAC/F,CAAC;IAEO,YAAY,CAAC,MAAiB,EAAE,GAAY;QAEhD,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,MAAM,MAAM,GAAG,IAAI,wBAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YAC1D,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,4EAA4E;IAC5E,0GAA0G;IAC1G,4CAA4C;IAC5C,2DAA2D;IAC3D,2DAA2D;IAC3D,UAAU;IAEV,wBAAwB;IACxB,IAAI;IAEJ,+GAA+G;IAC/G,gFAAgF;IAChF,8BAA8B;IAC9B,wBAAwB;IACxB,UAAU;IACV,IAAI;IAEI,OAAO,CAAC,KAAgB,EAAE,MAAyB;QACvD,OAAO,wBAAU,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,QAAQ,OAAO,EAAE;YAC9E,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,QAAS;YAC/B,YAAY,EAAE,MAAM,CAAC,GAAG,EAAE,MAAO;SACpC,CAAC,CAAC;IACP,CAAC;IAEO,iBAAiB,CAAC,KAAgB,EAAE,IAAiB,EAAE,MAAyB;QACpF,MAAM,IAAI,GAAG,IAAI,qCAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAExD,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,aAAa,CAAC,KAAgB,EAAE,IAAiB,EAAE,GAAY;QACnE,MAAM,OAAO,GAAG,IAAI,qBAAO,CAAC,KAAK,EAAE,WAAW,EAAE;YAC5C,IAAI;YACJ,MAAM,EAAE,0BAAY,CAAC,SAAS,CAAC,IAAI,gCAAU,CAAC,GAAG,CAAC,CAAC;YACnD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY;SAC3C,CAAC,CAAC;QAEH,OAAO,CAAC,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;QAClD,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,cAAc,CAAC,KAAgB;QAErC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,4CAA4C;QAC5C,8DAA8D;QAE9D,2EAA2E;QAI3E,OAAO,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAES,YAAY,CAAI,KAAgB,EAAE,aAAkB;QAC1D,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAE/B,IAAI,uBAAS,CAAC,KAAK,EAAE,MAAM,GAAG,EAAE,EAAE;gBAC9B,aAAa;gBACb,KAAK,EAAE,GAAG,CAAC,GAAG;aACjB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CAEJ;AAzKD,kBAyKC","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\";\nimport { TsgApiKey } from \"./createApiKey\";\nimport { Environment } from \"../../config/Environments\";\nimport { environmentSuffix } from \"../../helpers/util-helper\";\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            this.createApiKey(this.config, api);\n\n            return api;\n\n        } else {\n\n            const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api-without-DNS`, this.createApiProps());\n\n            this.createApiKey(this.config, api);\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.DNS.SubDomainNameForApi}.${this.config.DNS.SubDomainName}`,\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 requiresApiKey(config: AppConfig) {\n        // Determine if any of the lambdas require an API Key\n        return config.RESOURCES.LAMBDA.some((lambda) => lambda.apiGateway?.requireApiKey === true);\n    }\n\n    private createApiKey(config: AppConfig, api: RestApi) {\n\n        if (this.requiresApiKey(this.config)) {\n            const apiKey = new TsgApiKey(this.scope, this.config, api)\n            return apiKey;\n        }\n        return null;\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\n        cert.certificate.applyRemovalPolicy(RemovalPolicy.DESTROY);\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}"]}
139
+ //# 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\";\nimport { TsgApiKey } from \"./createApiKey\";\nimport { Environment } from \"../../config/Environments\";\nimport { environmentSuffix } from \"../../helpers/util-helper\";\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            this.createApiKey(this.config, api);\n\n            return api;\n\n        } else {\n\n            const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api-without-DNS`, this.createApiProps());\n\n            this.createApiKey(this.config, api);\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.DNS.SubDomainNameForApi}.${this.config.DNS.SubDomainName}`,\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 requiresApiKey(config: AppConfig) {\n        // Determine if any of the lambdas require an API Key\n        return config.RESOURCES.LAMBDA.some((lambda) => lambda.apiGateway?.requireApiKey === true);\n    }\n\n    private createApiKey(config: AppConfig, api: RestApi) {\n\n        if (this.requiresApiKey(this.config)) {\n            const apiKey = new TsgApiKey(this.scope, this.config, api)\n            return apiKey;\n        }\n        return null;\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\n        cert.certificate.applyRemovalPolicy(RemovalPolicy.DESTROY);\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}"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sylvesterllc/aws-constructs",
3
- "version": "1.0.116",
3
+ "version": "1.0.117",
4
4
  "description": "AWS Constructs",
5
5
  "main": "dist/index.js",
6
6
  "keywords": [
package/src/helpers/logger.ts CHANGED
@@ -9,6 +9,5 @@ export class Logger {
9
9
  if (this.debug) {
10
10
  console.log(message);
11
11
  }
12
-
13
12
  }
14
13
  }
package/src/resources/certificate/createCertificate.ts CHANGED
@@ -40,14 +40,14 @@ export class CreateCertificate {
40
40
  const hostedZone = HostedZone.fromHostedZoneId(scope, `api.c1.dev.convergeone.io-hosted-zone`,
41
41
  'Z0508834Q8E4TWFVG990');
42
42
 
43
- const domainName = props.DNS?.SubDomainNameForApi;
43
+ const domainName = `${props.DNS?.SubDomainNameForApi}.${props.DNS?.SubDomainName}`;
44
44
 
45
45
  console.log('domainName: ', domainName);
46
46
 
47
47
  const cert = new Certificate(scope, `${props.DNS?.SubDomainName}-certificate`, {
48
- domainName: `${props.DNS?.SubDomainNameForApi}.${props.DNS?.SubDomainName}`,
48
+ domainName: domainName,
49
49
  validation: CertificateValidation.fromDnsMultiZone({
50
- [props.DNS?.SubDomainName as string]: hostedZone
50
+ [domainName]: hostedZone
51
51
  })
52
52
  });
53
53
 
package/src/resources/gateway/createApi.ts CHANGED
@@ -32,7 +32,7 @@ export class Api extends BaseResource<IRestApi> {
32
32
  private createApi(scope: Construct) {
33
33
  if (this.config.DNS) {
34
34
 
35
- console.log('### DNS is true ###');
35
+ // console.log('### DNS is true ###');
36
36
 
37
37
  const zone = this.getZone(this.scope, this.config);
38
38