@gradientedge/cdk-utils 4.8.0 → 4.9.3

package/dist/src/lib/construct/graphql-api-lambda/main.js

@@ -188,7 +188,14 @@ class GraphQLApiLambda extends common_1.CommonConstruct {
                     stage: this.graphQLApi.deploymentStage,
                 }));
             });
+            return;
         }
+        // add default mapping if apiRootPaths not set
+        new apig.BasePathMapping(this, `${this.id}-base-bath-mapping`, {
+            domainName: this.graphQLApiDomain,
+            restApi: this.graphQLApi,
+            stage: this.graphQLApi.deploymentStage,
+        });
     }
     /**
      * @summary Method to create route53 records for GraphQL API

package/dist/src/lib/construct/graphql-api-lambda-with-cache/main.d.ts

@@ -31,7 +31,6 @@ export declare class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
     graphQLElastiCache: elasticache.CfnCacheCluster;
     graphQLSecurityGroup: ec2.ISecurityGroup;
     securityGroupExportName: string;
-    vpcExportName: string;
     constructor(parent: Construct, id: string, props: GraphQlApiLambdaWithCacheProps);
     protected initResources(): void;
     /**

package/dist/src/lib/construct/graphql-api-lambda-with-cache/main.js

@@ -55,7 +55,6 @@ class GraphQLApiLambdaWithCache extends __1.GraphQLApiLambda {
     graphQLElastiCache;
     graphQLSecurityGroup;
     securityGroupExportName;
-    vpcExportName;
     constructor(parent, id, props) {
         super(parent, id, props);
         this.props = props;
@@ -101,7 +100,7 @@ class GraphQLApiLambdaWithCache extends __1.GraphQLApiLambda {
      * @protected
      */
     createElastiCache() {
-        this.graphQLElastiCache = this.elasticacheManager.createElastiCache(`${this.id}-elasticache`, this, this.props.graphQLElastiCache, this.graphQLVpc.privateSubnets.map(subnet => subnet.subnetId), [this.graphQLSecurityGroup.toString()]);
+        this.graphQLElastiCache = this.elasticacheManager.createElastiCache(`${this.id}-elasticache`, this, this.props.graphQLElastiCache, this.graphQLVpc.privateSubnets.map(subnet => subnet.subnetId), [this.graphQLSecurityGroup.securityGroupId]);
     }
     /**
      * Create Lambda Role

package/dist/src/lib/manager/aws/api-manager.d.ts

@@ -48,9 +48,17 @@ export declare class ApiManager {
      * @param {string} path
      * @param {apig.Integration} integration
      * @param {boolean} addProxy
+     * @param {apig.IAuthorizer} authorizer
      * @param {string[]?} allowedOrigins
      * @param {string[]?} allowedMethods
      * @param {string[]?} allowedHeaders
      */
-    createApiResource(id: string, scope: common.CommonConstruct, parent: apig.IResource, path: string, integration: apig.Integration, addProxy: boolean, allowedOrigins?: string[], allowedMethods?: string[], allowedHeaders?: string[]): apig.Resource;
+    createApiResource(id: string, scope: common.CommonConstruct, parent: apig.IResource, path: string, integration: apig.Integration, addProxy: boolean, authorizer?: apig.IAuthorizer, allowedOrigins?: string[], allowedMethods?: string[], allowedHeaders?: string[]): apig.Resource;
+    /**
+     * @summary Method to create an api deployment
+     * @param {string} id
+     * @param {common.CommonConstruct} scope
+     * @param {apig.IRestApi} restApi
+     */
+    createApiDeployment(id: string, scope: common.CommonConstruct, restApi: apig.IRestApi): void;
 }

package/dist/src/lib/manager/aws/api-manager.js

@@ -115,11 +115,12 @@ class ApiManager {
      * @param {string} path
      * @param {apig.Integration} integration
      * @param {boolean} addProxy
+     * @param {apig.IAuthorizer} authorizer
      * @param {string[]?} allowedOrigins
      * @param {string[]?} allowedMethods
      * @param {string[]?} allowedHeaders
      */
-    createApiResource(id, scope, parent, path, integration, addProxy, allowedOrigins, allowedMethods, allowedHeaders) {
+    createApiResource(id, scope, parent, path, integration, addProxy, authorizer, allowedOrigins, allowedMethods, allowedHeaders) {
         const methods = allowedMethods ?? apig.Cors.ALL_METHODS;
         const resource = parent.addResource(path, {
             defaultCorsPreflightOptions: {
@@ -129,7 +130,7 @@ class ApiManager {
                 allowCredentials: true,
             },
         });
-        methods.forEach(method => resource.addMethod(method, integration));
+        methods.forEach(method => resource.addMethod(method, integration, { authorizer }));
         utils.createCfnOutput(`${id}-${path}ResourceId`, scope, resource.resourceId);
         if (addProxy) {
             const resourceProxy = resource.addResource(`{${path}+}`, {
@@ -140,10 +141,22 @@ class ApiManager {
                     allowCredentials: true,
                 },
             });
-            methods.forEach(method => resourceProxy.addMethod(method, integration));
+            methods.forEach(method => resourceProxy.addMethod(method, integration, { authorizer }));
             utils.createCfnOutput(`${id}-${path}ProxyResourceId`, scope, resourceProxy.resourceId);
         }
         return resource;
     }
+    /**
+     * @summary Method to create an api deployment
+     * @param {string} id
+     * @param {common.CommonConstruct} scope
+     * @param {apig.IRestApi} restApi
+     */
+    createApiDeployment(id, scope, restApi) {
+        new apig.Deployment(scope, `${id}`, {
+            api: restApi,
+            retainDeployments: false,
+        });
+    }
 }
 exports.ApiManager = ApiManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "4.8.0",
+  "version": "4.9.3",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {

package/src/lib/construct/graphql-api-lambda/main.ts

@@ -231,7 +231,15 @@ export class GraphQLApiLambda extends CommonConstruct {
           })
         )
       })
+      return
     }
+
+    // add default mapping if apiRootPaths not set
+    new apig.BasePathMapping(this, `${this.id}-base-bath-mapping`, {
+      domainName: this.graphQLApiDomain,
+      restApi: this.graphQLApi,
+      stage: this.graphQLApi.deploymentStage,
+    })
   }
 
   /**

package/src/lib/construct/graphql-api-lambda-with-cache/main.ts

@@ -38,7 +38,6 @@ export class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
   graphQLElastiCache: elasticache.CfnCacheCluster
   graphQLSecurityGroup: ec2.ISecurityGroup
   securityGroupExportName: string
-  vpcExportName: string
 
   constructor(parent: Construct, id: string, props: GraphQlApiLambdaWithCacheProps) {
     super(parent, id, props)
@@ -99,7 +98,7 @@ export class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
       this,
       this.props.graphQLElastiCache,
       this.graphQLVpc.privateSubnets.map(subnet => subnet.subnetId),
-      [this.graphQLSecurityGroup.toString()]
+      [this.graphQLSecurityGroup.securityGroupId]
     )
   }
 

package/src/lib/manager/aws/api-manager.ts

@@ -108,6 +108,7 @@ export class ApiManager {
    * @param {string} path
    * @param {apig.Integration} integration
    * @param {boolean} addProxy
+   * @param {apig.IAuthorizer} authorizer
    * @param {string[]?} allowedOrigins
    * @param {string[]?} allowedMethods
    * @param {string[]?} allowedHeaders
@@ -119,6 +120,7 @@ export class ApiManager {
     path: string,
     integration: apig.Integration,
     addProxy: boolean,
+    authorizer?: apig.IAuthorizer,
     allowedOrigins?: string[],
     allowedMethods?: string[],
     allowedHeaders?: string[]
@@ -132,7 +134,7 @@ export class ApiManager {
         allowCredentials: true,
       },
     })
-    methods.forEach(method => resource.addMethod(method, integration))
+    methods.forEach(method => resource.addMethod(method, integration, { authorizer }))
     utils.createCfnOutput(`${id}-${path}ResourceId`, scope, resource.resourceId)
 
     if (addProxy) {
@@ -144,10 +146,23 @@ export class ApiManager {
           allowCredentials: true,
         },
       })
-      methods.forEach(method => resourceProxy.addMethod(method, integration))
+      methods.forEach(method => resourceProxy.addMethod(method, integration, { authorizer }))
       utils.createCfnOutput(`${id}-${path}ProxyResourceId`, scope, resourceProxy.resourceId)
     }
 
     return resource
   }
+
+  /**
+   * @summary Method to create an api deployment
+   * @param {string} id
+   * @param {common.CommonConstruct} scope
+   * @param {apig.IRestApi} restApi
+   */
+  public createApiDeployment(id: string, scope: common.CommonConstruct, restApi: apig.IRestApi) {
+    new apig.Deployment(scope, `${id}`, {
+      api: restApi,
+      retainDeployments: false,
+    })
+  }
 }