Not use custom-resource converter for dynamodb seeding adapter (#365)

* Not use custom-resource converter for dynamodb seeding adapter * fix e2e --------- Co-authored-by: Dorseuil Nicolas <[email protected]>
opennextjs · Feb 20, 2024 · 68858bb · 68858bb
1 parent e1a9589
commit 68858bb
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 44 deletions.
diff --git a/examples/sst/stacks/OpenNextReferenceImplementation.ts b/examples/sst/stacks/OpenNextReferenceImplementation.ts
@@ -31,7 +31,6 @@ import {
   Runtime,
 } from "aws-cdk-lib/aws-lambda";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
-import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { BlockPublicAccess, Bucket } from "aws-cdk-lib/aws-s3";
 import { BucketDeployment, Source } from "aws-cdk-lib/aws-s3-deployment";
 import { Queue } from "aws-cdk-lib/aws-sqs";
@@ -42,7 +41,11 @@ import {
   RemovalPolicy,
   Stack,
 } from "aws-cdk-lib/core";
-import { Provider } from "aws-cdk-lib/custom-resources";
+import {
+  AwsCustomResource,
+  AwsCustomResourcePolicy,
+  PhysicalResourceId,
+} from "aws-cdk-lib/custom-resources";
 import { Construct } from "constructs";
 import { readFileSync } from "fs";
 import path from "path";
@@ -199,16 +202,22 @@ export class OpenNextCdkReferenceImplementation extends Construct {
         ],
       });
 
-      const provider = new Provider(this, "RevalidationProvider", {
-        onEventHandler: insertFn,
-        logRetention: RetentionDays.ONE_DAY,
-      });
-
-      new CustomResource(this, "RevalidationResource", {
-        serviceToken: provider.serviceToken,
-        properties: {
-          version: Date.now().toString(),
+      new AwsCustomResource(this, "RevalidationInitResource", {
+        onUpdate: {
+          service: "Lambda",
+          action: "invoke",
+          parameters: {
+            FunctionName: insertFn.functionArn,
+          },
+          physicalResourceId: PhysicalResourceId.of("dynamodb-cache"),
         },
+
+        policy: AwsCustomResourcePolicy.fromStatements([
+          new PolicyStatement({
+            actions: ["lambda:InvokeFunction"],
+            resources: [insertFn.functionArn],
+          }),
+        ]),
       });
     }
 

diff --git a/packages/open-next/src/adapters/dynamo-provider.ts b/packages/open-next/src/adapters/dynamo-provider.ts
@@ -42,11 +42,12 @@ async function defaultHandler(
   event: InitializationFunctionEvent,
 ): Promise<InitializationFunctionEvent> {
   switch (event.requestType) {
+    case "delete":
+      return remove();
     case "create":
     case "update":
+    default:
       return insert(event.requestType);
-    case "delete":
-      return remove();
   }
 }
 

diff --git a/packages/open-next/src/build.ts b/packages/open-next/src/build.ts
@@ -613,7 +613,7 @@ async function createCacheAssets(monorepoRoot: string) {
           plugins: [
             openNextResolvePlugin({
               overrides: {
-                converter: "custom-resource",
+                converter: "dummy",
               },
             }),
           ],

diff --git a/packages/open-next/src/converters/custom-resource.ts b/packages/open-next/src/converters/custom-resource.ts
diff --git a/packages/open-next/src/types/open-next.ts b/packages/open-next/src/types/open-next.ts
@@ -112,7 +112,6 @@ export type IncludedConverter =
   | "edge"
   | "node"
   | "sqs-revalidate"
-  | "custom-resource"
   | "dummy";
 
 export type IncludedQueue = "sqs";