@sylvesterllc/aws-constructs 1.1.3 → 1.1.4
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/resources/certificate/createCertificate.d.ts +3 -3
- package/dist/resources/certificate/createCertificate.js +4 -4
- package/dist/resources/gateway/createApi.d.ts +2 -1
- package/dist/resources/gateway/createApi.js +10 -8
- package/package.json +1 -1
- package/src/resources/certificate/createCertificate.ts +3 -3
- package/src/resources/gateway/createApi.ts +9 -9
|
@@ -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, env
|
|
8
|
-
generateCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env
|
|
9
|
-
generateApiCertificate(scope: Construct, props: MicroserviceProps, env
|
|
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
|
}
|
|
@@ -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, env
|
|
9
|
+
constructor(scope, props, hostedZone, env) {
|
|
10
10
|
// this.certificate = this.generateCertificate(scope, props, hostedZone);
|
|
11
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, env
|
|
14
|
+
generateCertificate(scope, props, hostedZone, env) {
|
|
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,7 +21,7 @@ class CreateCertificate {
|
|
|
21
21
|
});
|
|
22
22
|
return cert;
|
|
23
23
|
}
|
|
24
|
-
generateApiCertificate(scope, props, env
|
|
24
|
+
generateApiCertificate(scope, props, env) {
|
|
25
25
|
const hostedZone = aws_route53_1.HostedZone.fromHostedZoneId(scope, `${props.API.DomainPrefix}-${env}-${props.DNS?.ZoneName}-hosted-zone`, props.DNS?.ZoneId);
|
|
26
26
|
const domainName = `${props.API.DomainPrefix}.${env}.${props.DNS?.ZoneName}`;
|
|
27
27
|
const cert = new aws_certificatemanager_1.Certificate(scope, `${props.API.DomainPrefix}-${env}-${props.DNS?.ZoneName}-certificate`, {
|
|
@@ -35,4 +35,4 @@ class CreateCertificate {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
exports.CreateCertificate = CreateCertificate;
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQ2VydGlmaWNhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2NlcnRpZmljYXRlL2NyZWF0ZUNlcnRpZmljYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUE0QztBQUM1QywrRUFBK0g7QUFDL0gseURBQWtFO0FBUWxFLE1BQWEsaUJBQWlCO0lBRXJCLFdBQVcsQ0FBZTtJQUVqQyxZQUFZLEtBQWdCLEVBQUUsS0FBd0IsRUFBRSxVQUF1QixFQUFFLEdBQVc7UUFFMUYseUVBQXlFO1FBRXpFLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLHNCQUFzQixDQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFFbEUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxrQkFBa0IsQ0FBQywyQkFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRTdELENBQUM7SUFFRCxtQkFBbUIsQ0FBQyxLQUFnQixFQUFFLEtBQXdCLEVBQUUsVUFBdUIsRUFBRSxHQUFXO1FBRWxHLE1BQU0sYUFBYSxHQUFHLHdCQUFVLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLHVDQUF1QyxFQUM5RixzQkFBc0IsQ0FBQyxDQUFDO1FBRTFCLE1BQU0sSUFBSSxHQUFHLElBQUksb0NBQVcsQ0FBQyxLQUFLLEVBQUUsNEJBQTRCLEVBQUU7WUFDaEUsVUFBVSxFQUFFLDJCQUEyQjtZQUN2QyxVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsb0JBQW9CLENBQUMsRUFBRSxhQUFhO2FBQ3RDLENBQUM7U0FDSCxDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxzQkFBc0IsQ0FBQyxLQUFnQixFQUFFLEtBQXdCLEVBQUUsR0FBVztRQUU1RSxNQUFNLFVBQVUsR0FBRyx3QkFBVSxDQUFDLGdCQUFnQixDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsWUFBWSxJQUFJLEdBQUcsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsY0FBYyxFQUN6SCxLQUFLLENBQUMsR0FBRyxFQUFFLE1BQU8sQ0FBQyxDQUFDO1FBRXRCLE1BQU0sVUFBVSxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxZQUFZLElBQUksR0FBRyxJQUFJLEtBQUssQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFLENBQUM7UUFFN0UsTUFBTSxJQUFJLEdBQUcsSUFBSSxvQ0FBVyxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsWUFBWSxJQUFJLEdBQUcsSUFBSSxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsY0FBYyxFQUFFO1lBQ3pHLGVBQWUsRUFBRSxHQUFHLFVBQVUsY0FBYztZQUM1QyxVQUFVLEVBQUUsVUFBVTtZQUN0QixVQUFVLEVBQUUsOENBQXFCLENBQUMsZ0JBQWdCLENBQUM7Z0JBQ2pELENBQUMsR0FBRyxHQUFHLElBQUksS0FBSyxDQUFDLEdBQUcsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFFLFVBQVU7YUFFOUMsQ0FBQztTQUNILENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztDQUNGO0FBOUNELDhDQThDQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IENlcnRpZmljYXRlLCBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24sIERuc1ZhbGlkYXRlZENlcnRpZmljYXRlLCBJQ2VydGlmaWNhdGUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWNlcnRpZmljYXRlbWFuYWdlclwiO1xuaW1wb3J0IHsgSG9zdGVkWm9uZSwgSUhvc3RlZFpvbmUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLXJvdXRlNTNcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBNaWNyb3NlcnZpY2VQcm9wcyB9IGZyb20gXCIuLi8uLi9pbnRlcmZhY2VzL01pY3Jvc2VydmljZVByb3BzXCI7XG5pbXBvcnQgeyBlbnZpcm9ubWVudFN1ZmZpeEZvckRvbWFpbiB9IGZyb20gXCIuLi8uLi9oZWxwZXJzL3V0aWwtaGVscGVyXCI7XG5pbXBvcnQgeyBFbnZpcm9ubWVudCB9IGZyb20gXCIuLi8uLi9jb25maWcvRW52aXJvbm1lbnRzXCI7XG5pbXBvcnQgeyBlbnYgfSBmcm9tIFwicHJvY2Vzc1wiO1xuXG5cbmV4cG9ydCBjbGFzcyBDcmVhdGVDZXJ0aWZpY2F0ZSB7XG5cbiAgcHVibGljIGNlcnRpZmljYXRlOiBJQ2VydGlmaWNhdGU7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IE1pY3Jvc2VydmljZVByb3BzLCBob3N0ZWRab25lOiBJSG9zdGVkWm9uZSwgZW52OiBzdHJpbmcpIHtcblxuICAgIC8vIHRoaXMuY2VydGlmaWNhdGUgPSB0aGlzLmdlbmVyYXRlQ2VydGlmaWNhdGUoc2NvcGUsIHByb3BzLCBob3N0ZWRab25lKTtcblxuICAgIHRoaXMuY2VydGlmaWNhdGUgPSB0aGlzLmdlbmVyYXRlQXBpQ2VydGlmaWNhdGUoc2NvcGUsIHByb3BzLCBlbnYpO1xuXG4gICAgdGhpcy5jZXJ0aWZpY2F0ZS5hcHBseVJlbW92YWxQb2xpY3koUmVtb3ZhbFBvbGljeS5ERVNUUk9ZKTtcblxuICB9XG5cbiAgZ2VuZXJhdGVDZXJ0aWZpY2F0ZShzY29wZTogQ29uc3RydWN0LCBwcm9wczogTWljcm9zZXJ2aWNlUHJvcHMsIGhvc3RlZFpvbmU6IElIb3N0ZWRab25lLCBlbnY6IHN0cmluZykge1xuXG4gICAgY29uc3QgZGV2SG9zdGVkWm9uZSA9IEhvc3RlZFpvbmUuZnJvbUhvc3RlZFpvbmVJZChzY29wZSwgYGFwaS5jMS5kZXYuY29udmVyZ2VvbmUuaW8taG9zdGVkLXpvbmVgLFxuICAgICAgJ1owNTA4ODM0UThFNFRXRlZHOTkwJyk7XG5cbiAgICBjb25zdCBjZXJ0ID0gbmV3IENlcnRpZmljYXRlKHNjb3BlLCBgYXBpLWMxLWRldi1hcGktY2VydGlmaWNhdGVgLCB7XG4gICAgICBkb21haW5OYW1lOiBgYzEuYXBpLmRldi5jb252ZXJnZW9uZS5pb2AsXG4gICAgICB2YWxpZGF0aW9uOiBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24uZnJvbURuc011bHRpWm9uZSh7XG4gICAgICAgIFtgZGV2LmNvbnZlcmdlb25lLmlvYF06IGRldkhvc3RlZFpvbmVcbiAgICAgIH0pXG4gICAgfSk7XG4gICAgcmV0dXJuIGNlcnQ7XG4gIH1cblxuICBnZW5lcmF0ZUFwaUNlcnRpZmljYXRlKHNjb3BlOiBDb25zdHJ1Y3QsIHByb3BzOiBNaWNyb3NlcnZpY2VQcm9wcywgZW52OiBzdHJpbmcpIHtcblxuICAgIGNvbnN0IGhvc3RlZFpvbmUgPSBIb3N0ZWRab25lLmZyb21Ib3N0ZWRab25lSWQoc2NvcGUsIGAke3Byb3BzLkFQSS5Eb21haW5QcmVmaXh9LSR7ZW52fS0ke3Byb3BzLkROUz8uWm9uZU5hbWV9LWhvc3RlZC16b25lYCxcbiAgICAgIHByb3BzLkROUz8uWm9uZUlkISk7XG5cbiAgICBjb25zdCBkb21haW5OYW1lID0gYCR7cHJvcHMuQVBJLkRvbWFpblByZWZpeH0uJHtlbnZ9LiR7cHJvcHMuRE5TPy5ab25lTmFtZX1gO1xuXG4gICAgY29uc3QgY2VydCA9IG5ldyBDZXJ0aWZpY2F0ZShzY29wZSwgYCR7cHJvcHMuQVBJLkRvbWFpblByZWZpeH0tJHtlbnZ9LSR7cHJvcHMuRE5TPy5ab25lTmFtZX0tY2VydGlmaWNhdGVgLCB7XG4gICAgICBjZXJ0aWZpY2F0ZU5hbWU6IGAke2RvbWFpbk5hbWV9LWNlcnRpZmljYXRlYCxcbiAgICAgIGRvbWFpbk5hbWU6IGRvbWFpbk5hbWUsXG4gICAgICB2YWxpZGF0aW9uOiBDZXJ0aWZpY2F0ZVZhbGlkYXRpb24uZnJvbURuc011bHRpWm9uZSh7XG4gICAgICAgIFtgJHtlbnZ9LiR7cHJvcHMuRE5TPy5ab25lTmFtZX1gXTogaG9zdGVkWm9uZVxuXG4gICAgICB9KVxuICAgIH0pO1xuXG4gICAgcmV0dXJuIGNlcnQ7XG4gIH1cbn0iXX0=
|
|
@@ -3,9 +3,10 @@ import { Construct } from "constructs";
|
|
|
3
3
|
import { AppConfig } from "../../config/AppConfig";
|
|
4
4
|
import { BaseResource } from "../base/baseResource";
|
|
5
5
|
export declare class Api extends BaseResource<IRestApi> {
|
|
6
|
+
private env;
|
|
6
7
|
private corsOptions;
|
|
7
8
|
get APIs(): IRestApi[];
|
|
8
|
-
constructor(scope: Construct, config: AppConfig, env
|
|
9
|
+
constructor(scope: Construct, config: AppConfig, env: string);
|
|
9
10
|
private createApi;
|
|
10
11
|
private createApiProps;
|
|
11
12
|
private createDefaultCorsOptions;
|
|
@@ -9,32 +9,34 @@ const baseResource_1 = require("../base/baseResource");
|
|
|
9
9
|
const createCertificate_1 = require("../certificate/createCertificate");
|
|
10
10
|
const createApiKey_1 = require("./createApiKey");
|
|
11
11
|
class Api extends baseResource_1.BaseResource {
|
|
12
|
+
env;
|
|
12
13
|
corsOptions;
|
|
13
14
|
get APIs() {
|
|
14
15
|
return this.createdResources;
|
|
15
16
|
}
|
|
16
|
-
constructor(scope, config, env
|
|
17
|
+
constructor(scope, config, env) {
|
|
17
18
|
super(scope, config);
|
|
19
|
+
this.env = env;
|
|
18
20
|
this.corsOptions = this.createDefaultCorsOptions();
|
|
19
21
|
this.createdResources = this.createResource(scope);
|
|
20
22
|
}
|
|
21
|
-
createApi(scope, env
|
|
23
|
+
createApi(scope, env) {
|
|
22
24
|
if (this.config.DNS) {
|
|
23
25
|
// console.log('### DNS is true ###');
|
|
24
26
|
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(
|
|
27
|
+
const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(env, zone));
|
|
26
28
|
this.createARecord(scope, zone, api);
|
|
27
29
|
// this.createCnameRecord(scope, zone, api, this.config);
|
|
28
30
|
this.createApiKey(this.config, api);
|
|
29
31
|
return api;
|
|
30
32
|
}
|
|
31
33
|
else {
|
|
32
|
-
const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api-without-DNS`, this.createApiProps());
|
|
34
|
+
const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api-without-DNS`, this.createApiProps(env));
|
|
33
35
|
this.createApiKey(this.config, api);
|
|
34
36
|
return api;
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
|
-
createApiProps(
|
|
39
|
+
createApiProps(env, zone) {
|
|
38
40
|
if (this.config.DNS) {
|
|
39
41
|
const cert = this.createCertificate(this.scope, zone, this.config, env);
|
|
40
42
|
const props = {
|
|
@@ -87,7 +89,7 @@ class Api extends baseResource_1.BaseResource {
|
|
|
87
89
|
hostedZoneId: config.DNS?.ZoneId
|
|
88
90
|
});
|
|
89
91
|
}
|
|
90
|
-
createCertificate(scope, zone, config, env
|
|
92
|
+
createCertificate(scope, zone, config, env) {
|
|
91
93
|
const cert = new createCertificate_1.CreateCertificate(scope, config, zone, env);
|
|
92
94
|
cert.certificate.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
|
|
93
95
|
return cert;
|
|
@@ -110,7 +112,7 @@ class Api extends baseResource_1.BaseResource {
|
|
|
110
112
|
return record;
|
|
111
113
|
}
|
|
112
114
|
createResource(scope) {
|
|
113
|
-
const api = this.createApi(scope);
|
|
115
|
+
const api = this.createApi(scope, this.env);
|
|
114
116
|
// TODO: ONLY IF CUSTOM MAPPING IS REQUIRED
|
|
115
117
|
// const domain = this.createCustomDomain(scope, this.config);
|
|
116
118
|
// const mapping = this.attachDomainToApi(scope, api, domain, this.config);
|
|
@@ -126,4 +128,4 @@ class Api extends baseResource_1.BaseResource {
|
|
|
126
128
|
}
|
|
127
129
|
}
|
|
128
130
|
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, 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}"]}
|
|
131
|
+
//# 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\";\n\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: string) {\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) {\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(env, 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(env));\n\n            this.createApiKey(this.config, api);\n\n            return api;\n        }\n    }\n\n    private createApiProps(env: string, zone?: IHostedZone,): 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,\n        env: string) {\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, this.env);\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
|
@@ -12,7 +12,7 @@ export class CreateCertificate {
|
|
|
12
12
|
|
|
13
13
|
public certificate: ICertificate;
|
|
14
14
|
|
|
15
|
-
constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: string
|
|
15
|
+
constructor(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: string) {
|
|
16
16
|
|
|
17
17
|
// this.certificate = this.generateCertificate(scope, props, hostedZone);
|
|
18
18
|
|
|
@@ -22,7 +22,7 @@ export class CreateCertificate {
|
|
|
22
22
|
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
generateCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: string
|
|
25
|
+
generateCertificate(scope: Construct, props: MicroserviceProps, hostedZone: IHostedZone, env: string) {
|
|
26
26
|
|
|
27
27
|
const devHostedZone = HostedZone.fromHostedZoneId(scope, `api.c1.dev.convergeone.io-hosted-zone`,
|
|
28
28
|
'Z0508834Q8E4TWFVG990');
|
|
@@ -36,7 +36,7 @@ export class CreateCertificate {
|
|
|
36
36
|
return cert;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
generateApiCertificate(scope: Construct, props: MicroserviceProps, env: string
|
|
39
|
+
generateApiCertificate(scope: Construct, props: MicroserviceProps, env: string) {
|
|
40
40
|
|
|
41
41
|
const hostedZone = HostedZone.fromHostedZoneId(scope, `${props.API.DomainPrefix}-${env}-${props.DNS?.ZoneName}-hosted-zone`,
|
|
42
42
|
props.DNS?.ZoneId!);
|
|
@@ -9,8 +9,7 @@ import { MicroserviceProps } from "../../interfaces/MicroserviceProps";
|
|
|
9
9
|
import { BaseResource } from "../base/baseResource";
|
|
10
10
|
import { CreateCertificate } from "../certificate/createCertificate";
|
|
11
11
|
import { TsgApiKey } from "./createApiKey";
|
|
12
|
-
|
|
13
|
-
import { environmentSuffix } from "../../helpers/util-helper";
|
|
12
|
+
|
|
14
13
|
|
|
15
14
|
export class Api extends BaseResource<IRestApi> {
|
|
16
15
|
|
|
@@ -21,7 +20,7 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
21
20
|
return this.createdResources;
|
|
22
21
|
}
|
|
23
22
|
|
|
24
|
-
constructor(scope: Construct, config: AppConfig, env: string
|
|
23
|
+
constructor(scope: Construct, config: AppConfig, private env: string) {
|
|
25
24
|
super(scope, config);
|
|
26
25
|
|
|
27
26
|
this.corsOptions = this.createDefaultCorsOptions();
|
|
@@ -29,14 +28,14 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
29
28
|
this.createdResources = this.createResource(scope);
|
|
30
29
|
}
|
|
31
30
|
|
|
32
|
-
private createApi(scope: Construct, env: string
|
|
31
|
+
private createApi(scope: Construct, env: string) {
|
|
33
32
|
if (this.config.DNS) {
|
|
34
33
|
|
|
35
34
|
// console.log('### DNS is true ###');
|
|
36
35
|
|
|
37
36
|
const zone = this.getZone(this.scope, this.config);
|
|
38
37
|
|
|
39
|
-
const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(
|
|
38
|
+
const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(env, zone));
|
|
40
39
|
|
|
41
40
|
this.createARecord(scope, zone, api);
|
|
42
41
|
|
|
@@ -48,7 +47,7 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
48
47
|
|
|
49
48
|
} else {
|
|
50
49
|
|
|
51
|
-
const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api-without-DNS`, this.createApiProps());
|
|
50
|
+
const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api-without-DNS`, this.createApiProps(env));
|
|
52
51
|
|
|
53
52
|
this.createApiKey(this.config, api);
|
|
54
53
|
|
|
@@ -56,7 +55,7 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
56
55
|
}
|
|
57
56
|
}
|
|
58
57
|
|
|
59
|
-
private createApiProps(
|
|
58
|
+
private createApiProps(env: string, zone?: IHostedZone,): RestApiProps {
|
|
60
59
|
|
|
61
60
|
if (this.config.DNS) {
|
|
62
61
|
|
|
@@ -121,7 +120,8 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
121
120
|
});
|
|
122
121
|
}
|
|
123
122
|
|
|
124
|
-
private createCertificate(scope: Construct, zone: IHostedZone, config: MicroserviceProps,
|
|
123
|
+
private createCertificate(scope: Construct, zone: IHostedZone, config: MicroserviceProps,
|
|
124
|
+
env: string) {
|
|
125
125
|
const cert = new CreateCertificate(scope, config, zone, env);
|
|
126
126
|
|
|
127
127
|
cert.certificate.applyRemovalPolicy(RemovalPolicy.DESTROY);
|
|
@@ -150,7 +150,7 @@ export class Api extends BaseResource<IRestApi> {
|
|
|
150
150
|
|
|
151
151
|
protected createResource(scope: Construct) {
|
|
152
152
|
|
|
153
|
-
const api = this.createApi(scope);
|
|
153
|
+
const api = this.createApi(scope, this.env);
|
|
154
154
|
// TODO: ONLY IF CUSTOM MAPPING IS REQUIRED
|
|
155
155
|
// const domain = this.createCustomDomain(scope, this.config);
|
|
156
156
|
|