@sylvesterllc/aws-constructs 1.1.0 → 1.1.2

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 (10) hide show
  1. package/dist/constructs/MicroService.d.ts +2 -1
  2. package/dist/constructs/MicroService.js +5 -3
  3. package/dist/resources/certificate/createCertificate.d.ts +3 -3
  4. package/dist/resources/certificate/createCertificate.js +9 -9
  5. package/dist/resources/gateway/createApi.d.ts +1 -1
  6. package/dist/resources/gateway/createApi.js +12 -12
  7. package/package.json +1 -1
  8. package/src/constructs/MicroService.ts +2 -2
  9. package/src/resources/certificate/createCertificate.ts +9 -9
  10. package/src/resources/gateway/createApi.ts +11 -11
package/dist/constructs/MicroService.d.ts CHANGED
@@ -9,6 +9,7 @@ import { NodejsFunction } from "aws-cdk-lib/aws-lambda-nodejs";
9
9
  import { Logger } from "../helpers/logger";
10
10
  export declare class MicroService extends Construct {
11
11
  private logger;
12
+ private env;
12
13
  protected readonly requireDynamoTables: boolean;
13
14
  protected requireSeedDatabase: boolean;
14
15
  protected readonly hasLambdaLayers: boolean;
@@ -25,7 +26,7 @@ export declare class MicroService extends Construct {
25
26
  get Lambdas(): NodejsFunction[];
26
27
  get LambdaRecords(): Record<string, NodejsFunction>;
27
28
  get RestApi(): IRestApi;
28
- constructor(scope: Construct, id: string, props: MicroserviceProps, logger?: Logger);
29
+ constructor(scope: Construct, id: string, props: MicroserviceProps, logger: Logger, env: string);
29
30
  private onInit;
30
31
  protected createTag(scope: Construct): void;
31
32
  }
package/dist/constructs/MicroService.js CHANGED
@@ -13,6 +13,7 @@ const createSeedDatabaseCustomResource_1 = require("../resources/customResource/
13
13
  const logger_1 = require("../helpers/logger");
14
14
  class MicroService extends constructs_1.Construct {
15
15
  logger;
16
+ env;
16
17
  requireDynamoTables;
17
18
  requireSeedDatabase = false;
18
19
  hasLambdaLayers = false;
@@ -41,9 +42,10 @@ class MicroService extends constructs_1.Construct {
41
42
  get RestApi() {
42
43
  return this.api;
43
44
  }
44
- constructor(scope, id, props, logger = new logger_1.Logger()) {
45
+ constructor(scope, id, props, logger = new logger_1.Logger(), env) {
45
46
  super(scope, id);
46
47
  this.logger = logger;
48
+ this.env = env;
47
49
  this.appConfig = new AppConfig_1.AppConfig(props);
48
50
  this.requireDynamoTables = (props.RESOURCES.DYNAMO?.TABLES &&
49
51
  props.RESOURCES.DYNAMO.TABLES.length > 0) ? true : false;
@@ -71,7 +73,7 @@ class MicroService extends constructs_1.Construct {
71
73
  if (this.hasLambdaLayers) {
72
74
  commonLayers = (0, createCommonLayer_1.createCommonLayer)(scope, this.appConfig);
73
75
  }
74
- const gateway = new createApi_1.Api(scope, this.appConfig).APIs;
76
+ const gateway = new createApi_1.Api(scope, this.appConfig, this.env).APIs;
75
77
  const layers = commonLayers;
76
78
  // Creates DynamoDb Tables if required
77
79
  if (this.requireDynamoTables) {
@@ -99,4 +101,4 @@ class MicroService extends constructs_1.Construct {
99
101
  }
100
102
  }
101
103
  exports.MicroService = MicroService;
102
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"MicroService.js","sourceRoot":"","sources":["../../src/constructs/MicroService.ts"],"names":[],"mappings":"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","sourcesContent":["import { Table } from \"aws-cdk-lib/aws-dynamodb\";\nimport { Construct } from \"constructs\";\nimport { MicroserviceProps } from \"../interfaces/MicroserviceProps\";\nimport { CreateDynamoDb } from \"../resources/dynamodb/CreateDynamo\";\nimport { Api } from \"../resources/gateway/createApi\";\nimport { getSecretManager } from \"../resources/securityManager\";\nimport { createCommonLayer } from \"../resources/helpers/createCommonLayer\";\nimport { AppConfig } from \"../config/AppConfig\";\nimport { Tags } from \"aws-cdk-lib\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { CreateApiAndAttachLambdas } from \"../resources/gateway/CreateApiAndAttachLambdas\";\nimport { createSeedDatabaseCustomResource } from \"../resources/customResource/createSeedDatabaseCustomResource\";\nimport { IRestApi } from \"aws-cdk-lib/aws-apigateway\";\nimport { ISecret } from \"aws-cdk-lib/aws-secretsmanager\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { Environment } from \"../config/Environments\";\nimport { Logger } from \"../helpers/logger\";\nexport class MicroService extends Construct {\n\n    protected readonly requireDynamoTables: boolean;\n    protected requireSeedDatabase: boolean = false;\n    protected readonly hasLambdaLayers: boolean = false;\n    protected appConfig: AppConfig;\n    private readonly api: IRestApi;\n    private readonly dynamoTables: Table[] | undefined;\n    private readonly lambdaLayers: LayerVersion[] | undefined;\n    private readonly secretManager: ISecret | null = null;\n    private readonly lambdas: NodejsFunction[] = [];\n    private lambdaRecords: Record<string, NodejsFunction> = {};\n\n    public get Tables() {\n        return this.dynamoTables;\n    }\n\n    public get SecretManager() {\n        return this.secretManager;\n    }\n\n    public get LambdaLayers() {\n        return this.lambdaLayers;\n    }\n\n    public get Lambdas() {\n        return this.lambdas;\n    }\n\n    public get LambdaRecords() {\n        return this.lambdaRecords;\n    }\n\n    public get RestApi() {\n        return this.api;\n    }\n\n    constructor(scope: Construct, id: string, props: MicroserviceProps,\n        private logger: Logger = new Logger()) {\n        super(scope, id);\n\n        this.appConfig = new AppConfig(props);\n\n        this.requireDynamoTables = (props.RESOURCES.DYNAMO?.TABLES &&\n            props.RESOURCES.DYNAMO.TABLES.length > 0) ? true : false;\n\n        this.requireSeedDatabase = (props.RESOURCES.DYNAMO?.USE_SEED_DATABASE &&\n            props.RESOURCES.DYNAMO.SEED_LAMBDA) ? true : false;\n\n        this.hasLambdaLayers = (props.RESOURCES.LAMBDA_LAYERS &&\n            props.RESOURCES.LAMBDA_LAYERS.length > 0) ? true : false;\n\n        const results = this.onInit(scope);\n\n        this.api = results.restApi!;\n        this.dynamoTables = results.dynamoTables!;\n        this.lambdaLayers = results.lambdaLayers!;\n        this.secretManager = results.secretManager!;\n\n        this.lambdas = results.lambdas!;\n\n        this.createTag(scope)\n    }\n\n    private onInit(scope: Construct) {\n\n        let secretManager: ISecret | null = null;\n        let tables: Table[] | undefined = undefined;\n        let commonLayers: LayerVersion[] | undefined = undefined;\n\n        if (process.env.SECRET_MANAGER_ARN) {\n            // throw new Error(`You must provide the ARN for the your Configuration Secret \n            //     Manager`);      \n            secretManager = getSecretManager(scope, this.appConfig, process.env.SECRET_MANAGER_ARN);\n        }\n\n        if (this.hasLambdaLayers) {\n            commonLayers = createCommonLayer(scope, this.appConfig);\n        }\n\n        const gateway = new Api(scope, this.appConfig).APIs;\n\n        const layers = commonLayers;\n\n        // Creates DynamoDb Tables if required\n        if (this.requireDynamoTables) {\n            const dynamo = new CreateDynamoDb(scope, this.appConfig);\n\n            tables = dynamo.CreatedTables;\n        }\n\n        if (this.requireSeedDatabase) {\n            createSeedDatabaseCustomResource(scope, this.appConfig, tables![0], layers);\n        }\n\n        // CREATE API GATEWAY AND LAMBDA HERE \n        const apiGateway = new CreateApiAndAttachLambdas(scope, this.appConfig, gateway[0], layers, tables);\n\n        this.lambdaRecords = apiGateway.LambdaRecords;\n\n\n        this.logger.log(`lambda Records: ${this.lambdaRecords}`);\n\n        return {\n            restApi: (gateway?.length > 0) ? gateway[0] : null,\n            lambdaLayers: layers || null,\n            dynamoTables: tables || null,\n            secretManager: secretManager,\n            lambdas: apiGateway.Lambdas,\n\n        };\n\n    }\n\n    protected createTag(scope: Construct) {\n        Tags.of(scope).add('App', this.appConfig.AppName);\n        Tags.of(scope).add('ResoucePrefix', this.appConfig.AppPrefix);\n    }\n}"]}
104
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"MicroService.js","sourceRoot":"","sources":["../../src/constructs/MicroService.ts"],"names":[],"mappings":"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","sourcesContent":["import { Table } from \"aws-cdk-lib/aws-dynamodb\";\nimport { Construct } from \"constructs\";\nimport { MicroserviceProps } from \"../interfaces/MicroserviceProps\";\nimport { CreateDynamoDb } from \"../resources/dynamodb/CreateDynamo\";\nimport { Api } from \"../resources/gateway/createApi\";\nimport { getSecretManager } from \"../resources/securityManager\";\nimport { createCommonLayer } from \"../resources/helpers/createCommonLayer\";\nimport { AppConfig } from \"../config/AppConfig\";\nimport { Tags } from \"aws-cdk-lib\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { CreateApiAndAttachLambdas } from \"../resources/gateway/CreateApiAndAttachLambdas\";\nimport { createSeedDatabaseCustomResource } from \"../resources/customResource/createSeedDatabaseCustomResource\";\nimport { IRestApi } from \"aws-cdk-lib/aws-apigateway\";\nimport { ISecret } from \"aws-cdk-lib/aws-secretsmanager\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { Environment } from \"../config/Environments\";\nimport { Logger } from \"../helpers/logger\";\nexport class MicroService extends Construct {\n\n    protected readonly requireDynamoTables: boolean;\n    protected requireSeedDatabase: boolean = false;\n    protected readonly hasLambdaLayers: boolean = false;\n    protected appConfig: AppConfig;\n    private readonly api: IRestApi;\n    private readonly dynamoTables: Table[] | undefined;\n    private readonly lambdaLayers: LayerVersion[] | undefined;\n    private readonly secretManager: ISecret | null = null;\n    private readonly lambdas: NodejsFunction[] = [];\n    private lambdaRecords: Record<string, NodejsFunction> = {};\n\n    public get Tables() {\n        return this.dynamoTables;\n    }\n\n    public get SecretManager() {\n        return this.secretManager;\n    }\n\n    public get LambdaLayers() {\n        return this.lambdaLayers;\n    }\n\n    public get Lambdas() {\n        return this.lambdas;\n    }\n\n    public get LambdaRecords() {\n        return this.lambdaRecords;\n    }\n\n    public get RestApi() {\n        return this.api;\n    }\n\n    constructor(scope: Construct, id: string, props: MicroserviceProps,\n        private logger: Logger = new Logger(), private env: string) {\n        super(scope, id);\n\n        this.appConfig = new AppConfig(props);\n\n        this.requireDynamoTables = (props.RESOURCES.DYNAMO?.TABLES &&\n            props.RESOURCES.DYNAMO.TABLES.length > 0) ? true : false;\n\n        this.requireSeedDatabase = (props.RESOURCES.DYNAMO?.USE_SEED_DATABASE &&\n            props.RESOURCES.DYNAMO.SEED_LAMBDA) ? true : false;\n\n        this.hasLambdaLayers = (props.RESOURCES.LAMBDA_LAYERS &&\n            props.RESOURCES.LAMBDA_LAYERS.length > 0) ? true : false;\n\n        const results = this.onInit(scope);\n\n        this.api = results.restApi!;\n        this.dynamoTables = results.dynamoTables!;\n        this.lambdaLayers = results.lambdaLayers!;\n        this.secretManager = results.secretManager!;\n\n        this.lambdas = results.lambdas!;\n\n        this.createTag(scope)\n    }\n\n    private onInit(scope: Construct) {\n\n        let secretManager: ISecret | null = null;\n        let tables: Table[] | undefined = undefined;\n        let commonLayers: LayerVersion[] | undefined = undefined;\n\n        if (process.env.SECRET_MANAGER_ARN) {\n            // throw new Error(`You must provide the ARN for the your Configuration Secret \n            //     Manager`);      \n            secretManager = getSecretManager(scope, this.appConfig, process.env.SECRET_MANAGER_ARN);\n        }\n\n        if (this.hasLambdaLayers) {\n            commonLayers = createCommonLayer(scope, this.appConfig);\n        }\n\n        const gateway = new Api(scope, this.appConfig, this.env).APIs;\n\n        const layers = commonLayers;\n\n        // Creates DynamoDb Tables if required\n        if (this.requireDynamoTables) {\n            const dynamo = new CreateDynamoDb(scope, this.appConfig);\n\n            tables = dynamo.CreatedTables;\n        }\n\n        if (this.requireSeedDatabase) {\n            createSeedDatabaseCustomResource(scope, this.appConfig, tables![0], layers);\n        }\n\n        // CREATE API GATEWAY AND LAMBDA HERE \n        const apiGateway = new CreateApiAndAttachLambdas(scope, this.appConfig, gateway[0], layers, tables);\n\n        this.lambdaRecords = apiGateway.LambdaRecords;\n\n\n        this.logger.log(`lambda Records: ${this.lambdaRecords}`);\n\n        return {\n            restApi: (gateway?.length > 0) ? gateway[0] : null,\n            lambdaLayers: layers || null,\n            dynamoTables: tables || null,\n            secretManager: secretManager,\n            lambdas: apiGateway.Lambdas,\n\n        };\n\n    }\n\n    protected createTag(scope: Construct) {\n        Tags.of(scope).add('App', this.appConfig.AppName);\n        Tags.of(scope).add('ResoucePrefix', this.appConfig.AppPrefix);\n    }\n}"]}
package/dist/resources/certificate/createCertificate.d.ts CHANGED
@@ -4,7 +4,7 @@ import { Construct } from "constructs";
4
4
  import { MicroserviceProps } from "../../interfaces/MicroserviceProps";
5
5
  export declare class CreateCertificate {
6
6
  certificate: ICertificate;
7
- constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone);
8
- generateCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone): Certificate;
9
- generateApiCertificate(scope: Construct, props: MicroserviceProps): Certificate;
7
+ constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env?: string);
8
+ generateCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env?: string): Certificate;
9
+ generateApiCertificate(scope: Construct, props: MicroserviceProps, env?: string): Certificate;
10
10
  }
package/dist/resources/certificate/createCertificate.js CHANGED
@@ -6,12 +6,12 @@ const aws_certificatemanager_1 = require("aws-cdk-lib/aws-certificatemanager");
6
6
  const aws_route53_1 = require("aws-cdk-lib/aws-route53");
7
7
  class CreateCertificate {
8
8
  certificate;
9
- constructor(scope, props, hostedZone) {
9
+ constructor(scope, props, hostedZone, env = "prod") {
10
10
  // this.certificate = this.generateCertificate(scope, props, hostedZone);
11
- this.certificate = this.generateApiCertificate(scope, props);
11
+ this.certificate = this.generateApiCertificate(scope, props, env);
12
12
  this.certificate.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
13
13
  }
14
- generateCertificate(scope, props, hostedZone) {
14
+ generateCertificate(scope, props, hostedZone, env = "prod") {
15
15
  const devHostedZone = aws_route53_1.HostedZone.fromHostedZoneId(scope, `api.c1.dev.convergeone.io-hosted-zone`, 'Z0508834Q8E4TWFVG990');
16
16
  const cert = new aws_certificatemanager_1.Certificate(scope, `api-c1-dev-api-certificate`, {
17
17
  domainName: `c1.api.dev.convergeone.io`,
@@ -21,18 +21,18 @@ class CreateCertificate {
21
21
  });
22
22
  return cert;
23
23
  }
24
- generateApiCertificate(scope, props) {
25
- const hostedZone = aws_route53_1.HostedZone.fromHostedZoneId(scope, `api.c1.dev.convergeone.io-hosted-zone`, 'Z0508834Q8E4TWFVG990');
26
- const domainName = `${props.DNS?.SubDomainNameForApi}.${props.DNS?.SubDomainName}`;
27
- const cert = new aws_certificatemanager_1.Certificate(scope, `${props.DNS?.SubDomainName}-certificate`, {
24
+ generateApiCertificate(scope, props, env = "prod") {
25
+ const hostedZone = aws_route53_1.HostedZone.fromHostedZoneId(scope, `${props.API.DomainPrefix}-${env}-${props.DNS?.ZoneName}-hosted-zone`, props.DNS?.ZoneId);
26
+ const domainName = `${props.API.DomainPrefix}.${env}.${props.DNS?.ZoneName}`;
27
+ const cert = new aws_certificatemanager_1.Certificate(scope, `${props.API.DomainPrefix}-${env}-${props.DNS?.ZoneName}-certificate`, {
28
28
  certificateName: `${domainName}-certificate`,
29
29
  domainName: domainName,
30
30
  validation: aws_certificatemanager_1.CertificateValidation.fromDnsMultiZone({
31
- [`${props.DNS?.SubDomainName}`]: hostedZone
31
+ [`${env}.${props.DNS?.ZoneName}`]: hostedZone
32
32
  })
33
33
  });
34
34
  return cert;
35
35
  }
36
36
  }
37
37
  exports.CreateCertificate = CreateCertificate;
38
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQ2VydGlmaWNhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2NlcnRpZmljYXRlL2NyZWF0ZUNlcnRpZmljYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUE0QztBQUM1QywrRUFBK0g7QUFDL0gseURBQWtFO0FBUWxFLE1BQWEsaUJBQWlCO0lBRXJCLFdBQVcsQ0FBZTtJQUVqQyxZQUFZLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QjtRQUU3RSx5RUFBeUU7UUFFekUsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsc0JBQXNCLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRTdELElBQUksQ0FBQyxXQUFXLENBQUMsa0JBQWtCLENBQUMsMkJBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUU3RCxDQUFDO0lBRUQsbUJBQW1CLENBQUMsS0FBZ0IsRUFBRSxLQUF3QixFQUFFLFVBQXVCO1FBRXJGLE1BQU0sYUFBYSxHQUFHLHdCQUFVLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLHVDQUF1QyxFQUM5RixzQkFBc0IsQ0FBQyxDQUFDO1FBRTFCLE1BQU0sSUFBSSxHQUFHLElBQUksb0NBQVcsQ0FBQyxLQUFLLEVBQUUsNEJBQTRCLEVBQUU7WUFDaEUsVUFBVSxFQUFFLDJCQUEyQjtZQUN2QyxVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsb0JBQW9CLENBQUMsRUFBRSxhQUFhO2FBQ3RDLENBQUM7U0FDSCxDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxzQkFBc0IsQ0FBQyxLQUFnQixFQUFFLEtBQXdCO1FBRS9ELE1BQU0sVUFBVSxHQUFHLHdCQUFVLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLHVDQUF1QyxFQUMzRixzQkFBc0IsQ0FBQyxDQUFDO1FBRTFCLE1BQU0sVUFBVSxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLGFBQWEsRUFBRSxDQUFDO1FBRW5GLE1BQU0sSUFBSSxHQUFHLElBQUksb0NBQVcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxLQUFLLENBQUMsR0FBRyxFQUFFLGFBQWEsY0FBYyxFQUFFO1lBQzdFLGVBQWUsRUFBRSxHQUFHLFVBQVUsY0FBYztZQUM1QyxVQUFVLEVBQUUsVUFBVTtZQUN0QixVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsR0FBRyxLQUFLLENBQUMsR0FBRyxFQUFFLGFBQWEsRUFBRSxDQUFDLEVBQUUsVUFBVTthQUU1QyxDQUFDO1NBQ0gsQ0FBQyxDQUFDO1FBRUgsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0NBQ0Y7QUE5Q0QsOENBOENDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQ2VydGlmaWNhdGUsIENlcnRpZmljYXRlVmFsaWRhdGlvbiwgRG5zVmFsaWRhdGVkQ2VydGlmaWNhdGUsIElDZXJ0aWZpY2F0ZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtY2VydGlmaWNhdGVtYW5hZ2VyXCI7XG5pbXBvcnQgeyBIb3N0ZWRab25lLCBJSG9zdGVkWm9uZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3Mtcm91dGU1M1wiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IE1pY3Jvc2VydmljZVByb3BzIH0gZnJvbSBcIi4uLy4uL2ludGVyZmFjZXMvTWljcm9zZXJ2aWNlUHJvcHNcIjtcbmltcG9ydCB7IGVudmlyb25tZW50U3VmZml4Rm9yRG9tYWluIH0gZnJvbSBcIi4uLy4uL2hlbHBlcnMvdXRpbC1oZWxwZXJcIjtcbmltcG9ydCB7IEVudmlyb25tZW50IH0gZnJvbSBcIi4uLy4uL2NvbmZpZy9FbnZpcm9ubWVudHNcIjtcbmltcG9ydCB7IGVudiB9IGZyb20gXCJwcm9jZXNzXCI7XG5cblxuZXhwb3J0IGNsYXNzIENyZWF0ZUNlcnRpZmljYXRlIHtcblxuICBwdWJsaWMgY2VydGlmaWNhdGU6IElDZXJ0aWZpY2F0ZTtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBwcm9wczogTWljcm9zZXJ2aWNlUHJvcHMsIGhvc3RlZFpvbmU6IElIb3N0ZWRab25lKSB7XG5cbiAgICAvLyB0aGlzLmNlcnRpZmljYXRlID0gdGhpcy5nZW5lcmF0ZUNlcnRpZmljYXRlKHNjb3BlLCBwcm9wcywgaG9zdGVkWm9uZSk7XG5cbiAgICB0aGlzLmNlcnRpZmljYXRlID0gdGhpcy5nZW5lcmF0ZUFwaUNlcnRpZmljYXRlKHNjb3BlLCBwcm9wcyk7XG5cbiAgICB0aGlzLmNlcnRpZmljYXRlLmFwcGx5UmVtb3ZhbFBvbGljeShSZW1vdmFsUG9saWN5LkRFU1RST1kpO1xuXG4gIH1cblxuICBnZW5lcmF0ZUNlcnRpZmljYXRlKHNjb3BlOiBDb25zdHJ1Y3QsIHByb3BzOiBNaWNyb3NlcnZpY2VQcm9wcywgaG9zdGVkWm9uZTogSUhvc3RlZFpvbmUpIHtcblxuICAgIGNvbnN0IGRldkhvc3RlZFpvbmUgPSBIb3N0ZWRab25lLmZyb21Ib3N0ZWRab25lSWQoc2NvcGUsIGBhcGkuYzEuZGV2LmNvbnZlcmdlb25lLmlvLWhvc3RlZC16b25lYCxcbiAgICAgICdaMDUwODgzNFE4RTRUV0ZWRzk5MCcpO1xuXG4gICAgY29uc3QgY2VydCA9IG5ldyBDZXJ0aWZpY2F0ZShzY29wZSwgYGFwaS1jMS1kZXYtYXBpLWNlcnRpZmljYXRlYCwge1xuICAgICAgZG9tYWluTmFtZTogYGMxLmFwaS5kZXYuY29udmVyZ2VvbmUuaW9gLFxuICAgICAgdmFsaWRhdGlvbjogQ2VydGlmaWNhdGVWYWxpZGF0aW9uLmZyb21EbnNNdWx0aVpvbmUoe1xuICAgICAgICBbYGRldi5jb252ZXJnZW9uZS5pb2BdOiBkZXZIb3N0ZWRab25lXG4gICAgICB9KVxuICAgIH0pO1xuICAgIHJldHVybiBjZXJ0O1xuICB9XG5cbiAgZ2VuZXJhdGVBcGlDZXJ0aWZpY2F0ZShzY29wZTogQ29uc3RydWN0LCBwcm9wczogTWljcm9zZXJ2aWNlUHJvcHMpIHtcblxuICAgIGNvbnN0IGhvc3RlZFpvbmUgPSBIb3N0ZWRab25lLmZyb21Ib3N0ZWRab25lSWQoc2NvcGUsIGBhcGkuYzEuZGV2LmNvbnZlcmdlb25lLmlvLWhvc3RlZC16b25lYCxcbiAgICAgICdaMDUwODgzNFE4RTRUV0ZWRzk5MCcpO1xuXG4gICAgY29uc3QgZG9tYWluTmFtZSA9IGAke3Byb3BzLkROUz8uU3ViRG9tYWluTmFtZUZvckFwaX0uJHtwcm9wcy5ETlM/LlN1YkRvbWFpbk5hbWV9YDtcblxuICAgIGNvbnN0IGNlcnQgPSBuZXcgQ2VydGlmaWNhdGUoc2NvcGUsIGAke3Byb3BzLkROUz8uU3ViRG9tYWluTmFtZX0tY2VydGlmaWNhdGVgLCB7XG4gICAgICBjZXJ0aWZpY2F0ZU5hbWU6IGAke2RvbWFpbk5hbWV9LWNlcnRpZmljYXRlYCxcbiAgICAgIGRvbWFpbk5hbWU6IGRvbWFpbk5hbWUsXG4gICAgICB2YWxpZGF0aW9uOiBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24uZnJvbURuc011bHRpWm9uZSh7XG4gICAgICAgIFtgJHtwcm9wcy5ETlM/LlN1YkRvbWFpbk5hbWV9YF06IGhvc3RlZFpvbmVcblxuICAgICAgfSlcbiAgICB9KTtcblxuICAgIHJldHVybiBjZXJ0O1xuICB9XG59Il19
38
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQ2VydGlmaWNhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2NlcnRpZmljYXRlL2NyZWF0ZUNlcnRpZmljYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUE0QztBQUM1QywrRUFBK0g7QUFDL0gseURBQWtFO0FBUWxFLE1BQWEsaUJBQWlCO0lBRXJCLFdBQVcsQ0FBZTtJQUVqQyxZQUFZLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QixFQUFFLE1BQWMsTUFBTTtRQUVuRyx5RUFBeUU7UUFFekUsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsc0JBQXNCLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztRQUVsRSxJQUFJLENBQUMsV0FBVyxDQUFDLGtCQUFrQixDQUFDLDJCQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFN0QsQ0FBQztJQUVELG1CQUFtQixDQUFDLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QixFQUFFLE1BQWMsTUFBTTtRQUUzRyxNQUFNLGFBQWEsR0FBRyx3QkFBVSxDQUFDLGdCQUFnQixDQUFDLEtBQUssRUFBRSx1Q0FBdUMsRUFDOUYsc0JBQXNCLENBQUMsQ0FBQztRQUUxQixNQUFNLElBQUksR0FBRyxJQUFJLG9DQUFXLENBQUMsS0FBSyxFQUFFLDRCQUE0QixFQUFFO1lBQ2hFLFVBQVUsRUFBRSwyQkFBMkI7WUFDdkMsVUFBVSxFQUFFLDhDQUFxQixDQUFDLGdCQUFnQixDQUFDO2dCQUNqRCxDQUFDLG9CQUFvQixDQUFDLEVBQUUsYUFBYTthQUN0QyxDQUFDO1NBQ0gsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsc0JBQXNCLENBQUMsS0FBZ0IsRUFBRSxLQUF3QixFQUFFLE1BQWMsTUFBTTtRQUVyRixNQUFNLFVBQVUsR0FBRyx3QkFBVSxDQUFDLGdCQUFnQixDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsWUFBWSxJQUFJLEdBQUcsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsY0FBYyxFQUN6SCxLQUFLLENBQUMsR0FBRyxFQUFFLE1BQU8sQ0FBQyxDQUFDO1FBRXRCLE1BQU0sVUFBVSxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxZQUFZLElBQUksR0FBRyxJQUFJLEtBQUssQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFLENBQUM7UUFFN0UsTUFBTSxJQUFJLEdBQUcsSUFBSSxvQ0FBVyxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsWUFBWSxJQUFJLEdBQUcsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsY0FBYyxFQUFFO1lBQ3pHLGVBQWUsRUFBRSxHQUFHLFVBQVUsY0FBYztZQUM1QyxVQUFVLEVBQUUsVUFBVTtZQUN0QixVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsR0FBRyxHQUFHLElBQUksS0FBSyxDQUFDLEdBQUcsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFFLFVBQVU7YUFFOUMsQ0FBQztTQUNILENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztDQUNGO0FBOUNELDhDQThDQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IENlcnRpZmljYXRlLCBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24sIERuc1ZhbGlkYXRlZENlcnRpZmljYXRlLCBJQ2VydGlmaWNhdGUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWNlcnRpZmljYXRlbWFuYWdlclwiO1xuaW1wb3J0IHsgSG9zdGVkWm9uZSwgSUhvc3RlZFpvbmUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLXJvdXRlNTNcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBNaWNyb3NlcnZpY2VQcm9wcyB9IGZyb20gXCIuLi8uLi9pbnRlcmZhY2VzL01pY3Jvc2VydmljZVByb3BzXCI7XG5pbXBvcnQgeyBlbnZpcm9ubWVudFN1ZmZpeEZvckRvbWFpbiB9IGZyb20gXCIuLi8uLi9oZWxwZXJzL3V0aWwtaGVscGVyXCI7XG5pbXBvcnQgeyBFbnZpcm9ubWVudCB9IGZyb20gXCIuLi8uLi9jb25maWcvRW52aXJvbm1lbnRzXCI7XG5pbXBvcnQgeyBlbnYgfSBmcm9tIFwicHJvY2Vzc1wiO1xuXG5cbmV4cG9ydCBjbGFzcyBDcmVhdGVDZXJ0aWZpY2F0ZSB7XG5cbiAgcHVibGljIGNlcnRpZmljYXRlOiBJQ2VydGlmaWNhdGU7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzLCBob3N0ZWRab25lOiBJSG9zdGVkWm9uZSwgZW52OiBzdHJpbmcgPSBcInByb2RcIikge1xuXG4gICAgLy8gdGhpcy5jZXJ0aWZpY2F0ZSA9IHRoaXMuZ2VuZXJhdGVDZXJ0aWZpY2F0ZShzY29wZSwgcHJvcHMsIGhvc3RlZFpvbmUpO1xuXG4gICAgdGhpcy5jZXJ0aWZpY2F0ZSA9IHRoaXMuZ2VuZXJhdGVBcGlDZXJ0aWZpY2F0ZShzY29wZSwgcHJvcHMsIGVudik7XG5cbiAgICB0aGlzLmNlcnRpZmljYXRlLmFwcGx5UmVtb3ZhbFBvbGljeShSZW1vdmFsUG9saWN5LkRFU1RST1kpO1xuXG4gIH1cblxuICBnZW5lcmF0ZUNlcnRpZmljYXRlKHNjb3BlOiBDb25zdHJ1Y3QsIHByb3BzOiBNaWNyb3NlcnZpY2VQcm9wcywgaG9zdGVkWm9uZTogSUhvc3RlZFpvbmUsIGVudjogc3RyaW5nID0gXCJwcm9kXCIpIHtcblxuICAgIGNvbnN0IGRldkhvc3RlZFpvbmUgPSBIb3N0ZWRab25lLmZyb21Ib3N0ZWRab25lSWQoc2NvcGUsIGBhcGkuYzEuZGV2LmNvbnZlcmdlb25lLmlvLWhvc3RlZC16b25lYCxcbiAgICAgICdaMDUwODgzNFE4RTRUV0ZWRzk5MCcpO1xuXG4gICAgY29uc3QgY2VydCA9IG5ldyBDZXJ0aWZpY2F0ZShzY29wZSwgYGFwaS1jMS1kZXYtYXBpLWNlcnRpZmljYXRlYCwge1xuICAgICAgZG9tYWluTmFtZTogYGMxLmFwaS5kZXYuY29udmVyZ2VvbmUuaW9gLFxuICAgICAgdmFsaWRhdGlvbjogQ2VydGlmaWNhdGVWYWxpZGF0aW9uLmZyb21EbnNNdWx0aVpvbmUoe1xuICAgICAgICBbYGRldi5jb252ZXJnZW9uZS5pb2BdOiBkZXZIb3N0ZWRab25lXG4gICAgICB9KVxuICAgIH0pO1xuICAgIHJldHVybiBjZXJ0O1xuICB9XG5cbiAgZ2VuZXJhdGVBcGlDZXJ0aWZpY2F0ZShzY29wZTogQ29uc3RydWN0LCBwcm9wczogTWljcm9zZXJ2aWNlUHJvcHMsIGVudjogc3RyaW5nID0gXCJwcm9kXCIpIHtcblxuICAgIGNvbnN0IGhvc3RlZFpvbmUgPSBIb3N0ZWRab25lLmZyb21Ib3N0ZWRab25lSWQoc2NvcGUsIGAke3Byb3BzLkFQSS5Eb21haW5QcmVmaXh9LSR7ZW52fS0ke3Byb3BzLkROUz8uWm9uZU5hbWV9LWhvc3RlZC16b25lYCxcbiAgICAgIHByb3BzLkROUz8uWm9uZUlkISk7XG5cbiAgICBjb25zdCBkb21haW5OYW1lID0gYCR7cHJvcHMuQVBJLkRvbWFpblByZWZpeH0uJHtlbnZ9LiR7cHJvcHMuRE5TPy5ab25lTmFtZX1gO1xuXG4gICAgY29uc3QgY2VydCA9IG5ldyBDZXJ0aWZpY2F0ZShzY29wZSwgYCR7cHJvcHMuQVBJLkRvbWFpblByZWZpeH0tJHtlbnZ9LSR7cHJvcHMuRE5TPy5ab25lTmFtZX0tY2VydGlmaWNhdGVgLCB7XG4gICAgICBjZXJ0aWZpY2F0ZU5hbWU6IGAke2RvbWFpbk5hbWV9LWNlcnRpZmljYXRlYCxcbiAgICAgIGRvbWFpbk5hbWU6IGRvbWFpbk5hbWUsXG4gICAgICB2YWxpZGF0aW9uOiBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24uZnJvbURuc011bHRpWm9uZSh7XG4gICAgICAgIFtgJHtlbnZ9LiR7cHJvcHMuRE5TPy5ab25lTmFtZX1gXTogaG9zdGVkWm9uZVxuXG4gICAgICB9KVxuICAgIH0pO1xuXG4gICAgcmV0dXJuIGNlcnQ7XG4gIH1cbn0iXX0=
package/dist/resources/gateway/createApi.d.ts CHANGED
@@ -5,7 +5,7 @@ import { BaseResource } from "../base/baseResource";
5
5
  export declare class Api extends BaseResource<IRestApi> {
6
6
  private corsOptions;
7
7
  get APIs(): IRestApi[];
8
- constructor(scope: Construct, config: AppConfig);
8
+ constructor(scope: Construct, config: AppConfig, env?: string);
9
9
  private createApi;
10
10
  private createApiProps;
11
11
  private createDefaultCorsOptions;
package/dist/resources/gateway/createApi.js CHANGED
@@ -13,18 +13,18 @@ class Api extends baseResource_1.BaseResource {
13
13
  get APIs() {
14
14
  return this.createdResources;
15
15
  }
16
- constructor(scope, config) {
16
+ constructor(scope, config, env = "prod") {
17
17
  super(scope, config);
18
18
  this.corsOptions = this.createDefaultCorsOptions();
19
19
  this.createdResources = this.createResource(scope);
20
20
  }
21
- createApi(scope) {
21
+ createApi(scope, env = "prod") {
22
22
  if (this.config.DNS) {
23
23
  // console.log('### DNS is true ###');
24
24
  const zone = this.getZone(this.scope, this.config);
25
- const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));
26
- // this.createARecord(scope, zone, api);
27
- this.createCnameRecord(scope, zone, api, this.config);
25
+ const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone, env));
26
+ this.createARecord(scope, zone, api);
27
+ // this.createCnameRecord(scope, zone, api, this.config);
28
28
  this.createApiKey(this.config, api);
29
29
  return api;
30
30
  }
@@ -34,9 +34,9 @@ class Api extends baseResource_1.BaseResource {
34
34
  return api;
35
35
  }
36
36
  }
37
- createApiProps(zone) {
37
+ createApiProps(zone, env = "prod") {
38
38
  if (this.config.DNS) {
39
- const cert = this.createCertificate(this.scope, zone, this.config);
39
+ const cert = this.createCertificate(this.scope, zone, this.config, env);
40
40
  const props = {
41
41
  restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,
42
42
  description: this.config.API.Description,
@@ -87,13 +87,13 @@ class Api extends baseResource_1.BaseResource {
87
87
  hostedZoneId: config.DNS?.ZoneId
88
88
  });
89
89
  }
90
- createCertificate(scope, zone, config) {
91
- const cert = new createCertificate_1.CreateCertificate(scope, config, zone);
90
+ createCertificate(scope, zone, config, env = "prod") {
91
+ const cert = new createCertificate_1.CreateCertificate(scope, config, zone, env);
92
92
  cert.certificate.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
93
93
  return cert;
94
94
  }
95
95
  createARecord(scope, zone, api) {
96
- const aRecord = new aws_route53_1.ARecord(scope, "ApiRecord", {
96
+ const aRecord = new aws_route53_1.ARecord(scope, `api-dns-a-record-${this.config.API.DomainPrefix}`, {
97
97
  zone,
98
98
  target: aws_route53_1.RecordTarget.fromAlias(new aws_route53_targets_1.ApiGateway(api)),
99
99
  recordName: this.config.API.DomainPrefix
@@ -104,7 +104,7 @@ class Api extends baseResource_1.BaseResource {
104
104
  createCnameRecord(scope, zone, api, config) {
105
105
  const record = new aws_route53_1.CnameRecord(scope, "api-cname-record", {
106
106
  zone,
107
- domainName: api.url,
107
+ domainName: api.domainName?.domainNameAliasDomainName,
108
108
  recordName: `${config?.DNS?.SubDomainNameForApi}.${config?.DNS?.SubDomainName}`
109
109
  });
110
110
  return record;
@@ -126,4 +126,4 @@ class Api extends baseResource_1.BaseResource {
126
126
  }
127
127
  }
128
128
  exports.Api = Api;
129
- //# 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, CnameRecord, 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.createCnameRecord(scope, zone, api, this.config);\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.REGIONAL,\n                    securityPolicy: SecurityPolicy.TLS_1_2\n                },\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\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    private createCnameRecord(scope: Construct, zone: IHostedZone, api: RestApi, config: AppConfig) {\n        const record = new CnameRecord(scope, \"api-cname-record\", {\n            zone,\n            domainName: api.url!,\n            recordName: `${config?.DNS?.SubDomainNameForApi}.${config?.DNS?.SubDomainName}`\n        });\n        return record;\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}"]}
129
+ //# 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, CnameRecord, 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, env: string = \"prod\") {\n        super(scope, config);\n\n        this.corsOptions = this.createDefaultCorsOptions();\n\n        this.createdResources = this.createResource(scope);\n    }\n\n    private createApi(scope: Construct, env: string = \"prod\") {\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, env));\n\n            this.createARecord(scope, zone, api);\n\n            // this.createCnameRecord(scope, zone, api, this.config);\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, env: string = \"prod\"): RestApiProps {\n\n        if (this.config.DNS) {\n\n            const cert = this.createCertificate(this.scope, zone!, this.config, env);\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.REGIONAL,\n                    securityPolicy: SecurityPolicy.TLS_1_2\n                },\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\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, env: string = \"prod\") {\n        const cert = new CreateCertificate(scope, config, zone, env);\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, `api-dns-a-record-${this.config.API.DomainPrefix}`, {\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    private createCnameRecord(scope: Construct, zone: IHostedZone, api: RestApi, config: AppConfig) {\n        const record = new CnameRecord(scope, \"api-cname-record\", {\n            zone,\n            domainName: api.domainName?.domainNameAliasDomainName!,\n            recordName: `${config?.DNS?.SubDomainNameForApi}.${config?.DNS?.SubDomainName}`\n        });\n        return record;\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.1.0",
3
+ "version": "1.1.2",
4
4
  "description": "AWS Constructs",
5
5
  "main": "dist/index.js",
6
6
  "keywords": [
package/src/constructs/MicroService.ts CHANGED
@@ -53,7 +53,7 @@ export class MicroService extends Construct {
53
53
  }
54
54
 
55
55
  constructor(scope: Construct, id: string, props: MicroserviceProps,
56
- private logger: Logger = new Logger()) {
56
+ private logger: Logger = new Logger(), private env: string) {
57
57
  super(scope, id);
58
58
 
59
59
  this.appConfig = new AppConfig(props);
@@ -95,7 +95,7 @@ export class MicroService extends Construct {
95
95
  commonLayers = createCommonLayer(scope, this.appConfig);
96
96
  }
97
97
 
98
- const gateway = new Api(scope, this.appConfig).APIs;
98
+ const gateway = new Api(scope, this.appConfig, this.env).APIs;
99
99
 
100
100
  const layers = commonLayers;
101
101
 
package/src/resources/certificate/createCertificate.ts CHANGED
@@ -12,17 +12,17 @@ export class CreateCertificate {
12
12
 
13
13
  public certificate: ICertificate;
14
14
 
15
- constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone) {
15
+ constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: string = "prod") {
16
16
 
17
17
  // this.certificate = this.generateCertificate(scope, props, hostedZone);
18
18
 
19
- this.certificate = this.generateApiCertificate(scope, props);
19
+ this.certificate = this.generateApiCertificate(scope, props, env);
20
20
 
21
21
  this.certificate.applyRemovalPolicy(RemovalPolicy.DESTROY);
22
22
 
23
23
  }
24
24
 
25
- generateCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone) {
25
+ generateCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: string = "prod") {
26
26
 
27
27
  const devHostedZone = HostedZone.fromHostedZoneId(scope, `api.c1.dev.convergeone.io-hosted-zone`,
28
28
  'Z0508834Q8E4TWFVG990');
@@ -36,18 +36,18 @@ export class CreateCertificate {
36
36
  return cert;
37
37
  }
38
38
 
39
- generateApiCertificate(scope: Construct, props: MicroserviceProps) {
39
+ generateApiCertificate(scope: Construct, props: MicroserviceProps, env: string = "prod") {
40
40
 
41
- const hostedZone = HostedZone.fromHostedZoneId(scope, `api.c1.dev.convergeone.io-hosted-zone`,
42
- 'Z0508834Q8E4TWFVG990');
41
+ const hostedZone = HostedZone.fromHostedZoneId(scope, `${props.API.DomainPrefix}-${env}-${props.DNS?.ZoneName}-hosted-zone`,
42
+ props.DNS?.ZoneId!);
43
43
 
44
- const domainName = `${props.DNS?.SubDomainNameForApi}.${props.DNS?.SubDomainName}`;
44
+ const domainName = `${props.API.DomainPrefix}.${env}.${props.DNS?.ZoneName}`;
45
45
 
46
- const cert = new Certificate(scope, `${props.DNS?.SubDomainName}-certificate`, {
46
+ const cert = new Certificate(scope, `${props.API.DomainPrefix}-${env}-${props.DNS?.ZoneName}-certificate`, {
47
47
  certificateName: `${domainName}-certificate`,
48
48
  domainName: domainName,
49
49
  validation: CertificateValidation.fromDnsMultiZone({
50
- [`${props.DNS?.SubDomainName}`]: hostedZone
50
+ [`${env}.${props.DNS?.ZoneName}`]: hostedZone
51
51
 
52
52
  })
53
53
  });
package/src/resources/gateway/createApi.ts CHANGED
@@ -21,7 +21,7 @@ export class Api extends BaseResource<IRestApi> {
21
21
  return this.createdResources;
22
22
  }
23
23
 
24
- constructor(scope: Construct, config: AppConfig) {
24
+ constructor(scope: Construct, config: AppConfig, env: string = "prod") {
25
25
  super(scope, config);
26
26
 
27
27
  this.corsOptions = this.createDefaultCorsOptions();
@@ -29,18 +29,18 @@ export class Api extends BaseResource<IRestApi> {
29
29
  this.createdResources = this.createResource(scope);
30
30
  }
31
31
 
32
- private createApi(scope: Construct) {
32
+ private createApi(scope: Construct, env: string = "prod") {
33
33
  if (this.config.DNS) {
34
34
 
35
35
  // console.log('### DNS is true ###');
36
36
 
37
37
  const zone = this.getZone(this.scope, this.config);
38
38
 
39
- const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));
39
+ const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone, env));
40
40
 
41
- // this.createARecord(scope, zone, api);
41
+ this.createARecord(scope, zone, api);
42
42
 
43
- this.createCnameRecord(scope, zone, api, this.config);
43
+ // this.createCnameRecord(scope, zone, api, this.config);
44
44
 
45
45
  this.createApiKey(this.config, api);
46
46
 
@@ -56,11 +56,11 @@ export class Api extends BaseResource<IRestApi> {
56
56
  }
57
57
  }
58
58
 
59
- private createApiProps(zone?: IHostedZone): RestApiProps {
59
+ private createApiProps(zone?: IHostedZone, env: string = "prod"): RestApiProps {
60
60
 
61
61
  if (this.config.DNS) {
62
62
 
63
- const cert = this.createCertificate(this.scope, zone!, this.config);
63
+ const cert = this.createCertificate(this.scope, zone!, this.config, env);
64
64
 
65
65
  const props: RestApiProps = {
66
66
  restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,
@@ -121,15 +121,15 @@ export class Api extends BaseResource<IRestApi> {
121
121
  });
122
122
  }
123
123
 
124
- private createCertificate(scope: Construct, zone: IHostedZone, config: MicroserviceProps) {
125
- const cert = new CreateCertificate(scope, config, zone);
124
+ private createCertificate(scope: Construct, zone: IHostedZone, config: MicroserviceProps, env: string = "prod") {
125
+ const cert = new CreateCertificate(scope, config, zone, env);
126
126
 
127
127
  cert.certificate.applyRemovalPolicy(RemovalPolicy.DESTROY);
128
128
  return cert;
129
129
  }
130
130
 
131
131
  private createARecord(scope: Construct, zone: IHostedZone, api: RestApi) {
132
- const aRecord = new ARecord(scope, "ApiRecord", {
132
+ const aRecord = new ARecord(scope, `api-dns-a-record-${this.config.API.DomainPrefix}`, {
133
133
  zone,
134
134
  target: RecordTarget.fromAlias(new ApiGateway(api)),
135
135
  recordName: this.config.API.DomainPrefix
@@ -142,7 +142,7 @@ export class Api extends BaseResource<IRestApi> {
142
142
  private createCnameRecord(scope: Construct, zone: IHostedZone, api: RestApi, config: AppConfig) {
143
143
  const record = new CnameRecord(scope, "api-cname-record", {
144
144
  zone,
145
- domainName: api.url!,
145
+ domainName: api.domainName?.domainNameAliasDomainName!,
146
146
  recordName: `${config?.DNS?.SubDomainNameForApi}.${config?.DNS?.SubDomainName}`
147
147
  });
148
148
  return record;