@gradientedge/cdk-utils 4.7.1 → 4.9.2

package/app/api-destined-function/layers/nodejs/node_modules/.yarn-integrity

@@ -23,7 +23,7 @@
     "glob@^7.1.3": "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023",
     "inflight@^1.0.4": "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9",
     "inherits@2": "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c",
-    "minimatch@^3.0.4": "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.1.tgz#879ad447200773912898b46cd516a7abbb5e50b0",
+    "minimatch@^3.0.4": "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b",
     "mkdirp@^1.0.4": "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e",
     "once@^1.3.0": "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1",
     "path-is-absolute@^1.0.0": "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f",

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

@@ -30,7 +30,6 @@ export declare class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
     graphQLVpc: ec2.IVpc;
     graphQLElastiCache: elasticache.CfnCacheCluster;
     graphQLSecurityGroup: ec2.ISecurityGroup;
-    securityGroupStackName: string;
     securityGroupExportName: string;
     vpcExportName: string;
     constructor(parent: Construct, id: string, props: GraphQlApiLambdaWithCacheProps);

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

@@ -54,7 +54,6 @@ class GraphQLApiLambdaWithCache extends __1.GraphQLApiLambda {
     graphQLVpc;
     graphQLElastiCache;
     graphQLSecurityGroup;
-    securityGroupStackName;
     securityGroupExportName;
     vpcExportName;
     constructor(parent, id, props) {
@@ -73,8 +72,8 @@ class GraphQLApiLambdaWithCache extends __1.GraphQLApiLambda {
      * @protected
      */
     setVpc() {
-        if (this.props.vpcExportName) {
-            this.graphQLVpc = this.vpcManager.retrieveCommonVpc(`${this.id}`, this, this.props.vpcExportName);
+        if (this.props.useExistingVpc) {
+            this.graphQLVpc = this.vpcManager.retrieveCommonVpc(`${this.id}`, this, this.props.vpcName);
         }
         else {
             this.graphQLVpc = this.vpcManager.createCommonVpc(this, this.props.graphQLVpc, this.props.graphQLVpc.vpcName);

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

@@ -40,4 +40,25 @@ export declare class ApiManager {
      * @param certificate the certificate used for custom restApi domain
      */
     createApiDomain(id: string, scope: common.CommonConstruct, domainName: string, certificate: acm.ICertificate): apig.DomainName;
+    /**
+     * @summary Method to create an API gateway resource
+     * @param {string} id
+     * @param {common.CommonConstruct} scope
+     * @param {apig.IResource} parent
+     * @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, 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

@@ -84,7 +84,7 @@ class ApiManager {
             restApiName: `${props.restApiName}-${scope.props.stage}`,
             handler: lambdaFunction,
             defaultCorsPreflightOptions: props.defaultCorsPreflightOptions,
-            proxy: props.proxy || true,
+            proxy: props.proxy ?? true,
         });
         utils.createCfnOutput(`${id}-restApiId`, scope, api.restApiId);
         utils.createCfnOutput(`${id}-restApiName`, scope, api.restApiName);
@@ -107,5 +107,56 @@ class ApiManager {
         utils.createCfnOutput(`${id}-customDomainName`, scope, apiDomain.domainName);
         return apiDomain;
     }
+    /**
+     * @summary Method to create an API gateway resource
+     * @param {string} id
+     * @param {common.CommonConstruct} scope
+     * @param {apig.IResource} parent
+     * @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, authorizer, allowedOrigins, allowedMethods, allowedHeaders) {
+        const methods = allowedMethods ?? apig.Cors.ALL_METHODS;
+        const resource = parent.addResource(path, {
+            defaultCorsPreflightOptions: {
+                allowOrigins: allowedOrigins ?? apig.Cors.ALL_ORIGINS,
+                allowMethods: [...methods, 'OPTIONS'],
+                allowHeaders: allowedHeaders ?? apig.Cors.DEFAULT_HEADERS,
+                allowCredentials: true,
+            },
+        });
+        methods.forEach(method => resource.addMethod(method, integration, { authorizer }));
+        utils.createCfnOutput(`${id}-${path}ResourceId`, scope, resource.resourceId);
+        if (addProxy) {
+            const resourceProxy = resource.addResource(`{${path}+}`, {
+                defaultCorsPreflightOptions: {
+                    allowOrigins: allowedOrigins ?? apig.Cors.ALL_ORIGINS,
+                    allowMethods: [...methods, 'OPTIONS'],
+                    allowHeaders: allowedHeaders ?? apig.Cors.DEFAULT_HEADERS,
+                    allowCredentials: true,
+                },
+            });
+            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/dist/src/lib/types/aws/index.d.ts

@@ -152,7 +152,8 @@ export interface GraphQlApiLambdaWithCacheProps extends GraphQlApiLambdaProps {
     graphQLVpc: ec2.VpcProps;
     graphQLElastiCache: ElastiCacheProps;
     securityGroupExportName: string;
-    vpcExportName: string;
+    useExistingVpc: boolean;
+    vpcName?: string;
 }
 /**
  * @category cdk-utils.api-to-eventbridge-target

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "4.7.1",
+  "version": "4.9.2",
   "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

@@ -37,7 +37,6 @@ export class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
   graphQLVpc: ec2.IVpc
   graphQLElastiCache: elasticache.CfnCacheCluster
   graphQLSecurityGroup: ec2.ISecurityGroup
-  securityGroupStackName: string
   securityGroupExportName: string
   vpcExportName: string
 
@@ -60,8 +59,8 @@ export class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
    * @protected
    */
   protected setVpc() {
-    if (this.props.vpcExportName) {
-      this.graphQLVpc = this.vpcManager.retrieveCommonVpc(`${this.id}`, this, this.props.vpcExportName)
+    if (this.props.useExistingVpc) {
+      this.graphQLVpc = this.vpcManager.retrieveCommonVpc(`${this.id}`, this, this.props.vpcName)
     } else {
       this.graphQLVpc = this.vpcManager.createCommonVpc(this, this.props.graphQLVpc, this.props.graphQLVpc.vpcName)
     }

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

@@ -71,7 +71,7 @@ export class ApiManager {
       restApiName: `${props.restApiName}-${scope.props.stage}`,
       handler: lambdaFunction,
       defaultCorsPreflightOptions: props.defaultCorsPreflightOptions,
-      proxy: props.proxy || true,
+      proxy: props.proxy ?? true,
     })
 
     utils.createCfnOutput(`${id}-restApiId`, scope, api.restApiId)
@@ -99,4 +99,70 @@ export class ApiManager {
 
     return apiDomain
   }
+
+  /**
+   * @summary Method to create an API gateway resource
+   * @param {string} id
+   * @param {common.CommonConstruct} scope
+   * @param {apig.IResource} parent
+   * @param {string} path
+   * @param {apig.Integration} integration
+   * @param {boolean} addProxy
+   * @param {apig.IAuthorizer} authorizer
+   * @param {string[]?} allowedOrigins
+   * @param {string[]?} allowedMethods
+   * @param {string[]?} allowedHeaders
+   */
+  public 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[]
+  ) {
+    const methods = allowedMethods ?? apig.Cors.ALL_METHODS
+    const resource = parent.addResource(path, {
+      defaultCorsPreflightOptions: {
+        allowOrigins: allowedOrigins ?? apig.Cors.ALL_ORIGINS,
+        allowMethods: [...methods, 'OPTIONS'],
+        allowHeaders: allowedHeaders ?? apig.Cors.DEFAULT_HEADERS,
+        allowCredentials: true,
+      },
+    })
+    methods.forEach(method => resource.addMethod(method, integration, { authorizer }))
+    utils.createCfnOutput(`${id}-${path}ResourceId`, scope, resource.resourceId)
+
+    if (addProxy) {
+      const resourceProxy = resource.addResource(`{${path}+}`, {
+        defaultCorsPreflightOptions: {
+          allowOrigins: allowedOrigins ?? apig.Cors.ALL_ORIGINS,
+          allowMethods: [...methods, 'OPTIONS'],
+          allowHeaders: allowedHeaders ?? apig.Cors.DEFAULT_HEADERS,
+          allowCredentials: true,
+        },
+      })
+      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,
+    })
+  }
 }

package/src/lib/types/aws/index.ts

@@ -161,7 +161,8 @@ export interface GraphQlApiLambdaWithCacheProps extends GraphQlApiLambdaProps {
   graphQLVpc: ec2.VpcProps
   graphQLElastiCache: ElastiCacheProps
   securityGroupExportName: string
-  vpcExportName: string
+  useExistingVpc: boolean
+  vpcName?: string
 }
 
 /**