wip

Author: tmokmss

cdk/lib/constructs/webapp.ts

@@ -1,4 +1,4 @@
-import { IgnoreMode, Duration } from 'aws-cdk-lib';
+import { IgnoreMode, Duration, CfnOutput, Stack } from 'aws-cdk-lib';
 import { Platform } from 'aws-cdk-lib/aws-ecr-assets';
 import { DockerImageFunction, DockerImageCode, Architecture } from 'aws-cdk-lib/aws-lambda';
 import { Construct } from 'constructs';
@@ -12,6 +12,7 @@ import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';
 import { Auth } from './auth';
 import { ContainerImageBuild } from 'deploy-time-build';
 import { join } from 'path';
+import { Trigger } from 'aws-cdk-lib/triggers';
 
 export interface WebappProps {
   database: Database;
@@ -34,6 +35,7 @@ export class Webapp extends Construct {
 
     const { database, hostedZone, auth, subDomain } = props;
 
+    // Use ContainerImageBuild to inject deploy-time values in the build environment
     const image = new ContainerImageBuild(this, 'Build', {
       directory: join('..', 'webapp'),
       platform: Platform.LINUX_ARM64,
@@ -48,14 +50,6 @@ export class Webapp extends Construct {
         USER_POOL_CLIENT_ID: auth.client.userPoolClientId,
       },
     });
-//     HOST_DOMAIN='localhost'
-// COGNITO_DOMAIN=auth.mtomooka.people.aws.dev
-// AMPLIFY_APP_ORIGIN=http://localhost:3000
-// USER_POOL_CLIENT_ID=4a6eduvcg2jjjemc9qe8ub9va0
-// USER_POOL_ID=ap-northeast-1_VyB04AYbz
-// AWS_REGION=ap-northeast-1
-// NEXT_PUBLIC_AWS_REGION=ap-northeast-1
-
 
     const handler = new DockerImageFunction(this, 'Handler', {
       code: image.toLambdaDockerImageCode(),
@@ -93,5 +87,33 @@ export class Webapp extends Construct {
       `${this.baseUrl}/api/auth/sign-in-callback`,
       `${this.baseUrl}/api/auth/sign-out-callback`,
     );
+
+    const migrationRunner = new DockerImageFunction(this, 'MigrationRunner', {
+      code: DockerImageCode.fromImageAsset(join('..', 'webapp'), {
+        platform: Platform.LINUX_ARM64,
+        cmd: ['migration-runner.handler'],
+        file: 'jobs.Dockerfile',
+      }),
+      architecture: Architecture.ARM_64,
+      timeout: Duration.minutes(5),
+      environment: {
+        ...database.getLambdaEnvironment('main'),
+      },
+      vpc: database.cluster.vpc,
+      memorySize: 256,
+    });
+    migrationRunner.connections.allowToDefaultPort(database);
+
+    // run database migration during CDK deployment
+    const trigger = new Trigger(this, 'MigrationTrigger', {
+      handler: migrationRunner,
+    });
+    // make sure migration is executed after the database cluster is available.
+    trigger.node.addDependency(database.cluster);
+
+    new CfnOutput(Stack.of(this), 'MigrationFunctionName', { value: migrationRunner.functionName });
+    new CfnOutput(Stack.of(this), 'MigrationCommand', {
+      value: `aws lambda invoke --function-name ${migrationRunner.functionName} --payload '{"command":"deploy"}' --cli-binary-format raw-in-base64-out /dev/stdout`,
+    });
   }
 }

webapp/.gitignore

@@ -40,4 +40,6 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 
+dist
+
 !prisma/.env

webapp/Dockerfile

@@ -21,7 +21,6 @@ ENV AWS_LWA_READINESS_CHECK_PATH="/api/health"
 ENV AWS_LWA_INVOKE_MODE="response_stream"
 
 COPY --from=builder /build/.next/static ./.next/static
-COPY --from=builder /build/public ./public
 COPY --from=builder /build/.next/standalone ./
 COPY --from=builder /build/run.sh ./run.sh
 

webapp/eslint.config.mjs

@@ -1,6 +1,7 @@
-import { dirname } from "path";
-import { fileURLToPath } from "url";
-import { FlatCompat } from "@eslint/eslintrc";
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { FlatCompat } from '@eslint/eslintrc';
+import { defineConfig } from 'eslint/config';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -9,8 +10,11 @@ const compat = new FlatCompat({
   baseDirectory: __dirname,
 });
 
-const eslintConfig = [
-  ...compat.extends("next/core-web-vitals", "next/typescript"),
-];
-
-export default eslintConfig;
+export default defineConfig([
+  ...compat.extends('next/core-web-vitals', 'next/typescript'),
+  {
+    rules: {
+      '@typescript-eslint/no-unused-vars': 'off',
+    },
+  },
+]);

webapp/jobs.Dockerfile

@@ -0,0 +1,17 @@
+FROM public.ecr.aws/lambda/nodejs:22 AS builder
+WORKDIR /build
+COPY package*.json ./
+RUN --mount=type=cache,target=/root/.npm npm ci
+COPY ./ ./
+RUN npx prisma generate
+RUN npx esbuild src/jobs/*.ts --bundle --outdir=dist --platform=node --charset=utf8 --external:@prisma/client
+
+FROM public.ecr.aws/lambda/nodejs:22 AS runner
+
+COPY package*.json ./
+COPY prisma ./prisma
+RUN --mount=type=cache,target=/root/.npm npm ci --omit=dev
+RUN npx prisma generate --generator client
+COPY --from=builder /build/dist/. ./
+
+CMD ["migration-runner.handler"]