@sylvesterllc/aws-constructs 1.0.108 → 1.0.110

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 (6) hide show
  1. package/dist/helpers/util-helper.d.ts +1 -1
  2. package/dist/helpers/util-helper.js +2 -2
  3. package/dist/resources/certificate/createCertificate.js +3 -3
  4. package/package.json +1 -1
  5. package/src/helpers/util-helper.ts +1 -1
  6. package/src/resources/certificate/createCertificate.ts +2 -2
package/dist/helpers/util-helper.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { Environment } from '../config/Environments';
2
2
  export declare const getUUID: () => string;
3
3
  export declare const environmentSuffix: (env?: Environment) => "" | "-qa" | "-dev";
4
- export declare const environmentSuffixForDomain: (env?: Environment) => "" | "dev" | "qa";
4
+ export declare const environmentSuffixForDomain: (env?: Environment) => "." | ".qa" | ".dev";
package/dist/helpers/util-helper.js CHANGED
@@ -11,7 +11,7 @@ const environmentSuffix = (env = "prod") => {
11
11
  };
12
12
  exports.environmentSuffix = environmentSuffix;
13
13
  const environmentSuffixForDomain = (env = "prod") => {
14
- return env === 'prod' ? '' : env === 'qa' ? 'qa' : 'dev';
14
+ return env === 'prod' ? '.' : env === 'qa' ? '.qa' : '.dev';
15
15
  };
16
16
  exports.environmentSuffixForDomain = environmentSuffixForDomain;
17
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC1oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGVscGVycy91dGlsLWhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBb0M7QUFHN0IsTUFBTSxPQUFPLEdBQUcsR0FBRyxFQUFFO0lBRXhCLE9BQU8sSUFBQSxTQUFNLEdBQUUsQ0FBQztBQUNwQixDQUFDLENBQUM7QUFIVyxRQUFBLE9BQU8sV0FHbEI7QUFFSyxNQUFNLGlCQUFpQixHQUFHLENBQUMsTUFBbUIsTUFBTSxFQUFFLEVBQUU7SUFDM0QsT0FBTyxHQUFHLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDO0FBQy9ELENBQUMsQ0FBQTtBQUZZLFFBQUEsaUJBQWlCLHFCQUU3QjtBQUVNLE1BQU0sMEJBQTBCLEdBQUcsQ0FBQyxNQUFtQixNQUFNLEVBQUUsRUFBRTtJQUNwRSxPQUFPLEdBQUcsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7QUFDN0QsQ0FBQyxDQUFBO0FBRlksUUFBQSwwQkFBMEIsOEJBRXRDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdjQgYXMgdXVpZHY0IH0gZnJvbSAndXVpZCc7XG5pbXBvcnQgeyBFbnZpcm9ubWVudCB9IGZyb20gJy4uL2NvbmZpZy9FbnZpcm9ubWVudHMnO1xuXG5leHBvcnQgY29uc3QgZ2V0VVVJRCA9ICgpID0+IHtcblxuICAgIHJldHVybiB1dWlkdjQoKTtcbn07XG5cbmV4cG9ydCBjb25zdCBlbnZpcm9ubWVudFN1ZmZpeCA9IChlbnY6IEVudmlyb25tZW50ID0gXCJwcm9kXCIpID0+IHtcbiAgICByZXR1cm4gZW52ID09PSAncHJvZCcgPyAnJyA6IGVudiA9PT0gJ3FhJyA/ICctcWEnIDogJy1kZXYnO1xufVxuXG5leHBvcnQgY29uc3QgZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4gPSAoZW52OiBFbnZpcm9ubWVudCA9IFwicHJvZFwiKSA9PiB7XG4gICAgcmV0dXJuIGVudiA9PT0gJ3Byb2QnID8gJycgOiBlbnYgPT09ICdxYScgPyAncWEnIDogJ2Rldic7XG59Il19
17
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC1oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGVscGVycy91dGlsLWhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBb0M7QUFHN0IsTUFBTSxPQUFPLEdBQUcsR0FBRyxFQUFFO0lBRXhCLE9BQU8sSUFBQSxTQUFNLEdBQUUsQ0FBQztBQUNwQixDQUFDLENBQUM7QUFIVyxRQUFBLE9BQU8sV0FHbEI7QUFFSyxNQUFNLGlCQUFpQixHQUFHLENBQUMsTUFBbUIsTUFBTSxFQUFFLEVBQUU7SUFDM0QsT0FBTyxHQUFHLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDO0FBQy9ELENBQUMsQ0FBQTtBQUZZLFFBQUEsaUJBQWlCLHFCQUU3QjtBQUVNLE1BQU0sMEJBQTBCLEdBQUcsQ0FBQyxNQUFtQixNQUFNLEVBQUUsRUFBRTtJQUNwRSxPQUFPLEdBQUcsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUM7QUFDaEUsQ0FBQyxDQUFBO0FBRlksUUFBQSwwQkFBMEIsOEJBRXRDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdjQgYXMgdXVpZHY0IH0gZnJvbSAndXVpZCc7XG5pbXBvcnQgeyBFbnZpcm9ubWVudCB9IGZyb20gJy4uL2NvbmZpZy9FbnZpcm9ubWVudHMnO1xuXG5leHBvcnQgY29uc3QgZ2V0VVVJRCA9ICgpID0+IHtcblxuICAgIHJldHVybiB1dWlkdjQoKTtcbn07XG5cbmV4cG9ydCBjb25zdCBlbnZpcm9ubWVudFN1ZmZpeCA9IChlbnY6IEVudmlyb25tZW50ID0gXCJwcm9kXCIpID0+IHtcbiAgICByZXR1cm4gZW52ID09PSAncHJvZCcgPyAnJyA6IGVudiA9PT0gJ3FhJyA/ICctcWEnIDogJy1kZXYnO1xufVxuXG5leHBvcnQgY29uc3QgZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4gPSAoZW52OiBFbnZpcm9ubWVudCA9IFwicHJvZFwiKSA9PiB7XG4gICAgcmV0dXJuIGVudiA9PT0gJ3Byb2QnID8gJy4nIDogZW52ID09PSAncWEnID8gJy5xYScgOiAnLmRldic7XG59Il19
package/dist/resources/certificate/createCertificate.js CHANGED
@@ -7,7 +7,7 @@ const util_helper_1 = require("../../helpers/util-helper");
7
7
  class CreateCertificate {
8
8
  certificate;
9
9
  constructor(scope, props, hostedZone, env = "prod") {
10
- this.certificate = this.generateCertificate(scope, props, hostedZone);
10
+ // this.certificate = this.generateCertificate(scope, props, hostedZone);
11
11
  this.certificate = this.generateApiCertificate(scope, props, hostedZone, env);
12
12
  this.certificate.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
13
13
  }
@@ -29,7 +29,7 @@ class CreateCertificate {
29
29
  }
30
30
  generateApiCertificate(scope, props, hostedZone, env) {
31
31
  const cert = new aws_certificatemanager_1.Certificate(scope, `${props.API.DomainPrefix}-${(0, util_helper_1.environmentSuffixForDomain)(env)}-certificate`, {
32
- domainName: `${props.API.DomainPrefix}.${(0, util_helper_1.environmentSuffixForDomain)(env)}.${props.DNS?.ZoneName}`,
32
+ domainName: `${props.API.DomainPrefix}${(0, util_helper_1.environmentSuffixForDomain)(env)}.${props.DNS?.ZoneName}`,
33
33
  validation: aws_certificatemanager_1.CertificateValidation.fromDnsMultiZone({
34
34
  [`${props.API.DomainPrefix}.${(0, util_helper_1.environmentSuffixForDomain)(env)}.${props.DNS?.ZoneName}`]: hostedZone
35
35
  })
@@ -38,4 +38,4 @@ class CreateCertificate {
38
38
  }
39
39
  }
40
40
  exports.CreateCertificate = CreateCertificate;
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQ2VydGlmaWNhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2NlcnRpZmljYXRlL2NyZWF0ZUNlcnRpZmljYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUE0QztBQUM1QywrRUFBK0g7QUFJL0gsMkRBQXVFO0FBSXZFLE1BQWEsaUJBQWlCO0lBRXJCLFdBQVcsQ0FBZTtJQUVqQyxZQUFZLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QixFQUFFLE1BQW1CLE1BQU07UUFFeEcsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztRQUV0RSxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUU5RSxJQUFJLENBQUMsV0FBVyxDQUFDLGtCQUFrQixDQUFDLDJCQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFN0QsQ0FBQztJQUVELG1CQUFtQixDQUFDLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QjtRQUVyRiw4R0FBOEc7UUFDOUcscUVBQXFFO1FBQ3JFLGtCQUFrQjtRQUNsQixrREFBa0Q7UUFDbEQsU0FBUztRQUVULE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FBQztRQUUxQixNQUFNLElBQUksR0FBRyxJQUFJLG9DQUFXLENBQUMsS0FBSyxFQUFFLEdBQUcsS0FBSyxDQUFDLEdBQUcsRUFBRSxxQkFBcUIsSUFBSSxPQUFPLGNBQWMsRUFBRTtZQUNoRyxVQUFVLEVBQUUsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLFlBQVksSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRTtZQUM5RCxpRkFBaUY7WUFDakYsVUFBVSxFQUFFLDhDQUFxQixDQUFDLGdCQUFnQixDQUFDO2dCQUNqRCxDQUFDLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxZQUFZLElBQUksS0FBSyxDQUFDLEdBQUcsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFFLFVBQVU7YUFDakUsQ0FBQztTQUNILENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELHNCQUFzQixDQUFDLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QixFQUFFLEdBQWdCO1FBRTFHLE1BQU0sSUFBSSxHQUFHLElBQUksb0NBQVcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLFlBQVksSUFBSSxJQUFBLHdDQUEwQixFQUFDLEdBQUcsQ0FBQyxjQUFjLEVBQUU7WUFDOUcsVUFBVSxFQUFFLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxZQUFZLElBQUksSUFBQSx3Q0FBMEIsRUFBQyxHQUFHLENBQUMsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRTtZQUNqRyxVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLFlBQVksSUFBSSxJQUFBLHdDQUEwQixFQUFDLEdBQUcsQ0FBQyxJQUFJLEtBQUssQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFLENBQUMsRUFBRSxVQUFVO2FBQ3BHLENBQUM7U0FDSCxDQUFDLENBQUM7UUFFSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7Q0FDRjtBQTlDRCw4Q0E4Q0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSZW1vdmFsUG9saWN5IH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBDZXJ0aWZpY2F0ZSwgQ2VydGlmaWNhdGVWYWxpZGF0aW9uLCBEbnNWYWxpZGF0ZWRDZXJ0aWZpY2F0ZSwgSUNlcnRpZmljYXRlIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1jZXJ0aWZpY2F0ZW1hbmFnZXJcIjtcbmltcG9ydCB7IElIb3N0ZWRab25lIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1yb3V0ZTUzXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHsgTWljcm9zZXJ2aWNlUHJvcHMgfSBmcm9tIFwiLi4vLi4vaW50ZXJmYWNlcy9NaWNyb3NlcnZpY2VQcm9wc1wiO1xuaW1wb3J0IHsgZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4gfSBmcm9tIFwiLi4vLi4vaGVscGVycy91dGlsLWhlbHBlclwiO1xuaW1wb3J0IHsgRW52aXJvbm1lbnQgfSBmcm9tIFwiLi4vLi4vY29uZmlnL0Vudmlyb25tZW50c1wiO1xuXG5cbmV4cG9ydCBjbGFzcyBDcmVhdGVDZXJ0aWZpY2F0ZSB7XG5cbiAgcHVibGljIGNlcnRpZmljYXRlOiBJQ2VydGlmaWNhdGU7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzLCBob3N0ZWRab25lOiBJSG9zdGVkWm9uZSwgZW52OiBFbnZpcm9ubWVudCA9IFwicHJvZFwiKSB7XG5cbiAgICB0aGlzLmNlcnRpZmljYXRlID0gdGhpcy5nZW5lcmF0ZUNlcnRpZmljYXRlKHNjb3BlLCBwcm9wcywgaG9zdGVkWm9uZSk7XG5cbiAgICB0aGlzLmNlcnRpZmljYXRlID0gdGhpcy5nZW5lcmF0ZUFwaUNlcnRpZmljYXRlKHNjb3BlLCBwcm9wcywgaG9zdGVkWm9uZSwgZW52KTtcblxuICAgIHRoaXMuY2VydGlmaWNhdGUuYXBwbHlSZW1vdmFsUG9saWN5KFJlbW92YWxQb2xpY3kuREVTVFJPWSk7XG5cbiAgfVxuXG4gIGdlbmVyYXRlQ2VydGlmaWNhdGUoc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzLCBob3N0ZWRab25lOiBJSG9zdGVkWm9uZSkge1xuXG4gICAgLy8gY29uc3QgY2VydCA9IG5ldyBEbnNWYWxpZGF0ZWRDZXJ0aWZpY2F0ZShzY29wZSwgYCR7cHJvcHMuRE5TLlpvbmVOYW1lV2l0aG91dFBlcmlvZH0tc3BhLWFwcC1jZXJ0aWZpY2F0ZWAsIHtcbiAgICAvLyAgICAgZG9tYWluTmFtZTogYCR7cHJvcHMuQVBJLkRvbWFpblByZWZpeH0uJHtwcm9wcy5ETlMuWm9uZU5hbWV9YCxcbiAgICAvLyAgICAgaG9zdGVkWm9uZSxcbiAgICAvLyAgICAgcmVnaW9uOiBwcm9wcy5HTE9CQUxTLnJlZ2lvbiB8fCBcInVzLWVhc3QtMVwiXG4gICAgLy8gICB9KTsgXG5cbiAgICBjb25zdCBhcHBUeXBlID0gXCJzcGEtYXBwXCI7XG5cbiAgICBjb25zdCBjZXJ0ID0gbmV3IENlcnRpZmljYXRlKHNjb3BlLCBgJHtwcm9wcy5ETlM/LlpvbmVOYW1lV2l0aG91dFBlcmlvZH0tJHthcHBUeXBlfS1jZXJ0aWZpY2F0ZWAsIHtcbiAgICAgIGRvbWFpbk5hbWU6IGAke3Byb3BzLkFQSS5Eb21haW5QcmVmaXh9LiR7cHJvcHMuRE5TPy5ab25lTmFtZX1gLFxuICAgICAgLy8gc3ViamVjdEFsdGVybmF0aXZlTmFtZXM6IFtgJHtwcm9wcy5BUEkuRG9tYWluUHJlZml4fS4ke3Byb3BzLkROUz8uWm9uZU5hbWV9YF0sXG4gICAgICB2YWxpZGF0aW9uOiBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24uZnJvbURuc011bHRpWm9uZSh7XG4gICAgICAgIFtgJHtwcm9wcy5BUEkuRG9tYWluUHJlZml4fS4ke3Byb3BzLkROUz8uWm9uZU5hbWV9YF06IGhvc3RlZFpvbmUsXG4gICAgICB9KSxcbiAgICB9KTtcblxuICAgIHJldHVybiBjZXJ0O1xuICB9XG5cbiAgZ2VuZXJhdGVBcGlDZXJ0aWZpY2F0ZShzY29wZTogQ29uc3RydWN0LCBwcm9wczogTWljcm9zZXJ2aWNlUHJvcHMsIGhvc3RlZFpvbmU6IElIb3N0ZWRab25lLCBlbnY6IEVudmlyb25tZW50KSB7XG5cbiAgICBjb25zdCBjZXJ0ID0gbmV3IENlcnRpZmljYXRlKHNjb3BlLCBgJHtwcm9wcy5BUEkuRG9tYWluUHJlZml4fS0ke2Vudmlyb25tZW50U3VmZml4Rm9yRG9tYWluKGVudil9LWNlcnRpZmljYXRlYCwge1xuICAgICAgZG9tYWluTmFtZTogYCR7cHJvcHMuQVBJLkRvbWFpblByZWZpeH0uJHtlbnZpcm9ubWVudFN1ZmZpeEZvckRvbWFpbihlbnYpfS4ke3Byb3BzLkROUz8uWm9uZU5hbWV9YCxcbiAgICAgIHZhbGlkYXRpb246IENlcnRpZmljYXRlVmFsaWRhdGlvbi5mcm9tRG5zTXVsdGlab25lKHtcbiAgICAgICAgW2Ake3Byb3BzLkFQSS5Eb21haW5QcmVmaXh9LiR7ZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4oZW52KX0uJHtwcm9wcy5ETlM/LlpvbmVOYW1lfWBdOiBob3N0ZWRab25lXG4gICAgICB9KVxuICAgIH0pO1xuXG4gICAgcmV0dXJuIGNlcnQ7XG4gIH1cbn0iXX0=
41
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQ2VydGlmaWNhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2NlcnRpZmljYXRlL2NyZWF0ZUNlcnRpZmljYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUE0QztBQUM1QywrRUFBK0g7QUFJL0gsMkRBQXVFO0FBSXZFLE1BQWEsaUJBQWlCO0lBRXJCLFdBQVcsQ0FBZTtJQUVqQyxZQUFZLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QixFQUFFLE1BQW1CLE1BQU07UUFFeEcseUVBQXlFO1FBRXpFLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLHNCQUFzQixDQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBRTlFLElBQUksQ0FBQyxXQUFXLENBQUMsa0JBQWtCLENBQUMsMkJBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUU3RCxDQUFDO0lBRUQsbUJBQW1CLENBQUMsS0FBZ0IsRUFBRSxLQUF3QixFQUFFLFVBQXVCO1FBRXJGLDhHQUE4RztRQUM5RyxxRUFBcUU7UUFDckUsa0JBQWtCO1FBQ2xCLGtEQUFrRDtRQUNsRCxTQUFTO1FBRVQsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDO1FBRTFCLE1BQU0sSUFBSSxHQUFHLElBQUksb0NBQVcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxLQUFLLENBQUMsR0FBRyxFQUFFLHFCQUFxQixJQUFJLE9BQU8sY0FBYyxFQUFFO1lBQ2hHLFVBQVUsRUFBRSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsWUFBWSxJQUFJLEtBQUssQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFO1lBQzlELGlGQUFpRjtZQUNqRixVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLFlBQVksSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRSxDQUFDLEVBQUUsVUFBVTthQUNqRSxDQUFDO1NBQ0gsQ0FBQyxDQUFDO1FBRUgsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsc0JBQXNCLENBQUMsS0FBZ0IsRUFBRSxLQUF3QixFQUFFLFVBQXVCLEVBQUUsR0FBZ0I7UUFFMUcsTUFBTSxJQUFJLEdBQUcsSUFBSSxvQ0FBVyxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsWUFBWSxJQUFJLElBQUEsd0NBQTBCLEVBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRTtZQUM5RyxVQUFVLEVBQUUsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLFlBQVksR0FBRyxJQUFBLHdDQUEwQixFQUFDLEdBQUcsQ0FBQyxJQUFJLEtBQUssQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFO1lBQ2hHLFVBQVUsRUFBRSw4Q0FBcUIsQ0FBQyxnQkFBZ0IsQ0FBQztnQkFDakQsQ0FBQyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsWUFBWSxJQUFJLElBQUEsd0NBQTBCLEVBQUMsR0FBRyxDQUFDLElBQUksS0FBSyxDQUFDLEdBQUcsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFFLFVBQVU7YUFDcEcsQ0FBQztTQUNILENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztDQUNGO0FBOUNELDhDQThDQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IENlcnRpZmljYXRlLCBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24sIERuc1ZhbGlkYXRlZENlcnRpZmljYXRlLCBJQ2VydGlmaWNhdGUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWNlcnRpZmljYXRlbWFuYWdlclwiO1xuaW1wb3J0IHsgSUhvc3RlZFpvbmUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLXJvdXRlNTNcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBNaWNyb3NlcnZpY2VQcm9wcyB9IGZyb20gXCIuLi8uLi9pbnRlcmZhY2VzL01pY3Jvc2VydmljZVByb3BzXCI7XG5pbXBvcnQgeyBlbnZpcm9ubWVudFN1ZmZpeEZvckRvbWFpbiB9IGZyb20gXCIuLi8uLi9oZWxwZXJzL3V0aWwtaGVscGVyXCI7XG5pbXBvcnQgeyBFbnZpcm9ubWVudCB9IGZyb20gXCIuLi8uLi9jb25maWcvRW52aXJvbm1lbnRzXCI7XG5cblxuZXhwb3J0IGNsYXNzIENyZWF0ZUNlcnRpZmljYXRlIHtcblxuICBwdWJsaWMgY2VydGlmaWNhdGU6IElDZXJ0aWZpY2F0ZTtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBwcm9wczogTWljcm9zZXJ2aWNlUHJvcHMsIGhvc3RlZFpvbmU6IElIb3N0ZWRab25lLCBlbnY6IEVudmlyb25tZW50ID0gXCJwcm9kXCIpIHtcblxuICAgIC8vIHRoaXMuY2VydGlmaWNhdGUgPSB0aGlzLmdlbmVyYXRlQ2VydGlmaWNhdGUoc2NvcGUsIHByb3BzLCBob3N0ZWRab25lKTtcblxuICAgIHRoaXMuY2VydGlmaWNhdGUgPSB0aGlzLmdlbmVyYXRlQXBpQ2VydGlmaWNhdGUoc2NvcGUsIHByb3BzLCBob3N0ZWRab25lLCBlbnYpO1xuXG4gICAgdGhpcy5jZXJ0aWZpY2F0ZS5hcHBseVJlbW92YWxQb2xpY3koUmVtb3ZhbFBvbGljeS5ERVNUUk9ZKTtcblxuICB9XG5cbiAgZ2VuZXJhdGVDZXJ0aWZpY2F0ZShzY29wZTogQ29uc3RydWN0LCBwcm9wczogTWljcm9zZXJ2aWNlUHJvcHMsIGhvc3RlZFpvbmU6IElIb3N0ZWRab25lKSB7XG5cbiAgICAvLyBjb25zdCBjZXJ0ID0gbmV3IERuc1ZhbGlkYXRlZENlcnRpZmljYXRlKHNjb3BlLCBgJHtwcm9wcy5ETlMuWm9uZU5hbWVXaXRob3V0UGVyaW9kfS1zcGEtYXBwLWNlcnRpZmljYXRlYCwge1xuICAgIC8vICAgICBkb21haW5OYW1lOiBgJHtwcm9wcy5BUEkuRG9tYWluUHJlZml4fS4ke3Byb3BzLkROUy5ab25lTmFtZX1gLFxuICAgIC8vICAgICBob3N0ZWRab25lLFxuICAgIC8vICAgICByZWdpb246IHByb3BzLkdMT0JBTFMucmVnaW9uIHx8IFwidXMtZWFzdC0xXCJcbiAgICAvLyAgIH0pOyBcblxuICAgIGNvbnN0IGFwcFR5cGUgPSBcInNwYS1hcHBcIjtcblxuICAgIGNvbnN0IGNlcnQgPSBuZXcgQ2VydGlmaWNhdGUoc2NvcGUsIGAke3Byb3BzLkROUz8uWm9uZU5hbWVXaXRob3V0UGVyaW9kfS0ke2FwcFR5cGV9LWNlcnRpZmljYXRlYCwge1xuICAgICAgZG9tYWluTmFtZTogYCR7cHJvcHMuQVBJLkRvbWFpblByZWZpeH0uJHtwcm9wcy5ETlM/LlpvbmVOYW1lfWAsXG4gICAgICAvLyBzdWJqZWN0QWx0ZXJuYXRpdmVOYW1lczogW2Ake3Byb3BzLkFQSS5Eb21haW5QcmVmaXh9LiR7cHJvcHMuRE5TPy5ab25lTmFtZX1gXSxcbiAgICAgIHZhbGlkYXRpb246IENlcnRpZmljYXRlVmFsaWRhdGlvbi5mcm9tRG5zTXVsdGlab25lKHtcbiAgICAgICAgW2Ake3Byb3BzLkFQSS5Eb21haW5QcmVmaXh9LiR7cHJvcHMuRE5TPy5ab25lTmFtZX1gXTogaG9zdGVkWm9uZSxcbiAgICAgIH0pLFxuICAgIH0pO1xuXG4gICAgcmV0dXJuIGNlcnQ7XG4gIH1cblxuICBnZW5lcmF0ZUFwaUNlcnRpZmljYXRlKHNjb3BlOiBDb25zdHJ1Y3QsIHByb3BzOiBNaWNyb3NlcnZpY2VQcm9wcywgaG9zdGVkWm9uZTogSUhvc3RlZFpvbmUsIGVudjogRW52aXJvbm1lbnQpIHtcblxuICAgIGNvbnN0IGNlcnQgPSBuZXcgQ2VydGlmaWNhdGUoc2NvcGUsIGAke3Byb3BzLkFQSS5Eb21haW5QcmVmaXh9LSR7ZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4oZW52KX0tY2VydGlmaWNhdGVgLCB7XG4gICAgICBkb21haW5OYW1lOiBgJHtwcm9wcy5BUEkuRG9tYWluUHJlZml4fSR7ZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4oZW52KX0uJHtwcm9wcy5ETlM/LlpvbmVOYW1lfWAsXG4gICAgICB2YWxpZGF0aW9uOiBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24uZnJvbURuc011bHRpWm9uZSh7XG4gICAgICAgIFtgJHtwcm9wcy5BUEkuRG9tYWluUHJlZml4fS4ke2Vudmlyb25tZW50U3VmZml4Rm9yRG9tYWluKGVudil9LiR7cHJvcHMuRE5TPy5ab25lTmFtZX1gXTogaG9zdGVkWm9uZVxuICAgICAgfSlcbiAgICB9KTtcblxuICAgIHJldHVybiBjZXJ0O1xuICB9XG59Il19
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sylvesterllc/aws-constructs",
3
- "version": "1.0.108",
3
+ "version": "1.0.110",
4
4
  "description": "AWS Constructs",
5
5
  "main": "dist/index.js",
6
6
  "keywords": [
package/src/helpers/util-helper.ts CHANGED
@@ -11,5 +11,5 @@ export const environmentSuffix = (env: Environment = "prod") => {
11
11
  }
12
12
 
13
13
  export const environmentSuffixForDomain = (env: Environment = "prod") => {
14
- return env === 'prod' ? '' : env === 'qa' ? 'qa' : 'dev';
14
+ return env === 'prod' ? '.' : env === 'qa' ? '.qa' : '.dev';
15
15
  }
package/src/resources/certificate/createCertificate.ts CHANGED
@@ -13,7 +13,7 @@ export class CreateCertificate {
13
13
 
14
14
  constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: Environment = "prod") {
15
15
 
16
- this.certificate = this.generateCertificate(scope, props, hostedZone);
16
+ // this.certificate = this.generateCertificate(scope, props, hostedZone);
17
17
 
18
18
  this.certificate = this.generateApiCertificate(scope, props, hostedZone, env);
19
19
 
@@ -45,7 +45,7 @@ export class CreateCertificate {
45
45
  generateApiCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: Environment) {
46
46
 
47
47
  const cert = new Certificate(scope, `${props.API.DomainPrefix}-${environmentSuffixForDomain(env)}-certificate`, {
48
- domainName: `${props.API.DomainPrefix}.${environmentSuffixForDomain(env)}.${props.DNS?.ZoneName}`,
48
+ domainName: `${props.API.DomainPrefix}${environmentSuffixForDomain(env)}.${props.DNS?.ZoneName}`,
49
49
  validation: CertificateValidation.fromDnsMultiZone({
50
50
  [`${props.API.DomainPrefix}.${environmentSuffixForDomain(env)}.${props.DNS?.ZoneName}`]: hostedZone
51
51
  })