feat: updated naming for edge functions

Author: RomanBobrovskiy

src/cdk/constructs/RoutingLambdaEdge.ts renamed to src/cdk/constructs/OriginRequestLambdaEdge.ts

@@ -8,7 +8,7 @@ import path from 'node:path'
 import { buildLambda } from '../../build/edge'
 import { CacheConfig } from '../../types'
 
-interface RoutingLambdaEdgeProps extends cdk.StackProps {
+interface OriginRequestLambdaEdgeProps extends cdk.StackProps {
   bucketName: string
   renderServerDomain: string
   buildOutputPath: string
@@ -22,15 +22,15 @@ const NodeJSEnvironmentMapping: Record<string, lambda.Runtime> = {
   '20': lambda.Runtime.NODEJS_20_X
 }
 
-export class RoutingLambdaEdge extends Construct {
+export class OriginRequestLambdaEdge extends Construct {
   public readonly lambdaEdge: cloudfront.experimental.EdgeFunction
 
-  constructor(scope: Construct, id: string, props: RoutingLambdaEdgeProps) {
+  constructor(scope: Construct, id: string, props: OriginRequestLambdaEdgeProps) {
     const { bucketName, bucketRegion, renderServerDomain, nodejs, buildOutputPath, cacheConfig } = props
     super(scope, id)
 
     const nodeJSEnvironment = NodeJSEnvironmentMapping[nodejs ?? ''] ?? NodeJSEnvironmentMapping['20']
-    const name = 'edgeRouting'
+    const name = 'originRequest'
 
     buildLambda(name, buildOutputPath, {
       define: {
@@ -41,13 +41,13 @@ export class RoutingLambdaEdge extends Construct {
       }
     })
 
-    const logGroup = new logs.LogGroup(this, 'RoutingLambdaEdgeLogGroup', {
-      logGroupName: `/aws/lambda/${id}-edgeRouting`,
+    const logGroup = new logs.LogGroup(this, 'OriginRequestLambdaEdgeLogGroup', {
+      logGroupName: `/aws/lambda/${id}-originRequest`,
       removalPolicy: cdk.RemovalPolicy.DESTROY,
       retention: logs.RetentionDays.ONE_DAY
     })
 
-    this.lambdaEdge = new cloudfront.experimental.EdgeFunction(this, 'RoutingLambdaEdge', {
+    this.lambdaEdge = new cloudfront.experimental.EdgeFunction(this, 'OriginRequestLambdaEdge', {
       runtime: nodeJSEnvironment,
       code: lambda.Code.fromAsset(path.join(buildOutputPath, 'server-functions', name)),
       handler: 'index.handler',

src/cdk/constructs/CheckExpirationLambdaEdge.ts renamed to src/cdk/constructs/OriginResponseLambdaEdge.ts

@@ -8,7 +8,7 @@ import path from 'node:path'
 import { buildLambda } from '../../build/edge'
 import { CacheConfig } from '../../types'
 
-interface CheckExpirationLambdaEdgeProps extends cdk.StackProps {
+interface OriginResponseLambdaEdgeProps extends cdk.StackProps {
   renderWorkerQueueUrl: string
   renderWorkerQueueArn: string
   buildOutputPath: string
@@ -22,15 +22,15 @@ const NodeJSEnvironmentMapping: Record<string, lambda.Runtime> = {
   '20': lambda.Runtime.NODEJS_20_X
 }
 
-export class CheckExpirationLambdaEdge extends Construct {
+export class OriginResponseLambdaEdge extends Construct {
   public readonly lambdaEdge: cloudfront.experimental.EdgeFunction
 
-  constructor(scope: Construct, id: string, props: CheckExpirationLambdaEdgeProps) {
+  constructor(scope: Construct, id: string, props: OriginResponseLambdaEdgeProps) {
     const { nodejs, buildOutputPath, cacheConfig, renderWorkerQueueUrl, renderWorkerQueueArn, region } = props
     super(scope, id)
 
     const nodeJSEnvironment = NodeJSEnvironmentMapping[nodejs ?? ''] ?? NodeJSEnvironmentMapping['20']
-    const name = 'checkExpiration'
+    const name = 'originResponse'
 
     buildLambda(name, buildOutputPath, {
       define: {
@@ -40,13 +40,13 @@ export class CheckExpirationLambdaEdge extends Construct {
       }
     })
 
-    const logGroup = new logs.LogGroup(this, 'CheckExpirationLambdaEdgeLogGroup', {
-      logGroupName: `/aws/lambda/${id}-checkExpiration`,
+    const logGroup = new logs.LogGroup(this, 'OriginResponseLambdaEdgeLogGroup', {
+      logGroupName: `/aws/lambda/${id}-originResponse`,
       removalPolicy: cdk.RemovalPolicy.DESTROY,
       retention: logs.RetentionDays.ONE_DAY
     })
 
-    this.lambdaEdge = new cloudfront.experimental.EdgeFunction(this, 'CheckExpirationLambdaEdge', {
+    this.lambdaEdge = new cloudfront.experimental.EdgeFunction(this, 'OriginResponseLambdaEdge', {
       runtime: nodeJSEnvironment,
       code: lambda.Code.fromAsset(path.join(buildOutputPath, 'server-functions', name)),
       handler: 'index.handler',

src/cdk/stacks/NextCloudfrontStack.ts

@@ -1,10 +1,10 @@
 import { Stack, type StackProps } from 'aws-cdk-lib'
 import { Construct } from 'constructs'
 import * as s3 from 'aws-cdk-lib/aws-s3'
-import { RoutingLambdaEdge } from '../constructs/RoutingLambdaEdge'
+import { OriginRequestLambdaEdge } from '../constructs/OriginRequestLambdaEdge'
 import { CloudFrontDistribution } from '../constructs/CloudFrontDistribution'
 import { CacheConfig } from '../../types'
-import { CheckExpirationLambdaEdge } from '../constructs/CheckExpirationLambdaEdge'
+import { OriginResponseLambdaEdge } from '../constructs/OriginResponseLambdaEdge'
 import { ViewerResponseLambdaEdge } from '../constructs/ViewerResponseLambdaEdge'
 
 export interface NextCloudfrontStackProps extends StackProps {
@@ -20,8 +20,8 @@ export interface NextCloudfrontStackProps extends StackProps {
 }
 
 export class NextCloudfrontStack extends Stack {
-  public readonly routingLambdaEdge: RoutingLambdaEdge
-  public readonly checkExpLambdaEdge: CheckExpirationLambdaEdge
+  public readonly originRequestLambdaEdge: OriginRequestLambdaEdge
+  public readonly originResponseLambdaEdge: OriginResponseLambdaEdge
   public readonly viewerResponseLambdaEdge: ViewerResponseLambdaEdge
   public readonly cloudfront: CloudFrontDistribution
 
@@ -39,7 +39,7 @@ export class NextCloudfrontStack extends Stack {
       imageTTL
     } = props
 
-    this.routingLambdaEdge = new RoutingLambdaEdge(this, `${id}-RoutingLambdaEdge`, {
+    this.originRequestLambdaEdge = new OriginRequestLambdaEdge(this, `${id}-OriginRequestLambdaEdge`, {
       nodejs,
       bucketName: staticBucketName,
       renderServerDomain,
@@ -48,7 +48,7 @@ export class NextCloudfrontStack extends Stack {
       bucketRegion: region
     })
 
-    this.checkExpLambdaEdge = new CheckExpirationLambdaEdge(this, `${id}-CheckExpirationLambdaEdge`, {
+    this.originResponseLambdaEdge = new OriginResponseLambdaEdge(this, `${id}-OriginResponseLambdaEdge`, {
       nodejs,
       renderWorkerQueueUrl,
       buildOutputPath,
@@ -70,14 +70,14 @@ export class NextCloudfrontStack extends Stack {
     this.cloudfront = new CloudFrontDistribution(this, `${id}-NextCloudFront`, {
       staticBucket,
       renderServerDomain,
-      requestEdgeFunction: this.routingLambdaEdge.lambdaEdge,
-      responseEdgeFunction: this.checkExpLambdaEdge.lambdaEdge,
+      requestEdgeFunction: this.originRequestLambdaEdge.lambdaEdge,
+      responseEdgeFunction: this.originResponseLambdaEdge.lambdaEdge,
       viewerResponseEdgeFunction: this.viewerResponseLambdaEdge.lambdaEdge,
       cacheConfig,
       imageTTL
     })
 
-    staticBucket.grantRead(this.routingLambdaEdge.lambdaEdge)
-    staticBucket.grantRead(this.checkExpLambdaEdge.lambdaEdge)
+    staticBucket.grantRead(this.originRequestLambdaEdge.lambdaEdge)
+    staticBucket.grantRead(this.originResponseLambdaEdge.lambdaEdge)
   }
 }