@gradientedge/cdk-utils 8.88.0 → 8.90.0

package/index.ts

@@ -1,5 +1,5 @@
 export * from './src/lib/common'
 export * from './src/lib/construct'
-export * from './src/lib/manager'
+export * from './src/lib/services'
 export * from './src/lib/types'
 export * from './src/lib/utils'

package/package.json

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

package/src/lib/common/construct.ts

@@ -1,8 +1,8 @@
 import * as cdk from 'aws-cdk-lib'
 import { Construct } from 'constructs'
-import * as aws from '../manager/aws'
-import * as types from '../types'
+import * as aws from '../services/aws'
 import * as utils from '../utils'
+import { CommonStackProps } from './types'
 
 /**
  * @stability stable
@@ -21,7 +21,7 @@ import * as utils from '../utils'
  * };
  */
 export class CommonConstruct extends Construct {
-  props: types.CommonStackProps
+  props: CommonStackProps
   acmManager: aws.AcmManager
   apiManager: aws.ApiManager
   appConfigManager: aws.AppConfigManager
@@ -54,7 +54,7 @@ export class CommonConstruct extends Construct {
 
   fullyQualifiedDomainName: string
 
-  constructor(parent: Construct, id: string, props: types.CommonStackProps) {
+  constructor(parent: Construct, id: string, props: CommonStackProps) {
     super(parent, id)
     this.props = props
     this.acmManager = new aws.AcmManager()

package/src/lib/common/index.ts

@@ -1,2 +1,3 @@
 export * from './construct'
 export * from './stack'
+export * from './types'

package/src/lib/common/stack.ts

@@ -1,6 +1,6 @@
 import * as cdk from 'aws-cdk-lib'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
-import { CommonStackProps } from '../types'
+import { CommonStackProps } from './types'
 import { isDevStage } from '../utils'
 import { CommonConstruct } from './construct'
 

package/src/lib/common/types.ts

@@ -0,0 +1,23 @@
+import * as cdk from 'aws-cdk-lib'
+import { Runtime, Tracing } from 'aws-cdk-lib/aws-lambda'
+import { RetentionDays } from 'aws-cdk-lib/aws-logs'
+
+/**
+ * @category cdk-utils.common-stack
+ * @subcategory Properties
+ */
+export interface CommonStackProps extends cdk.StackProps {
+  name: string
+  region: string
+  stage: string
+  domainName: string
+  subDomain?: string
+  extraContexts?: string[]
+  stageContextPath?: string
+  skipStageForARecords: boolean
+  logRetention?: RetentionDays
+  defaultReservedLambdaConcurrentExecutions?: number
+  defaultTracing?: Tracing
+  excludeDomainNameForBuckets?: boolean
+  nodejsRuntime?: Runtime
+}

package/src/lib/{helper/api-to-eventbridge-target-rest-api.ts → construct/api-to-eventbridge-target/api.ts}

@@ -4,7 +4,7 @@ import * as iam from 'aws-cdk-lib/aws-iam'
 import * as logs from 'aws-cdk-lib/aws-logs'
 import * as route53 from 'aws-cdk-lib/aws-route53'
 import * as sns from 'aws-cdk-lib/aws-sns'
-import * as types from '../types/aws'
+import { ApiToEventBridgeTargetRestApiType } from './types'
 
 /**
  * @stability stable
@@ -12,7 +12,7 @@ import * as types from '../types/aws'
  * @subcategory member
  * @classdesc Provides a construct to contain api resources for ApiToEventBridgeTargetWithSns
  */
-export class ApiToEventbridgeTargetRestApi implements types.ApiToEventBridgeTargetRestApiType {
+export class ApiToEventbridgeTargetRestApi implements ApiToEventBridgeTargetRestApiType {
   accessLogGroup: logs.LogGroup
   api: apig.RestApi
   certificate: acm.ICertificate

package/src/lib/{helper/api-to-eventbridge-target-event.ts → construct/api-to-eventbridge-target/event.ts}

@@ -1,6 +1,6 @@
 import * as events from 'aws-cdk-lib/aws-events'
 import * as logs from 'aws-cdk-lib/aws-logs'
-import * as types from '../types/aws'
+import { ApiToEventBridgeTargetEventType } from './types'
 
 /**
  * @stability stable
@@ -8,7 +8,7 @@ import * as types from '../types/aws'
  * @subcategory member
  * @classdesc Provides a construct to contain event resources for ApiToEventBridgeTargetWithSns
  */
-export class ApiToEventbridgeTargetEvent implements types.ApiToEventBridgeTargetEventType {
+export class ApiToEventbridgeTargetEvent implements ApiToEventBridgeTargetEventType {
   eventBus: events.IEventBus
   logGroup: logs.LogGroup
   logGroupFailure: logs.LogGroup

package/src/lib/construct/api-to-eventbridge-target/index.ts

@@ -1 +1,4 @@
+export * from './api'
+export * from './event'
 export * from './main'
+export * from './types'

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

@@ -6,8 +6,13 @@ import * as iam from 'aws-cdk-lib/aws-iam'
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
-import * as helper from '../../helper'
-import * as types from '../../types/aws'
+import {
+  ApiToEventBridgeTargetEventType,
+  ApiToEventBridgeTargetProps,
+  ApiToEventBridgeTargetRestApiType,
+} from './types'
+import { ApiToEventbridgeTargetEvent } from './event'
+import { ApiToEventbridgeTargetRestApi } from './api'
 
 /**
  * @stability stable
@@ -32,27 +37,27 @@ import * as types from '../../types/aws'
  * @mixin
  */
 export class ApiToEventBridgeTarget extends CommonConstruct {
-  props: types.ApiToEventBridgeTargetProps
+  props: ApiToEventBridgeTargetProps
   id: string
 
   /* application related resources */
   applicationSecrets: secretsmanager.ISecret[]
 
   /* event related resources */
-  apiEvent: types.ApiToEventBridgeTargetEventType
+  apiEvent: ApiToEventBridgeTargetEventType
 
   /* rest restApi related resources */
-  apiToEventBridgeTargetRestApi: types.ApiToEventBridgeTargetRestApiType
+  apiToEventBridgeTargetRestApi: ApiToEventBridgeTargetRestApiType
   apiResource: string
 
-  constructor(parent: Construct, id: string, props: types.ApiToEventBridgeTargetProps) {
+  constructor(parent: Construct, id: string, props: ApiToEventBridgeTargetProps) {
     super(parent, id, props)
 
     this.props = props
     this.id = id
 
-    this.apiEvent = new helper.ApiToEventbridgeTargetEvent()
-    this.apiToEventBridgeTargetRestApi = new helper.ApiToEventbridgeTargetRestApi()
+    this.apiEvent = new ApiToEventbridgeTargetEvent()
+    this.apiToEventBridgeTargetRestApi = new ApiToEventbridgeTargetRestApi()
     this.apiResource = 'notify'
   }
 

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

@@ -0,0 +1,126 @@
+import { IEventBus, Rule } from 'aws-cdk-lib/aws-events'
+import { LogGroup } from 'aws-cdk-lib/aws-logs'
+import {
+  DomainName,
+  IAuthorizer,
+  Integration,
+  IntegrationOptions,
+  IntegrationResponse,
+  IRestApi,
+  Method,
+  MethodResponse,
+  Model,
+  ModelOptions,
+  Resource,
+  RestApiProps,
+} from 'aws-cdk-lib/aws-apigateway'
+import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
+import { IHostedZone } from 'aws-cdk-lib/aws-route53'
+import { ITopic } from 'aws-cdk-lib/aws-sns'
+import { PolicyDocument, Role } from 'aws-cdk-lib/aws-iam'
+import { CommonStackProps } from '../../common'
+import { AcmProps, EventRuleProps, LambdaProps, LogProps } from '../../services'
+import { AssetCode } from 'aws-cdk-lib/aws-lambda'
+
+/**
+ * @category cdk-utils.api-to-eventbridge-target
+ * @subcategory Types
+ */
+export interface ApiToEventBridgeTargetEventType {
+  eventBus: IEventBus
+  logGroup: LogGroup
+  logGroupFailure: LogGroup
+  logGroupSuccess: LogGroup
+  rule: Rule
+  ruleFailure: Rule
+  ruleSuccess: Rule
+}
+
+/**
+ * @category cdk-utils.api-to-eventbridge-target
+ * @subcategory Types
+ */
+export interface ApiToEventBridgeTargetRestApiType {
+  accessLogGroup: LogGroup
+  api: IRestApi
+  authoriser?: IAuthorizer
+  certificate: ICertificate
+  domain: DomainName
+  errorResponseModel: Model
+  hostedZone: IHostedZone
+  integration: Integration
+  integrationErrorResponse: IntegrationResponse
+  integrationRequestParameters: { [p: string]: string }
+  integrationRequestTemplates: { [p: string]: string }
+  integrationResponse: IntegrationResponse
+  method: Method
+  methodErrorResponse: MethodResponse
+  methodResponse: MethodResponse
+  resource: Resource
+  responseModel: Model
+  topic?: ITopic
+  role?: Role
+  policy?: PolicyDocument
+}
+
+/**
+ * @category cdk-utils.api-to-eventbridge-target
+ * @subcategory Properties
+ */
+export interface ApiToEventBridgeTargetRestApiProps {
+  certificate: AcmProps
+  integrationResponse?: IntegrationResponse
+  integrationErrorResponse?: IntegrationResponse
+  methodResponse?: MethodResponse
+  methodErrorResponse?: MethodResponse
+  integrationOptions?: IntegrationOptions
+  resource: string
+  errorResponseModel?: ModelOptions
+  responseModel?: ModelOptions
+  restApi?: RestApiProps
+  importedRestApiRef?: string
+  importedRestApiRootResourceRef?: string
+  useExisting: boolean
+  withResource?: boolean
+}
+
+/**
+ * @category cdk-utils.api-to-eventbridge-target
+ * @subcategory Properties
+ */
+interface ApiToEventBridgeTargetLambdaProps {
+  handler?: string
+  function: LambdaProps
+  source?: AssetCode
+  layerSource?: AssetCode
+}
+
+/**
+ * @category cdk-utils.api-to-eventbridge-target
+ * @subcategory Properties
+ */
+interface ApiToEventBridgeTargetEventProps {
+  eventBusName?: string
+  logGroup?: LogProps
+  logGroupSuccess?: LogProps
+  logGroupFailure?: LogProps
+  rule: EventRuleProps
+  ruleSuccess: EventRuleProps
+  ruleFailure: EventRuleProps
+}
+
+/**
+ * @category cdk-utils.api-to-eventbridge-target
+ * @subcategory Properties
+ */
+export interface ApiToEventBridgeTargetProps extends CommonStackProps {
+  apiRootPaths?: string[]
+  apiSubDomain: string
+  api: ApiToEventBridgeTargetRestApiProps
+  event: ApiToEventBridgeTargetEventProps
+  lambda?: ApiToEventBridgeTargetLambdaProps
+  logLevel: string
+  nodeEnv: string
+  timezone: string
+  useExistingHostedZone: boolean
+}

package/src/lib/construct/api-to-eventbridge-target-with-sns/api-destined-lambda.ts

@@ -1,7 +1,7 @@
 import * as iam from 'aws-cdk-lib/aws-iam'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
 import * as destinations from 'aws-cdk-lib/aws-lambda-destinations'
-import * as types from '../../types/aws'
+import { ApiDestinedLambdaEnvironment, ApiDestinedLambdaType } from './types'
 
 /**
  * @stability stable
@@ -9,10 +9,10 @@ import * as types from '../../types/aws'
  * @subcategory member
  * @classdesc Provides a construct to contain lambda resources for ApiToEventBridgeTargetWithSns
  */
-export class ApiDestinedLambda implements types.ApiDestinedLambdaType {
+export class ApiDestinedLambda implements ApiDestinedLambdaType {
   destinationFailure: destinations.EventBridgeDestination
   destinationSuccess: destinations.EventBridgeDestination
-  environment: types.ApiDestinedLambdaEnvironment
+  environment: ApiDestinedLambdaEnvironment
   function: lambda.Function
   layers: lambda.LayerVersion[]
   policy: iam.PolicyDocument

package/src/lib/construct/api-to-eventbridge-target-with-sns/index.ts

@@ -1,2 +1,3 @@
 export * from './api-destined-lambda'
 export * from './main'
+export * from './types'

package/src/lib/construct/api-to-eventbridge-target-with-sns/main.ts

@@ -8,9 +8,15 @@ import * as destinations from 'aws-cdk-lib/aws-lambda-destinations'
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
-import * as helper from '../../helper'
-import * as types from '../../types'
 import { ApiDestinedLambda } from './api-destined-lambda'
+import {
+  ApiToEventbridgeTargetEvent,
+  ApiToEventBridgeTargetEventType,
+  ApiToEventBridgeTargetProps,
+  ApiToEventbridgeTargetRestApi,
+  ApiToEventBridgeTargetRestApiType,
+} from '../api-to-eventbridge-target'
+import { ApiDestinedLambdaType } from './types'
 
 /**
  * @deprecated Use ApiToEventBridgeTarget instead. This will be removed in a future release.
@@ -37,31 +43,31 @@ import { ApiDestinedLambda } from './api-destined-lambda'
  * @mixin
  */
 export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
-  props: types.ApiToEventBridgeTargetProps
+  props: ApiToEventBridgeTargetProps
   id: string
 
   /* application related resources */
   applicationSecrets: secretsmanager.ISecret[]
 
   /* destined lambda related resources */
-  apiDestinedLambda: types.ApiDestinedLambdaType
+  apiDestinedLambda: ApiDestinedLambdaType
 
   /* event related resources */
-  apiEvent: types.ApiToEventBridgeTargetEventType
+  apiEvent: ApiToEventBridgeTargetEventType
 
   /* rest restApi related resources */
-  apiDestinedRestApi: types.ApiToEventBridgeTargetRestApiType
+  apiDestinedRestApi: ApiToEventBridgeTargetRestApiType
   apiResource: string
 
-  constructor(parent: Construct, id: string, props: types.ApiToEventBridgeTargetProps) {
+  constructor(parent: Construct, id: string, props: ApiToEventBridgeTargetProps) {
     super(parent, id, props)
 
     this.props = props
     this.id = id
 
     this.apiDestinedLambda = new ApiDestinedLambda()
-    this.apiEvent = new helper.ApiToEventbridgeTargetEvent()
-    this.apiDestinedRestApi = new helper.ApiToEventbridgeTargetRestApi()
+    this.apiEvent = new ApiToEventbridgeTargetEvent()
+    this.apiDestinedRestApi = new ApiToEventbridgeTargetRestApi()
     this.apiResource = 'notify'
   }
 

package/src/lib/construct/api-to-eventbridge-target-with-sns/types.ts

@@ -0,0 +1,28 @@
+import { LambdaEnvironment } from '../../services'
+import { EventBridgeDestination } from 'aws-cdk-lib/aws-lambda-destinations'
+import { AssetCode, IFunction, LayerVersion } from 'aws-cdk-lib/aws-lambda'
+import { PolicyDocument, Role } from 'aws-cdk-lib/aws-iam'
+
+/**
+ * @category cdk-utils.api-to-eventbridge-target
+ * @subcategory Types
+ */
+export interface ApiDestinedLambdaEnvironment extends LambdaEnvironment {
+  SOURCE_ID: string
+}
+
+/**
+ * @category cdk-utils.api-to-eventbridge-target
+ * @subcategory Types
+ */
+export interface ApiDestinedLambdaType {
+  destinationFailure: EventBridgeDestination
+  destinationSuccess: EventBridgeDestination
+  environment: ApiDestinedLambdaEnvironment
+  function: IFunction
+  layers: LayerVersion[]
+  layerSource?: AssetCode
+  policy: PolicyDocument
+  role: Role
+  source?: AssetCode
+}

package/src/lib/{helper/api-to-lambda-target-rest-api.ts → construct/api-to-lambda-target/api.ts}

@@ -4,7 +4,7 @@ import * as iam from 'aws-cdk-lib/aws-iam'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
 import * as route53 from 'aws-cdk-lib/aws-route53'
 import * as sns from 'aws-cdk-lib/aws-sns'
-import * as types from '../types/aws'
+import { ApiToLambdaTargetRestApiType } from './types'
 
 /**
  * @stability stable
@@ -12,7 +12,7 @@ import * as types from '../types/aws'
  * @subcategory member
  * @classdesc Provides a construct to contain api resources for ApiToLambdaTarget
  */
-export class ApiToLambdaTargetRestApi implements types.ApiToLambdaTargetRestApiType {
+export class ApiToLambdaTargetRestApi implements ApiToLambdaTargetRestApiType {
   api: apig.RestApi
   basePathMappings: apig.BasePathMapping[] = []
   certificate: acm.ICertificate

package/src/lib/construct/api-to-lambda-target/index.ts

@@ -1 +1,3 @@
+export * from './api'
 export * from './main'
+export * from './types'

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

@@ -5,30 +5,30 @@ import * as lambda from 'aws-cdk-lib/aws-lambda'
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
-import * as helper from '../../helper'
-import * as types from '../../types/aws'
+import { ApiToLambdaTargetRestApi } from './api'
+import { ApiToLambdaTargetProps, ApiToLambdaTargetRestApiType } from './types'
 
 /**
  * @mixin
  */
 export class ApiToLambdaTarget extends CommonConstruct {
-  props: types.ApiToLambdaTargetProps
+  props: ApiToLambdaTargetProps
   id: string
 
   /* application related resources */
   applicationSecrets: secretsmanager.ISecret[]
 
   /* rest restApi related resources */
-  apiToLambdaTargetRestApi: types.ApiToLambdaTargetRestApiType
+  apiToLambdaTargetRestApi: ApiToLambdaTargetRestApiType
   apiResource: string
 
-  constructor(parent: Construct, id: string, props: types.ApiToLambdaTargetProps) {
+  constructor(parent: Construct, id: string, props: ApiToLambdaTargetProps) {
     super(parent, id, props)
 
     this.props = props
     this.id = id
 
-    this.apiToLambdaTargetRestApi = new helper.ApiToLambdaTargetRestApi()
+    this.apiToLambdaTargetRestApi = new ApiToLambdaTargetRestApi()
   }
 
   protected initResources() {

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

@@ -0,0 +1,78 @@
+import { CommonStackProps } from '../../common'
+import {
+  BasePathMapping,
+  DomainName,
+  IAuthorizer,
+  Integration,
+  IntegrationResponse,
+  IRestApi,
+  Method,
+  MethodResponse,
+  Model,
+  Resource,
+} from 'aws-cdk-lib/aws-apigateway'
+import { AcmProps, LambdaRestApiProps } from '../../services'
+import * as acm from 'aws-cdk-lib/aws-certificatemanager'
+import * as route53 from 'aws-cdk-lib/aws-route53'
+import { IFunction } from 'aws-cdk-lib/aws-lambda'
+import { ITopic } from 'aws-cdk-lib/aws-sns'
+import { PolicyDocument, Role } from 'aws-cdk-lib/aws-iam'
+
+/**
+ * @category cdk-utils.api-to-lambda-target
+ * @subcategory Types
+ */
+export interface ApiToLambdaTargetRestApiType {
+  api: IRestApi
+  authoriser?: IAuthorizer
+  basePathMappings: BasePathMapping[]
+  certificate: acm.ICertificate
+  domain: DomainName
+  errorResponseModel: Model
+  hostedZone: route53.IHostedZone
+  integration: Integration
+  integrationErrorResponse: IntegrationResponse
+  integrationRequestParameters: { [p: string]: string }
+  integrationRequestTemplates: { [p: string]: string }
+  integrationResponse: IntegrationResponse
+  lambda: IFunction
+  method: Method
+  methodErrorResponse: MethodResponse
+  methodResponse: MethodResponse
+  resource: Resource
+  responseModel: Model
+  topic?: ITopic
+  role?: Role
+  policy?: PolicyDocument
+}
+
+/**
+ * @category cdk-utils.api-to-lambda-target
+ * @subcategory Properties
+ */
+export interface ApiToLambdaTargetRestApiProps {
+  resource: string
+  certificate: AcmProps
+  restApi: LambdaRestApiProps
+  importedRestApiRef?: string
+  importedRestApiRootResourceRef?: string
+  useExisting: boolean
+  withResource?: boolean
+  methodErrorResponse: MethodResponse
+  methodResponse: MethodResponse
+}
+
+/**
+ * @category cdk-utils.api-to-lambda-target
+ * @subcategory Properties
+ */
+export interface ApiToLambdaTargetProps extends CommonStackProps {
+  apiRootPaths?: string[]
+  apiSubDomain: string
+  api: ApiToLambdaTargetRestApiProps
+  lambdaFunctionName: string
+  logLevel: string
+  nodeEnv: string
+  timezone: string
+  useExistingHostedZone: boolean
+}

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

@@ -1 +1,2 @@
 export * from './main'
+export * from './types'

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

@@ -6,7 +6,7 @@ import * as route53 from 'aws-cdk-lib/aws-route53'
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
-import { GraphQlApiLambdaEnvironment, GraphQlApiLambdaProps } from '../../types'
+import { GraphQlApiLambdaEnvironment, GraphQlApiLambdaProps } from './types'
 
 /**
  * @deprecated Use RestApiLambda instead. This will be removed in a future release.

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

@@ -0,0 +1,31 @@
+import { CommonStackProps } from '../../common'
+import { AcmProps, LambdaEnvironment, LambdaProps } from '../../services'
+import { LambdaRestApiProps } from 'aws-cdk-lib/aws-apigateway'
+import { AssetCode } from 'aws-cdk-lib/aws-lambda'
+
+/**
+ * @deprecated Use RestApiLambdaEnvironment instead. This will be removed in a future release.
+ * @category cdk-utils.graphql-api-lambda
+ * @subcategory Types
+ */
+export interface GraphQlApiLambdaEnvironment extends LambdaEnvironment {}
+
+/**
+ * @deprecated Use RestApiLambdaProps instead. This will be removed in a future release.
+ * @category cdk-utils.graphql-api-lambda
+ * @subcategory Properties
+ */
+export interface GraphQlApiLambdaProps extends CommonStackProps {
+  apiRootPaths?: string[]
+  apiSubDomain: string
+  graphQLApiCertificate: AcmProps
+  graphqlRestApi: LambdaRestApiProps
+  graphqlApiLambdaLayerSources?: AssetCode[]
+  graphQLApiHandler: string
+  graphQLApiSource: AssetCode
+  graphqlApi: LambdaProps
+  useExistingHostedZone: boolean
+  nodeEnv: string
+  logLevel: string
+  timezone: string
+}

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

@@ -1 +1,2 @@
 export * from './main'
+export * from './types'

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

@@ -4,7 +4,7 @@ import * as elasticache from 'aws-cdk-lib/aws-elasticache'
 import * as iam from 'aws-cdk-lib/aws-iam'
 import { Construct } from 'constructs'
 import { GraphQLApiLambda } from '..'
-import { GraphQlApiLambdaWithCacheProps } from '../../types'
+import { GraphQlApiLambdaWithCacheProps } from './types'
 import * as utils from '../../utils'
 
 /**

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

@@ -0,0 +1,16 @@
+import { GraphQlApiLambdaProps } from '../graphql-api-lambda'
+import { VpcProps } from 'aws-cdk-lib/aws-ec2'
+import { ReplicatedElastiCacheProps } from '../../services'
+
+/**
+ * @deprecated Use RestApiLambdaWithCacheProps instead. This will be removed in a future release.
+ * @category cdk-utils.graphql-api-lambda-with-cache
+ * @subcategory Properties
+ */
+export interface GraphQlApiLambdaWithCacheProps extends GraphQlApiLambdaProps {
+  graphQLVpc: VpcProps
+  graphQLElastiCache: ReplicatedElastiCacheProps
+  securityGroupExportName: string
+  useExistingVpc: boolean
+  vpcName?: string
+}

package/src/lib/construct/lambda-with-iam-access/types.ts

@@ -1,6 +1,7 @@
-import { CommonStackProps, LambdaEnvironment, LambdaProps } from '../../types'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
 import { SecretProps } from 'aws-cdk-lib/aws-secretsmanager'
+import { LambdaEnvironment, LambdaProps } from '../../services'
+import { CommonStackProps } from '../../common'
 
 export interface LambdaWithIamAccessProps extends CommonStackProps {
   lambda: LambdaProps

package/src/lib/construct/rest-api-lambda/index.ts

@@ -1 +1,2 @@
 export * from './main'
+export * from './types'

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

@@ -6,7 +6,7 @@ import * as route53 from 'aws-cdk-lib/aws-route53'
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
-import { RestApiLambdaEnvironment, RestApiLambdaProps } from '../../types'
+import { RestApiLambdaEnvironment, RestApiLambdaProps } from './types'
 
 /**
  * @category cdk-utils.rest-api-lambda