@sylvesterllc/aws-constructs 1.0.106 → 1.0.108
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constructs/MicroService.d.ts +2 -0
- package/dist/constructs/MicroService.js +4 -1
- package/dist/helpers/util-helper.d.ts +1 -0
- package/dist/helpers/util-helper.js +6 -2
- package/dist/resources/certificate/createCertificate.d.ts +3 -1
- package/dist/resources/certificate/createCertificate.js +13 -2
- package/dist/resources/gateway/createApi.js +7 -6
- package/package.json +1 -1
- package/src/constructs/MicroService.ts +4 -0
- package/src/helpers/util-helper.ts +4 -0
- package/src/resources/certificate/createCertificate.ts +38 -22
- package/src/resources/gateway/createApi.ts +7 -5
|
@@ -3,6 +3,7 @@ import { Construct } from "constructs";
|
|
|
3
3
|
import { MicroserviceProps } from "../interfaces/MicroserviceProps";
|
|
4
4
|
import { AppConfig } from "../config/AppConfig";
|
|
5
5
|
import { LayerVersion } from "aws-cdk-lib/aws-lambda";
|
|
6
|
+
import { IRestApi } from "aws-cdk-lib/aws-apigateway";
|
|
6
7
|
import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
|
|
7
8
|
import { NodejsFunction } from "aws-cdk-lib/aws-lambda-nodejs";
|
|
8
9
|
import { Environment } from "../config/Environments";
|
|
@@ -22,6 +23,7 @@ export declare class MicroService extends Construct {
|
|
|
22
23
|
get LambdaLayers(): LayerVersion[] | undefined;
|
|
23
24
|
get Lambdas(): NodejsFunction[];
|
|
24
25
|
get LambdaRecords(): Record<string, NodejsFunction>;
|
|
26
|
+
get RestApi(): IRestApi;
|
|
25
27
|
constructor(scope: Construct, id: string, props: MicroserviceProps, env?: Environment);
|
|
26
28
|
private onInit;
|
|
27
29
|
protected createTag(scope: Construct): void;
|
|
@@ -36,6 +36,9 @@ class MicroService extends constructs_1.Construct {
|
|
|
36
36
|
get LambdaRecords() {
|
|
37
37
|
return this.lambdaRecords;
|
|
38
38
|
}
|
|
39
|
+
get RestApi() {
|
|
40
|
+
return this.api;
|
|
41
|
+
}
|
|
39
42
|
constructor(scope, id, props, env = "prod") {
|
|
40
43
|
super(scope, id);
|
|
41
44
|
this.appConfig = new AppConfig_1.AppConfig(props);
|
|
@@ -93,4 +96,4 @@ class MicroService extends constructs_1.Construct {
|
|
|
93
96
|
}
|
|
94
97
|
}
|
|
95
98
|
exports.MicroService = MicroService;
|
|
96
|
-
//# 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\";\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    constructor(scope: Construct, id: string, props: MicroserviceProps,\n        env: Environment = \"prod\") {\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, env);\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, env: Environment) {\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, 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], env, layers, tables);\n\n        this.lambdaRecords = apiGateway.LambdaRecords;\n\n        // console.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}"]}
|
|
99
|
+
//# 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\";\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        env: Environment = \"prod\") {\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, env);\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, env: Environment) {\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, 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], env, layers, tables);\n\n        this.lambdaRecords = apiGateway.LambdaRecords;\n\n        // console.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}"]}
|
|
@@ -1,3 +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";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.environmentSuffix = exports.getUUID = void 0;
|
|
3
|
+
exports.environmentSuffixForDomain = exports.environmentSuffix = exports.getUUID = void 0;
|
|
4
4
|
const uuid_1 = require("uuid");
|
|
5
5
|
const getUUID = () => {
|
|
6
6
|
return (0, uuid_1.v4)();
|
|
@@ -10,4 +10,8 @@ const environmentSuffix = (env = "prod") => {
|
|
|
10
10
|
return env === 'prod' ? '' : env === 'qa' ? '-qa' : '-dev';
|
|
11
11
|
};
|
|
12
12
|
exports.environmentSuffix = environmentSuffix;
|
|
13
|
-
|
|
13
|
+
const environmentSuffixForDomain = (env = "prod") => {
|
|
14
|
+
return env === 'prod' ? '' : env === 'qa' ? 'qa' : 'dev';
|
|
15
|
+
};
|
|
16
|
+
exports.environmentSuffixForDomain = environmentSuffixForDomain;
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC1oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGVscGVycy91dGlsLWhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBb0M7QUFHN0IsTUFBTSxPQUFPLEdBQUcsR0FBRyxFQUFFO0lBRXhCLE9BQU8sSUFBQSxTQUFNLEdBQUUsQ0FBQztBQUNwQixDQUFDLENBQUM7QUFIVyxRQUFBLE9BQU8sV0FHbEI7QUFFSyxNQUFNLGlCQUFpQixHQUFHLENBQUMsTUFBbUIsTUFBTSxFQUFFLEVBQUU7SUFDM0QsT0FBTyxHQUFHLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDO0FBQy9ELENBQUMsQ0FBQTtBQUZZLFFBQUEsaUJBQWlCLHFCQUU3QjtBQUVNLE1BQU0sMEJBQTBCLEdBQUcsQ0FBQyxNQUFtQixNQUFNLEVBQUUsRUFBRTtJQUNwRSxPQUFPLEdBQUcsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7QUFDN0QsQ0FBQyxDQUFBO0FBRlksUUFBQSwwQkFBMEIsOEJBRXRDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdjQgYXMgdXVpZHY0IH0gZnJvbSAndXVpZCc7XG5pbXBvcnQgeyBFbnZpcm9ubWVudCB9IGZyb20gJy4uL2NvbmZpZy9FbnZpcm9ubWVudHMnO1xuXG5leHBvcnQgY29uc3QgZ2V0VVVJRCA9ICgpID0+IHtcblxuICAgIHJldHVybiB1dWlkdjQoKTtcbn07XG5cbmV4cG9ydCBjb25zdCBlbnZpcm9ubWVudFN1ZmZpeCA9IChlbnY6IEVudmlyb25tZW50ID0gXCJwcm9kXCIpID0+IHtcbiAgICByZXR1cm4gZW52ID09PSAncHJvZCcgPyAnJyA6IGVudiA9PT0gJ3FhJyA/ICctcWEnIDogJy1kZXYnO1xufVxuXG5leHBvcnQgY29uc3QgZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4gPSAoZW52OiBFbnZpcm9ubWVudCA9IFwicHJvZFwiKSA9PiB7XG4gICAgcmV0dXJuIGVudiA9PT0gJ3Byb2QnID8gJycgOiBlbnYgPT09ICdxYScgPyAncWEnIDogJ2Rldic7XG59Il19
|
|
@@ -2,8 +2,10 @@ import { Certificate, ICertificate } from "aws-cdk-lib/aws-certificatemanager";
|
|
|
2
2
|
import { IHostedZone } from "aws-cdk-lib/aws-route53";
|
|
3
3
|
import { Construct } from "constructs";
|
|
4
4
|
import { MicroserviceProps } from "../../interfaces/MicroserviceProps";
|
|
5
|
+
import { Environment } from "../../config/Environments";
|
|
5
6
|
export declare class CreateCertificate {
|
|
6
7
|
certificate: ICertificate;
|
|
7
|
-
constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone);
|
|
8
|
+
constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env?: Environment);
|
|
8
9
|
generateCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone): Certificate;
|
|
10
|
+
generateApiCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: Environment): Certificate;
|
|
9
11
|
}
|
|
@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CreateCertificate = void 0;
|
|
4
4
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
5
|
const aws_certificatemanager_1 = require("aws-cdk-lib/aws-certificatemanager");
|
|
6
|
+
const util_helper_1 = require("../../helpers/util-helper");
|
|
6
7
|
class CreateCertificate {
|
|
7
8
|
certificate;
|
|
8
|
-
constructor(scope, props, hostedZone) {
|
|
9
|
+
constructor(scope, props, hostedZone, env = "prod") {
|
|
9
10
|
this.certificate = this.generateCertificate(scope, props, hostedZone);
|
|
11
|
+
this.certificate = this.generateApiCertificate(scope, props, hostedZone, env);
|
|
10
12
|
this.certificate.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
|
|
11
13
|
}
|
|
12
14
|
generateCertificate(scope, props, hostedZone) {
|
|
@@ -25,6 +27,15 @@ class CreateCertificate {
|
|
|
25
27
|
});
|
|
26
28
|
return cert;
|
|
27
29
|
}
|
|
30
|
+
generateApiCertificate(scope, props, hostedZone, env) {
|
|
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}`,
|
|
33
|
+
validation: aws_certificatemanager_1.CertificateValidation.fromDnsMultiZone({
|
|
34
|
+
[`${props.API.DomainPrefix}.${(0, util_helper_1.environmentSuffixForDomain)(env)}.${props.DNS?.ZoneName}`]: hostedZone
|
|
35
|
+
})
|
|
36
|
+
});
|
|
37
|
+
return cert;
|
|
38
|
+
}
|
|
28
39
|
}
|
|
29
40
|
exports.CreateCertificate = CreateCertificate;
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQ2VydGlmaWNhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2NlcnRpZmljYXRlL2NyZWF0ZUNlcnRpZmljYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUE0QztBQUM1QywrRUFBK0g7QUFJL0gsMkRBQXVFO0FBSXZFLE1BQWEsaUJBQWlCO0lBRXJCLFdBQVcsQ0FBZTtJQUVqQyxZQUFZLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QixFQUFFLE1BQW1CLE1BQU07UUFFeEcsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztRQUV0RSxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUU5RSxJQUFJLENBQUMsV0FBVyxDQUFDLGtCQUFrQixDQUFDLDJCQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFN0QsQ0FBQztJQUVELG1CQUFtQixDQUFDLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QjtRQUVyRiw4R0FBOEc7UUFDOUcscUVBQXFFO1FBQ3JFLGtCQUFrQjtRQUNsQixrREFBa0Q7UUFDbEQsU0FBUztRQUVULE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FBQztRQUUxQixNQUFNLElBQUksR0FBRyxJQUFJLG9DQUFXLENBQUMsS0FBSyxFQUFFLEdBQUcsS0FBSyxDQUFDLEdBQUcsRUFBRSxxQkFBcUIsSUFBSSxPQUFPLGNBQWMsRUFBRTtZQUNoRyxVQUFVLEVBQUUsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLFlBQVksSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRTtZQUM5RCxpRkFBaUY7WUFDakYsVUFBVSxFQUFFLDhDQUFxQixDQUFDLGdCQUFnQixDQUFDO2dCQUNqRCxDQUFDLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxZQUFZLElBQUksS0FBSyxDQUFDLEdBQUcsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFFLFVBQVU7YUFDakUsQ0FBQztTQUNILENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELHNCQUFzQixDQUFDLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QixFQUFFLEdBQWdCO1FBRTFHLE1BQU0sSUFBSSxHQUFHLElBQUksb0NBQVcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLFlBQVksSUFBSSxJQUFBLHdDQUEwQixFQUFDLEdBQUcsQ0FBQyxjQUFjLEVBQUU7WUFDOUcsVUFBVSxFQUFFLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxZQUFZLElBQUksSUFBQSx3Q0FBMEIsRUFBQyxHQUFHLENBQUMsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRTtZQUNqRyxVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLFlBQVksSUFBSSxJQUFBLHdDQUEwQixFQUFDLEdBQUcsQ0FBQyxJQUFJLEtBQUssQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFLENBQUMsRUFBRSxVQUFVO2FBQ3BHLENBQUM7U0FDSCxDQUFDLENBQUM7UUFFSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7Q0FDRjtBQTlDRCw4Q0E4Q0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSZW1vdmFsUG9saWN5IH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBDZXJ0aWZpY2F0ZSwgQ2VydGlmaWNhdGVWYWxpZGF0aW9uLCBEbnNWYWxpZGF0ZWRDZXJ0aWZpY2F0ZSwgSUNlcnRpZmljYXRlIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1jZXJ0aWZpY2F0ZW1hbmFnZXJcIjtcbmltcG9ydCB7IElIb3N0ZWRab25lIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1yb3V0ZTUzXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHsgTWljcm9zZXJ2aWNlUHJvcHMgfSBmcm9tIFwiLi4vLi4vaW50ZXJmYWNlcy9NaWNyb3NlcnZpY2VQcm9wc1wiO1xuaW1wb3J0IHsgZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4gfSBmcm9tIFwiLi4vLi4vaGVscGVycy91dGlsLWhlbHBlclwiO1xuaW1wb3J0IHsgRW52aXJvbm1lbnQgfSBmcm9tIFwiLi4vLi4vY29uZmlnL0Vudmlyb25tZW50c1wiO1xuXG5cbmV4cG9ydCBjbGFzcyBDcmVhdGVDZXJ0aWZpY2F0ZSB7XG5cbiAgcHVibGljIGNlcnRpZmljYXRlOiBJQ2VydGlmaWNhdGU7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzLCBob3N0ZWRab25lOiBJSG9zdGVkWm9uZSwgZW52OiBFbnZpcm9ubWVudCA9IFwicHJvZFwiKSB7XG5cbiAgICB0aGlzLmNlcnRpZmljYXRlID0gdGhpcy5nZW5lcmF0ZUNlcnRpZmljYXRlKHNjb3BlLCBwcm9wcywgaG9zdGVkWm9uZSk7XG5cbiAgICB0aGlzLmNlcnRpZmljYXRlID0gdGhpcy5nZW5lcmF0ZUFwaUNlcnRpZmljYXRlKHNjb3BlLCBwcm9wcywgaG9zdGVkWm9uZSwgZW52KTtcblxuICAgIHRoaXMuY2VydGlmaWNhdGUuYXBwbHlSZW1vdmFsUG9saWN5KFJlbW92YWxQb2xpY3kuREVTVFJPWSk7XG5cbiAgfVxuXG4gIGdlbmVyYXRlQ2VydGlmaWNhdGUoc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzLCBob3N0ZWRab25lOiBJSG9zdGVkWm9uZSkge1xuXG4gICAgLy8gY29uc3QgY2VydCA9IG5ldyBEbnNWYWxpZGF0ZWRDZXJ0aWZpY2F0ZShzY29wZSwgYCR7cHJvcHMuRE5TLlpvbmVOYW1lV2l0aG91dFBlcmlvZH0tc3BhLWFwcC1jZXJ0aWZpY2F0ZWAsIHtcbiAgICAvLyAgICAgZG9tYWluTmFtZTogYCR7cHJvcHMuQVBJLkRvbWFpblByZWZpeH0uJHtwcm9wcy5ETlMuWm9uZU5hbWV9YCxcbiAgICAvLyAgICAgaG9zdGVkWm9uZSxcbiAgICAvLyAgICAgcmVnaW9uOiBwcm9wcy5HTE9CQUxTLnJlZ2lvbiB8fCBcInVzLWVhc3QtMVwiXG4gICAgLy8gICB9KTsgXG5cbiAgICBjb25zdCBhcHBUeXBlID0gXCJzcGEtYXBwXCI7XG5cbiAgICBjb25zdCBjZXJ0ID0gbmV3IENlcnRpZmljYXRlKHNjb3BlLCBgJHtwcm9wcy5ETlM/LlpvbmVOYW1lV2l0aG91dFBlcmlvZH0tJHthcHBUeXBlfS1jZXJ0aWZpY2F0ZWAsIHtcbiAgICAgIGRvbWFpbk5hbWU6IGAke3Byb3BzLkFQSS5Eb21haW5QcmVmaXh9LiR7cHJvcHMuRE5TPy5ab25lTmFtZX1gLFxuICAgICAgLy8gc3ViamVjdEFsdGVybmF0aXZlTmFtZXM6IFtgJHtwcm9wcy5BUEkuRG9tYWluUHJlZml4fS4ke3Byb3BzLkROUz8uWm9uZU5hbWV9YF0sXG4gICAgICB2YWxpZGF0aW9uOiBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24uZnJvbURuc011bHRpWm9uZSh7XG4gICAgICAgIFtgJHtwcm9wcy5BUEkuRG9tYWluUHJlZml4fS4ke3Byb3BzLkROUz8uWm9uZU5hbWV9YF06IGhvc3RlZFpvbmUsXG4gICAgICB9KSxcbiAgICB9KTtcblxuICAgIHJldHVybiBjZXJ0O1xuICB9XG5cbiAgZ2VuZXJhdGVBcGlDZXJ0aWZpY2F0ZShzY29wZTogQ29uc3RydWN0LCBwcm9wczogTWljcm9zZXJ2aWNlUHJvcHMsIGhvc3RlZFpvbmU6IElIb3N0ZWRab25lLCBlbnY6IEVudmlyb25tZW50KSB7XG5cbiAgICBjb25zdCBjZXJ0ID0gbmV3IENlcnRpZmljYXRlKHNjb3BlLCBgJHtwcm9wcy5BUEkuRG9tYWluUHJlZml4fS0ke2Vudmlyb25tZW50U3VmZml4Rm9yRG9tYWluKGVudil9LWNlcnRpZmljYXRlYCwge1xuICAgICAgZG9tYWluTmFtZTogYCR7cHJvcHMuQVBJLkRvbWFpblByZWZpeH0uJHtlbnZpcm9ubWVudFN1ZmZpeEZvckRvbWFpbihlbnYpfS4ke3Byb3BzLkROUz8uWm9uZU5hbWV9YCxcbiAgICAgIHZhbGlkYXRpb246IENlcnRpZmljYXRlVmFsaWRhdGlvbi5mcm9tRG5zTXVsdGlab25lKHtcbiAgICAgICAgW2Ake3Byb3BzLkFQSS5Eb21haW5QcmVmaXh9LiR7ZW52aXJvbm1lbnRTdWZmaXhGb3JEb21haW4oZW52KX0uJHtwcm9wcy5ETlM/LlpvbmVOYW1lfWBdOiBob3N0ZWRab25lXG4gICAgICB9KVxuICAgIH0pO1xuXG4gICAgcmV0dXJuIGNlcnQ7XG4gIH1cbn0iXX0=
|
|
@@ -25,25 +25,25 @@ class Api extends baseResource_1.BaseResource {
|
|
|
25
25
|
if (this.config.DNS) {
|
|
26
26
|
console.log('### DNS is true ###');
|
|
27
27
|
const zone = this.getZone(this.scope, this.config);
|
|
28
|
-
const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api${(0, util_helper_1.environmentSuffix)(this.env)}`, this.createApiProps(zone));
|
|
28
|
+
const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api${(0, util_helper_1.environmentSuffix)(this.env)}`, this.createApiProps(this.env, zone));
|
|
29
29
|
this.createARecord(scope, zone, api);
|
|
30
30
|
this.createApiKey(this.config, api);
|
|
31
31
|
return api;
|
|
32
32
|
}
|
|
33
33
|
else {
|
|
34
|
-
const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api${(0, util_helper_1.environmentSuffix)(this.env)}`, this.createApiProps());
|
|
34
|
+
const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api${(0, util_helper_1.environmentSuffix)(this.env)}`, this.createApiProps(this.env));
|
|
35
35
|
this.createApiKey(this.config, api);
|
|
36
36
|
return api;
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
createApiProps(zone) {
|
|
39
|
+
createApiProps(env, zone) {
|
|
40
40
|
if (this.config.DNS) {
|
|
41
41
|
const cert = this.createCertificate(this.scope, zone, this.config);
|
|
42
42
|
const props = {
|
|
43
43
|
restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,
|
|
44
44
|
description: this.config.API.Description,
|
|
45
45
|
domainName: {
|
|
46
|
-
domainName: `${this.config.API.DomainPrefix}.${this.config.DNS.ZoneName}`,
|
|
46
|
+
domainName: `${this.config.API.DomainPrefix}.${env}.${this.config.DNS.ZoneName}`,
|
|
47
47
|
certificate: cert.certificate,
|
|
48
48
|
endpointType: aws_apigateway_1.EndpointType.EDGE,
|
|
49
49
|
securityPolicy: aws_apigateway_1.SecurityPolicy.TLS_1_2
|
|
@@ -109,7 +109,8 @@ class Api extends baseResource_1.BaseResource {
|
|
|
109
109
|
});
|
|
110
110
|
}
|
|
111
111
|
createCertificate(scope, zone, config) {
|
|
112
|
-
const cert = new createCertificate_1.CreateCertificate(scope, config, zone);
|
|
112
|
+
const cert = new createCertificate_1.CreateCertificate(scope, config, zone, this.env);
|
|
113
|
+
cert.certificate.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
|
|
113
114
|
return cert;
|
|
114
115
|
}
|
|
115
116
|
createARecord(scope, zone, api) {
|
|
@@ -138,4 +139,4 @@ class Api extends baseResource_1.BaseResource {
|
|
|
138
139
|
}
|
|
139
140
|
}
|
|
140
141
|
exports.Api = Api;
|
|
141
|
-
//# 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, private env: Environment = \"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) {\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${environmentSuffix(this.env)}`, 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${environmentSuffix(this.env)}`, 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.API.DomainPrefix}.${this.config.DNS.ZoneName}`,\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        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}"]}
|
|
142
|
+
//# 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, private env: Environment = \"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) {\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${environmentSuffix(this.env)}`, this.createApiProps(this.env, 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${environmentSuffix(this.env)}`, this.createApiProps(this.env));\n\n            this.createApiKey(this.config, api);\n\n            return api;\n        }\n    }\n\n    private createApiProps(env: Environment, 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.API.DomainPrefix}.${env}.${this.config.DNS.ZoneName}`,\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, this.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, \"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
|
@@ -47,6 +47,10 @@ export class MicroService extends Construct {
|
|
|
47
47
|
return this.lambdaRecords;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
+
public get RestApi() {
|
|
51
|
+
return this.api;
|
|
52
|
+
}
|
|
53
|
+
|
|
50
54
|
constructor(scope: Construct, id: string, props: MicroserviceProps,
|
|
51
55
|
env: Environment = "prod") {
|
|
52
56
|
super(scope, id);
|
|
@@ -8,4 +8,8 @@ export const getUUID = () => {
|
|
|
8
8
|
|
|
9
9
|
export const environmentSuffix = (env: Environment = "prod") => {
|
|
10
10
|
return env === 'prod' ? '' : env === 'qa' ? '-qa' : '-dev';
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export const environmentSuffixForDomain = (env: Environment = "prod") => {
|
|
14
|
+
return env === 'prod' ? '' : env === 'qa' ? 'qa' : 'dev';
|
|
11
15
|
}
|
|
@@ -3,38 +3,54 @@ import { Certificate, CertificateValidation, DnsValidatedCertificate, ICertifica
|
|
|
3
3
|
import { IHostedZone } from "aws-cdk-lib/aws-route53";
|
|
4
4
|
import { Construct } from "constructs";
|
|
5
5
|
import { MicroserviceProps } from "../../interfaces/MicroserviceProps";
|
|
6
|
+
import { environmentSuffixForDomain } from "../../helpers/util-helper";
|
|
7
|
+
import { Environment } from "../../config/Environments";
|
|
6
8
|
|
|
7
9
|
|
|
8
10
|
export class CreateCertificate {
|
|
9
11
|
|
|
10
|
-
|
|
12
|
+
public certificate: ICertificate;
|
|
11
13
|
|
|
12
|
-
|
|
14
|
+
constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: Environment = "prod") {
|
|
13
15
|
|
|
14
|
-
|
|
16
|
+
this.certificate = this.generateCertificate(scope, props, hostedZone);
|
|
15
17
|
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
18
|
+
this.certificate = this.generateApiCertificate(scope, props, hostedZone, env);
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
this.certificate.applyRemovalPolicy(RemovalPolicy.DESTROY);
|
|
21
21
|
|
|
22
|
-
|
|
23
|
-
// domainName: `${props.API.DomainPrefix}.${props.DNS.ZoneName}`,
|
|
24
|
-
// hostedZone,
|
|
25
|
-
// region: props.GLOBALS.region || "us-east-1"
|
|
26
|
-
// });
|
|
22
|
+
}
|
|
27
23
|
|
|
28
|
-
|
|
24
|
+
generateCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone) {
|
|
29
25
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}),
|
|
36
|
-
});
|
|
26
|
+
// const cert = new DnsValidatedCertificate(scope, `${props.DNS.ZoneNameWithoutPeriod}-spa-app-certificate`, {
|
|
27
|
+
// domainName: `${props.API.DomainPrefix}.${props.DNS.ZoneName}`,
|
|
28
|
+
// hostedZone,
|
|
29
|
+
// region: props.GLOBALS.region || "us-east-1"
|
|
30
|
+
// });
|
|
37
31
|
|
|
38
|
-
|
|
39
|
-
|
|
32
|
+
const appType = "spa-app";
|
|
33
|
+
|
|
34
|
+
const cert = new Certificate(scope, `${props.DNS?.ZoneNameWithoutPeriod}-${appType}-certificate`, {
|
|
35
|
+
domainName: `${props.API.DomainPrefix}.${props.DNS?.ZoneName}`,
|
|
36
|
+
// subjectAlternativeNames: [`${props.API.DomainPrefix}.${props.DNS?.ZoneName}`],
|
|
37
|
+
validation: CertificateValidation.fromDnsMultiZone({
|
|
38
|
+
[`${props.API.DomainPrefix}.${props.DNS?.ZoneName}`]: hostedZone,
|
|
39
|
+
}),
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
return cert;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
generateApiCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: Environment) {
|
|
46
|
+
|
|
47
|
+
const cert = new Certificate(scope, `${props.API.DomainPrefix}-${environmentSuffixForDomain(env)}-certificate`, {
|
|
48
|
+
domainName: `${props.API.DomainPrefix}.${environmentSuffixForDomain(env)}.${props.DNS?.ZoneName}`,
|
|
49
|
+
validation: CertificateValidation.fromDnsMultiZone({
|
|
50
|
+
[`${props.API.DomainPrefix}.${environmentSuffixForDomain(env)}.${props.DNS?.ZoneName}`]: hostedZone
|
|
51
|
+
})
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
return cert;
|
|
55
|
+
}
|
|
40
56
|
}
|
|
@@ -36,7 +36,7 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
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${environmentSuffix(this.env)}`, this.createApiProps(zone));
|
|
39
|
+
const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api${environmentSuffix(this.env)}`, this.createApiProps(this.env, zone));
|
|
40
40
|
|
|
41
41
|
this.createARecord(scope, zone, api);
|
|
42
42
|
|
|
@@ -46,7 +46,7 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
46
46
|
|
|
47
47
|
} else {
|
|
48
48
|
|
|
49
|
-
const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api${environmentSuffix(this.env)}`, this.createApiProps());
|
|
49
|
+
const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api${environmentSuffix(this.env)}`, this.createApiProps(this.env));
|
|
50
50
|
|
|
51
51
|
this.createApiKey(this.config, api);
|
|
52
52
|
|
|
@@ -54,7 +54,7 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
private createApiProps(zone?: IHostedZone): RestApiProps {
|
|
57
|
+
private createApiProps(env: Environment, zone?: IHostedZone,): RestApiProps {
|
|
58
58
|
|
|
59
59
|
if (this.config.DNS) {
|
|
60
60
|
|
|
@@ -64,7 +64,7 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
64
64
|
restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,
|
|
65
65
|
description: this.config.API.Description,
|
|
66
66
|
domainName: {
|
|
67
|
-
domainName: `${this.config.API.DomainPrefix}.${this.config.DNS.ZoneName}`,
|
|
67
|
+
domainName: `${this.config.API.DomainPrefix}.${env}.${this.config.DNS.ZoneName}`,
|
|
68
68
|
certificate: cert.certificate,
|
|
69
69
|
endpointType: EndpointType.EDGE,
|
|
70
70
|
securityPolicy: SecurityPolicy.TLS_1_2
|
|
@@ -141,7 +141,9 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
141
141
|
}
|
|
142
142
|
|
|
143
143
|
private createCertificate(scope: Construct, zone: IHostedZone, config: MicroserviceProps) {
|
|
144
|
-
const cert = new CreateCertificate(scope, config, zone);
|
|
144
|
+
const cert = new CreateCertificate(scope, config, zone, this.env);
|
|
145
|
+
|
|
146
|
+
cert.certificate.applyRemovalPolicy(RemovalPolicy.DESTROY);
|
|
145
147
|
return cert;
|
|
146
148
|
}
|
|
147
149
|
|