@sylvesterllc/aws-constructs 1.0.119 → 1.1.0

package/dist/resources/gateway/createApi.d.ts

@@ -14,6 +14,7 @@ export declare class Api extends BaseResource<IRestApi> {
     private getZone;
     private createCertificate;
     private createARecord;
+    private createCnameRecord;
     protected createResource(scope: Construct): RestApi[];
     protected createOutput<T>(scope: Construct, createdAssets: T[]): void;
 }

package/dist/resources/gateway/createApi.js

@@ -23,7 +23,8 @@ class Api extends baseResource_1.BaseResource {
             // console.log('### DNS is true ###');
             const zone = this.getZone(this.scope, this.config);
             const api = new aws_apigateway_1.RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));
-            this.createARecord(scope, zone, api);
+            // this.createARecord(scope, zone, api);
+            this.createCnameRecord(scope, zone, api, this.config);
             this.createApiKey(this.config, api);
             return api;
         }
@@ -42,14 +43,9 @@ class Api extends baseResource_1.BaseResource {
                 domainName: {
                     domainName: `${this.config.DNS.SubDomainNameForApi}.${this.config.DNS.SubDomainName}`,
                     certificate: cert.certificate,
-                    endpointType: aws_apigateway_1.EndpointType.EDGE,
+                    endpointType: aws_apigateway_1.EndpointType.REGIONAL,
                     securityPolicy: aws_apigateway_1.SecurityPolicy.TLS_1_2
                 },
-                // TODO:  ADD CUSTOM DOMAIN HERE
-                // defaultDomainMapping: {
-                //     domainName: domain,            
-                //   },
-                // domainName: '',
                 defaultCorsPreflightOptions: this.corsOptions
             };
             return props;
@@ -85,20 +81,6 @@ class Api extends baseResource_1.BaseResource {
         }
         return null;
     }
-    // private createCustomDomain(scope: Construct, config: MicroserviceProps) {
-    //     const domainName = DomainName.fromDomainNameAttributes(scope, `${config.API.Name}-custom-domain`, {
-    //         domainName: config.DNS?.ZoneName,
-    //         domainNameAliasHostedZoneId: config.DNS.ZoneId!,
-    //         domainNameAliasTarget: config.API.DomainPrefix!,
-    //     });
-    //     return domainName
-    // }
-    // private attachDomainToApi(scope: Construct, api: IRestApi, domain: IDomainName, config: MicroserviceProps) {
-    //     return new BasePathMapping(scope, `${config.API.Name}-basePathMapping`, {
-    //         domainName: domain,
-    //         restApi: api,
-    //     });
-    // }
     getZone(scope, config) {
         return aws_route53_1.HostedZone.fromHostedZoneAttributes(scope, `${config.DNS?.ZoneName}-zone`, {
             zoneName: config.DNS?.ZoneName,
@@ -119,6 +101,14 @@ class Api extends baseResource_1.BaseResource {
         aRecord.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
         return aRecord;
     }
+    createCnameRecord(scope, zone, api, config) {
+        const record = new aws_route53_1.CnameRecord(scope, "api-cname-record", {
+            zone,
+            domainName: api.url,
+            recordName: `${config?.DNS?.SubDomainNameForApi}.${config?.DNS?.SubDomainName}`
+        });
+        return record;
+    }
     createResource(scope) {
         const api = this.createApi(scope);
         // TODO:  ONLY IF CUSTOM MAPPING IS REQUIRED
@@ -136,4 +126,4 @@ class Api extends baseResource_1.BaseResource {
     }
 }
 exports.Api = Api;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createApi.js","sourceRoot":"","sources":["../../../src/resources/gateway/createApi.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, RemovalPolicy, Tag } from \"aws-cdk-lib\";\nimport { BasePathMapping, Cors, CorsOptions, DomainName, EndpointType, IDomainName, IRestApi, MethodOptions, RestApi, RestApiProps, SecurityPolicy } from \"aws-cdk-lib/aws-apigateway\";\nimport { ARecord, HostedZone, IHostedZone, RecordTarget } from \"aws-cdk-lib/aws-route53\";\nimport { ApiGateway, ApiGatewayDomain } from \"aws-cdk-lib/aws-route53-targets\";\nimport { Construct } from \"constructs\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { MicroserviceProps } from \"../../interfaces/MicroserviceProps\";\n\nimport { BaseResource } from \"../base/baseResource\";\nimport { CreateCertificate } from \"../certificate/createCertificate\";\nimport { TsgApiKey } from \"./createApiKey\";\nimport { Environment } from \"../../config/Environments\";\nimport { environmentSuffix } from \"../../helpers/util-helper\";\n\nexport class Api extends BaseResource<IRestApi> {\n\n    private corsOptions: CorsOptions;\n\n\n    get APIs() {\n        return this.createdResources;\n    }\n\n    constructor(scope: Construct, config: AppConfig) {\n        super(scope, config);\n\n        this.corsOptions = this.createDefaultCorsOptions();\n\n        this.createdResources = this.createResource(scope);\n    }\n\n    private createApi(scope: Construct) {\n        if (this.config.DNS) {\n\n            // console.log('### DNS is true ###');\n\n            const zone = this.getZone(this.scope, this.config);\n\n            const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));\n\n            this.createARecord(scope, zone, api);\n\n            this.createApiKey(this.config, api);\n\n            return api;\n\n        } else {\n\n            const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api-without-DNS`, this.createApiProps());\n\n            this.createApiKey(this.config, api);\n\n            return api;\n        }\n    }\n\n    private createApiProps(zone?: IHostedZone): RestApiProps {\n\n        if (this.config.DNS) {\n\n            const cert = this.createCertificate(this.scope, zone!, this.config);\n\n            const props: RestApiProps = {\n                restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,\n                description: this.config.API.Description,\n                domainName: {\n                    domainName: `${this.config.DNS.SubDomainNameForApi}.${this.config.DNS.SubDomainName}`,\n                    certificate: cert.certificate,\n                    endpointType: EndpointType.EDGE,\n                    securityPolicy: SecurityPolicy.TLS_1_2\n                },\n                // TODO:  ADD CUSTOM DOMAIN HERE\n                // defaultDomainMapping: {\n                //     domainName: domain,            \n                //   },\n                // domainName: '',\n                defaultCorsPreflightOptions: this.corsOptions\n            };\n\n            return props;\n        } else {\n            const props: RestApiProps = {\n                restApiName: `${this.config.AppPrefix}-${this.config.API.Name}`,\n                description: this.config.API.Description,\n                defaultCorsPreflightOptions: this.corsOptions\n            };\n\n            return props;\n        }\n    }\n\n    private createDefaultCorsOptions() {\n\n        const corsOptions: CorsOptions = {\n            allowHeaders: [\n                '*',\n            ],\n            allowMethods: Cors.ALL_METHODS,\n            allowCredentials: true,\n            allowOrigins: Cors.ALL_ORIGINS,\n        };\n\n        return corsOptions;\n    }\n\n    private requiresApiKey(config: AppConfig) {\n        // Determine if any of the lambdas require an API Key\n        return config.RESOURCES.LAMBDA.some((lambda) => lambda.apiGateway?.requireApiKey === true);\n    }\n\n    private createApiKey(config: AppConfig, api: RestApi) {\n\n        if (this.requiresApiKey(this.config)) {\n            const apiKey = new TsgApiKey(this.scope, this.config, api)\n            return apiKey;\n        }\n        return null;\n    }\n    // private createCustomDomain(scope: Construct, config: MicroserviceProps) {\n    //     const domainName = DomainName.fromDomainNameAttributes(scope, `${config.API.Name}-custom-domain`, {\n    //         domainName: config.DNS?.ZoneName,\n    //         domainNameAliasHostedZoneId: config.DNS.ZoneId!,\n    //         domainNameAliasTarget: config.API.DomainPrefix!,\n    //     });\n\n    //     return domainName\n    // }\n\n    // private attachDomainToApi(scope: Construct, api: IRestApi, domain: IDomainName, config: MicroserviceProps) {\n    //     return new BasePathMapping(scope, `${config.API.Name}-basePathMapping`, {\n    //         domainName: domain,\n    //         restApi: api,\n    //     });\n    // }\n\n    private getZone(scope: Construct, config: MicroserviceProps) {\n        return HostedZone.fromHostedZoneAttributes(scope, `${config.DNS?.ZoneName}-zone`, {\n            zoneName: config.DNS?.ZoneName!,\n            hostedZoneId: config.DNS?.ZoneId!\n        });\n    }\n\n    private createCertificate(scope: Construct, zone: IHostedZone, config: MicroserviceProps) {\n        const cert = new CreateCertificate(scope, config, zone);\n\n        cert.certificate.applyRemovalPolicy(RemovalPolicy.DESTROY);\n        return cert;\n    }\n\n    private createARecord(scope: Construct, zone: IHostedZone, api: RestApi) {\n        const aRecord = new ARecord(scope, \"ApiRecord\", {\n            zone,\n            target: RecordTarget.fromAlias(new ApiGateway(api)),\n            recordName: this.config.API.DomainPrefix\n        });\n\n        aRecord.applyRemovalPolicy(RemovalPolicy.DESTROY);\n        return aRecord;\n    }\n\n    protected createResource(scope: Construct) {\n\n        const api = this.createApi(scope);\n        // TODO:  ONLY IF CUSTOM MAPPING IS REQUIRED\n        // const domain = this.createCustomDomain(scope, this.config);\n\n        // const mapping = this.attachDomainToApi(scope, api, domain, this.config);\n\n\n\n        return [api];\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        createdAssets.forEach((api, idx) => {\n\n            new CfnOutput(scope, `api${idx}`, {\n                // @ts-ignore\n                value: api.url\n            });\n        });\n    }\n\n}"]}
+//# 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}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sylvesterllc/aws-constructs",
-  "version": "1.0.119",
+  "version": "1.1.0",
   "description": "AWS Constructs",
   "main": "dist/index.js",
   "keywords": [

package/src/resources/gateway/createApi.ts

@@ -1,6 +1,6 @@
 import { CfnOutput, RemovalPolicy, Tag } from "aws-cdk-lib";
 import { BasePathMapping, Cors, CorsOptions, DomainName, EndpointType, IDomainName, IRestApi, MethodOptions, RestApi, RestApiProps, SecurityPolicy } from "aws-cdk-lib/aws-apigateway";
-import { ARecord, HostedZone, IHostedZone, RecordTarget } from "aws-cdk-lib/aws-route53";
+import { ARecord, CnameRecord, HostedZone, IHostedZone, RecordTarget } from "aws-cdk-lib/aws-route53";
 import { ApiGateway, ApiGatewayDomain } from "aws-cdk-lib/aws-route53-targets";
 import { Construct } from "constructs";
 import { AppConfig } from "../../config/AppConfig";
@@ -38,7 +38,9 @@ export class Api extends BaseResource<IRestApi> {
 
             const api = new RestApi(this.scope, `${this.config.AppPrefix}-rest-api`, this.createApiProps(zone));
 
-            this.createARecord(scope, zone, api);
+            // this.createARecord(scope, zone, api);
+
+            this.createCnameRecord(scope, zone, api, this.config);
 
             this.createApiKey(this.config, api);
 
@@ -66,14 +68,9 @@ export class Api extends BaseResource<IRestApi> {
                 domainName: {
                     domainName: `${this.config.DNS.SubDomainNameForApi}.${this.config.DNS.SubDomainName}`,
                     certificate: cert.certificate,
-                    endpointType: EndpointType.EDGE,
+                    endpointType: EndpointType.REGIONAL,
                     securityPolicy: SecurityPolicy.TLS_1_2
                 },
-                // TODO:  ADD CUSTOM DOMAIN HERE
-                // defaultDomainMapping: {
-                //     domainName: domain,            
-                //   },
-                // domainName: '',
                 defaultCorsPreflightOptions: this.corsOptions
             };
 
@@ -116,22 +113,6 @@ export class Api extends BaseResource<IRestApi> {
         }
         return null;
     }
-    // private createCustomDomain(scope: Construct, config: MicroserviceProps) {
-    //     const domainName = DomainName.fromDomainNameAttributes(scope, `${config.API.Name}-custom-domain`, {
-    //         domainName: config.DNS?.ZoneName,
-    //         domainNameAliasHostedZoneId: config.DNS.ZoneId!,
-    //         domainNameAliasTarget: config.API.DomainPrefix!,
-    //     });
-
-    //     return domainName
-    // }
-
-    // private attachDomainToApi(scope: Construct, api: IRestApi, domain: IDomainName, config: MicroserviceProps) {
-    //     return new BasePathMapping(scope, `${config.API.Name}-basePathMapping`, {
-    //         domainName: domain,
-    //         restApi: api,
-    //     });
-    // }
 
     private getZone(scope: Construct, config: MicroserviceProps) {
         return HostedZone.fromHostedZoneAttributes(scope, `${config.DNS?.ZoneName}-zone`, {
@@ -158,6 +139,15 @@ export class Api extends BaseResource<IRestApi> {
         return aRecord;
     }
 
+    private createCnameRecord(scope: Construct, zone: IHostedZone, api: RestApi, config: AppConfig) {
+        const record = new CnameRecord(scope, "api-cname-record", {
+            zone,
+            domainName: api.url!,
+            recordName: `${config?.DNS?.SubDomainNameForApi}.${config?.DNS?.SubDomainName}`
+        });
+        return record;
+    }
+
     protected createResource(scope: Construct) {
 
         const api = this.createApi(scope);