@gradientedge/cdk-utils 8.164.0 → 8.165.0

package/dist/src/lib/aws/construct/api-to-any-target/main.js

@@ -129,7 +129,7 @@ class ApiToAnyTarget extends common_1.CommonConstruct {
         else {
             rootResource = this.apiToAnyTargetRestApi.api.root;
         }
-        return this.apiManager.createApiResource(`${this.id}-resource-${apiResourceProps.path}}`, this, apiResourceProps.parent ?? rootResource, apiResourceProps.path, apiResourceProps.integration, apiResourceProps.addProxy, apiResourceProps.authorizer, apiResourceProps.allowedOrigins, apiResourceProps.allowedMethods, apiResourceProps.allowedHeaders, apiResourceProps.methodRequestParameters, apiResourceProps.proxyIntegration, apiResourceProps.enableDefaultCors);
+        return this.apiManager.createApiResource(`${this.id}-resource-${apiResourceProps.path}}`, this, apiResourceProps.parent ?? rootResource, apiResourceProps.path, apiResourceProps.integration, apiResourceProps.addProxy, apiResourceProps.authorizer, apiResourceProps.allowedOrigins, apiResourceProps.allowedMethods, apiResourceProps.allowedHeaders, apiResourceProps.methodRequestParameters, apiResourceProps.proxyIntegration, apiResourceProps.enableDefaultCors, apiResourceProps.mockIntegration);
     }
     createApiDomain() {
         if (this.props.api.useExisting)

package/dist/src/lib/aws/construct/api-to-any-target/types.d.ts

@@ -1,4 +1,4 @@
-import { BasePathMapping, DomainName, IAuthorizer, IResource, IRestApi, Integration, Method, MethodResponse, Resource, RestApiProps } from 'aws-cdk-lib/aws-apigateway';
+import { BasePathMapping, DomainName, IAuthorizer, IResource, IRestApi, Integration, Method, MethodResponse, MockIntegration, Resource, RestApiProps } from 'aws-cdk-lib/aws-apigateway';
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';
 import { LogGroup } from 'aws-cdk-lib/aws-logs';
 import { IHostedZone } from 'aws-cdk-lib/aws-route53';
@@ -36,6 +36,7 @@ export interface ApiToAnyTargetRestApiResource {
     parent?: IResource;
     proxyIntegration?: Integration;
     enableDefaultCors?: boolean;
+    mockIntegration?: MockIntegration;
 }
 export interface ApiToAnyTargetRestApiProps {
     certificate: AcmProps;

package/dist/src/lib/aws/services/api-gateway/main.d.ts

@@ -1,4 +1,4 @@
-import { DomainName, IAuthorizer, IResource, IRestApi, Integration, LambdaRestApi } from 'aws-cdk-lib/aws-apigateway';
+import { DomainName, IAuthorizer, IResource, IRestApi, Integration, MockIntegration, LambdaRestApi } from 'aws-cdk-lib/aws-apigateway';
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';
 import { IFunction } from 'aws-cdk-lib/aws-lambda';
 import { CommonConstruct } from '../../common';
@@ -51,10 +51,12 @@ export declare class ApiManager {
      * @param allowedHeaders
      * @param methodRequestParameters
      * @param proxyIntegration
+     * @param enableDefaultCors
+     * @param mockIntegration
      */
     createApiResource(id: string, scope: CommonConstruct, parent: IResource, path: string, integration: Integration, addProxy: boolean, authorizer?: IAuthorizer, allowedOrigins?: string[], allowedMethods?: string[], allowedHeaders?: string[], methodRequestParameters?: {
         [param: string]: boolean;
-    }, proxyIntegration?: Integration, enableDefaultCors?: boolean): import("aws-cdk-lib/aws-apigateway").Resource;
+    }, proxyIntegration?: Integration, enableDefaultCors?: boolean, mockIntegration?: MockIntegration): import("aws-cdk-lib/aws-apigateway").Resource;
     /**
      * @summary Method to create an api deployment
      * @param id

package/dist/src/lib/aws/services/api-gateway/main.js

@@ -95,8 +95,10 @@ class ApiManager {
      * @param allowedHeaders
      * @param methodRequestParameters
      * @param proxyIntegration
+     * @param enableDefaultCors
+     * @param mockIntegration
      */
-    createApiResource(id, scope, parent, path, integration, addProxy, authorizer, allowedOrigins, allowedMethods, allowedHeaders, methodRequestParameters, proxyIntegration, enableDefaultCors) {
+    createApiResource(id, scope, parent, path, integration, addProxy, authorizer, allowedOrigins, allowedMethods, allowedHeaders, methodRequestParameters, proxyIntegration, enableDefaultCors, mockIntegration) {
         const methods = allowedMethods ?? aws_apigateway_1.Cors.ALL_METHODS;
         let defaultCorsPreflightOptions;
         if (!enableDefaultCors) {
@@ -114,10 +116,18 @@ class ApiManager {
             defaultCorsPreflightOptions: defaultCorsPreflightOptions,
         });
         lodash_1.default.forEach(methods, method => {
-            resource.addMethod(method, integration, {
-                authorizer,
-                requestParameters: methodRequestParameters,
-            });
+            if (!enableDefaultCors && mockIntegration && method === 'OPTIONS') {
+                resource.addMethod(method, mockIntegration, {
+                    authorizer,
+                    requestParameters: methodRequestParameters,
+                });
+            }
+            else {
+                resource.addMethod(method, integration, {
+                    authorizer,
+                    requestParameters: methodRequestParameters,
+                });
+            }
         });
         (0, utils_1.createCfnOutput)(`${id}-${path}ResourceId`, scope, resource.resourceId);
         if (addProxy) {
@@ -125,10 +135,18 @@ class ApiManager {
                 defaultCorsPreflightOptions: defaultCorsPreflightOptions,
             });
             lodash_1.default.forEach(methods, method => {
-                resourceProxy.addMethod(method, proxyIntegration ?? integration, {
-                    authorizer,
-                    requestParameters: methodRequestParameters,
-                });
+                if (!enableDefaultCors && mockIntegration && method === 'OPTIONS') {
+                    resourceProxy.addMethod(method, mockIntegration, {
+                        authorizer,
+                        requestParameters: methodRequestParameters,
+                    });
+                }
+                else {
+                    resourceProxy.addMethod(method, proxyIntegration ?? integration, {
+                        authorizer,
+                        requestParameters: methodRequestParameters,
+                    });
+                }
             });
             (0, utils_1.createCfnOutput)(`${id}-${path}ProxyResourceId`, scope, resourceProxy.resourceId);
         }

package/package.json

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

package/src/lib/aws/construct/api-to-any-target/main.ts

@@ -184,7 +184,8 @@ export class ApiToAnyTarget extends CommonConstruct {
       apiResourceProps.allowedHeaders,
       apiResourceProps.methodRequestParameters,
       apiResourceProps.proxyIntegration,
-      apiResourceProps.enableDefaultCors
+      apiResourceProps.enableDefaultCors,
+      apiResourceProps.mockIntegration
     )
   }
 

package/src/lib/aws/construct/api-to-any-target/types.ts

@@ -7,6 +7,7 @@ import {
   Integration,
   Method,
   MethodResponse,
+  MockIntegration,
   Resource,
   RestApiProps,
 } from 'aws-cdk-lib/aws-apigateway'
@@ -43,6 +44,7 @@ export interface ApiToAnyTargetRestApiResource {
   parent?: IResource
   proxyIntegration?: Integration
   enableDefaultCors?: boolean
+  mockIntegration?: MockIntegration
 }
 
 export interface ApiToAnyTargetRestApiProps {

package/src/lib/aws/services/api-gateway/main.ts

@@ -8,6 +8,7 @@ import {
   IResource,
   IRestApi,
   Integration,
+  MockIntegration,
   LambdaRestApi,
   SecurityPolicy,
 } from 'aws-cdk-lib/aws-apigateway'
@@ -111,6 +112,8 @@ export class ApiManager {
    * @param allowedHeaders
    * @param methodRequestParameters
    * @param proxyIntegration
+   * @param enableDefaultCors
+   * @param mockIntegration
    */
   public createApiResource(
     id: string,
@@ -125,7 +128,8 @@ export class ApiManager {
     allowedHeaders?: string[],
     methodRequestParameters?: { [param: string]: boolean },
     proxyIntegration?: Integration,
-    enableDefaultCors?: boolean
+    enableDefaultCors?: boolean,
+    mockIntegration?: MockIntegration
   ) {
     const methods = allowedMethods ?? Cors.ALL_METHODS
 
@@ -146,10 +150,17 @@ export class ApiManager {
     })
 
     _.forEach(methods, method => {
-      resource.addMethod(method, integration, {
-        authorizer,
-        requestParameters: methodRequestParameters,
-      })
+      if (!enableDefaultCors && mockIntegration && method === 'OPTIONS') {
+        resource.addMethod(method, mockIntegration, {
+          authorizer,
+          requestParameters: methodRequestParameters,
+        })
+      } else {
+        resource.addMethod(method, integration, {
+          authorizer,
+          requestParameters: methodRequestParameters,
+        })
+      }
     })
     createCfnOutput(`${id}-${path}ResourceId`, scope, resource.resourceId)
 
@@ -159,10 +170,17 @@ export class ApiManager {
       })
 
       _.forEach(methods, method => {
-        resourceProxy.addMethod(method, proxyIntegration ?? integration, {
-          authorizer,
-          requestParameters: methodRequestParameters,
-        })
+        if (!enableDefaultCors && mockIntegration && method === 'OPTIONS') {
+          resourceProxy.addMethod(method, mockIntegration, {
+            authorizer,
+            requestParameters: methodRequestParameters,
+          })
+        } else {
+          resourceProxy.addMethod(method, proxyIntegration ?? integration, {
+            authorizer,
+            requestParameters: methodRequestParameters,
+          })
+        }
       })
       createCfnOutput(`${id}-${path}ProxyResourceId`, scope, resourceProxy.resourceId)
     }