@mbc-cqrs-serverless/cli 0.1.25-beta.0 → 0.1.27-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mbc-cqrs-serverless/cli",
-  "version": "0.1.25-beta.0",
+  "version": "0.1.27-beta.0",
   "description": "a CLI to get started with MBC CQRS serverless framework",
   "keywords": [
     "mbc",
@@ -49,5 +49,5 @@
   "devDependencies": {
     "@faker-js/faker": "^8.3.1"
   },
-  "gitHead": "7c50d386295bdd70d6db5d325e6892f0cb4d9f62"
+  "gitHead": "34a52ba6d89eddb8724de7f0689a1c2d32b8d6a7"
 }

package/templates/gitignore

@@ -43,4 +43,6 @@ docker-data
 
 .nestjs_repl_history
 
-.env
+.env
+
+report

package/templates/infra/.cdkgraphrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  outdir: 'graph',
+}

package/templates/infra/bin/infra.ts

@@ -1,47 +1,42 @@
 #!/usr/bin/env node
-import 'source-map-support/register'
 import * as cdk from 'aws-cdk-lib'
-// import { InfraStack } from '../libs/infra-stack'
-
-// import * as dotenv from 'dotenv'
-// import { Env } from '../config/type'
-// import { getConfig } from '../config'
-import { PipelineStack } from '../libs/pipeline-stack'
+import 'source-map-support/register'
 import { Env, PIPELINE_NAME } from '../config'
-// dotenv.config()
-
-const app = new cdk.App()
-
-// const env: Env = app.node.tryGetContext('env') || 'dev'
-// console.log('stack environment:', env)
-// const config = getConfig(env)
-
-const cdkEnv: cdk.Environment = {
-  account: '',
-  region: '',
-}
-
-// new InfraStack(app, 'InfraStack', {
-//   config,
-//   /* If you don't specify 'env', this stack will be environment-agnostic.
-//    * Account/Region-dependent features and context lookups will not work,
-//    * but a single synthesized template can be deployed anywhere. */
-//   /* Uncomment the next line to specialize this stack for the AWS Account
-//    * and Region that are implied by the current CLI configuration. */
-//   // env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION },
-//   /* Uncomment the next line if you know exactly what Account and Region you
-//    * want to deploy the stack to. */
-//   env: cdkEnv,
-//   /* For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html */
-// })
-
-const envs: Env[] = ['dev']
-
-for (const env of envs) {
-  new PipelineStack(app, env + '-' + PIPELINE_NAME + '-pipeline-stack', {
-    env: cdkEnv,
-    envName: env,
+import { PipelineStack } from '../libs/pipeline-stack'
+import { CdkGraph, FilterPreset } from '@aws/pdk/cdk-graph'
+import { CdkGraphDiagramPlugin } from '@aws/pdk/cdk-graph-plugin-diagram'
+;(async () => {
+  const app = new cdk.App()
+
+  const cdkEnv: cdk.Environment = {
+    account: '',
+    region: '',
+  }
+
+  const envs: Env[] = ['dev']
+
+  for (const env of envs) {
+    new PipelineStack(app, env + '-' + PIPELINE_NAME + '-pipeline-stack', {
+      env: cdkEnv,
+      envName: env,
+    })
+  }
+
+  const graph = new CdkGraph(app, {
+    plugins: [
+      new CdkGraphDiagramPlugin({
+        diagrams: [
+          {
+            name: 'diagram',
+            title: 'Infrastructure diagram',
+            theme: 'light',
+          },
+        ],
+      }),
+    ],
   })
-}
 
-app.synth()
+  app.synth()
+
+  await graph.report()
+})()

package/templates/infra/gitignore

@@ -1,8 +1,12 @@
 *.js
 !jest.config.js
+!.cdkgraphrc.js
 *.d.ts
 node_modules
 
 # CDK asset staging directory
 .cdk.staging
-cdk.out
+cdk.out
+
+# 
+graph

package/templates/infra/jest.config.js

@@ -5,4 +5,8 @@ module.exports = {
   transform: {
     '^.+\\.tsx?$': 'ts-jest',
   },
+  reporters: [
+    'default',
+    ['jest-junit', { outputDirectory: '../report', outputName: 'unit-infra.xml' }],
+  ],
 }

package/templates/infra/libs/build-app.ts

@@ -22,9 +22,9 @@ export function buildApp(env: Env, isLocal = false) {
     }
   }
 
-  const runCommand = function (cmd: string) {
+  const runCommand = function (cmd: string, cwdExec: string = cwd) {
     console.log(cmd)
-    const ret = execSync(cmd, { cwd })
+    const ret = execSync(cmd, { cwd: cwdExec })
     console.log(ret.toString())
   }
 
@@ -48,11 +48,9 @@ export function buildApp(env: Env, isLocal = false) {
   const prunePath = `${layerPath}/prune`
   runCommand(`mkdir -p ${prunePath}`)
   runCommand(`npm --prefix ./${prunePath} i node-prune modclean`)
-  runCommand(`npm --prefix ./${prunePath} exec node-prune`)
   runCommand(
     `npm --prefix ./${prunePath} exec modclean -- -n default:safe,default:caution -r`,
   )
-  runCommand(`rm -rf ${prunePath}`)
   runCommand(
     'mv node_modules/.prisma/client/libquery_engine-linux-arm64-* prisma',
   )
@@ -69,6 +67,11 @@ export function buildApp(env: Env, isLocal = false) {
   runCommand(`mkdir -p ${nodejsLayerPath}`)
   runCommand(`mv node_modules ${nodejsLayerPath}`)
 
+  // min size layer
+  console.log('============= min size layer =============')
+  runCommand(`npm --prefix ../prune exec node-prune`, `${layerFullPath}/nodejs`)
+  runCommand(`rm -rf ${prunePath}`)
+
   console.log('============= build app finished =============')
 
   if (isLocal) {

package/templates/infra/libs/pipeline-stack.ts

@@ -47,13 +47,13 @@ export class PipelineStack extends Stack {
 
     const testStep = new CodeBuildStep(`${prefix}Test`, {
       projectName: `${prefix}Test`,
-      installCommands: ['npm ci'],
-      commands: ['npm run test'],
+      installCommands: ['npm ci', 'npm --prefix ./infra ci'],
+      commands: ['npm run test', 'npm --prefix ./infra run test'],
       primaryOutputDirectory: 'report',
       partialBuildSpec: BuildSpec.fromObject({
         reports: {
           [unitTestReports.reportGroupArn]: {
-            files: ['unit.xml'],
+            files: ['*.xml'],
             'base-directory': 'report',
             'discard-paths': true,
           },

package/templates/infra/package.json

@@ -15,6 +15,7 @@
     "@types/node": "^20.9.4",
     "aws-cdk": "^2.147.0",
     "jest": "^29.7.0",
+    "jest-junit": "^16.0.0",
     "prettier": "^3.1.0",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
@@ -24,6 +25,7 @@
     "@aws-cdk/aws-apigatewayv2-alpha": "^2.114.1-alpha.0",
     "@aws-cdk/aws-apigatewayv2-authorizers-alpha": "^2.114.1-alpha.0",
     "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.114.1-alpha.0",
+    "@aws/pdk": "^0.25.7",
     "aws-cdk-lib": "^2.147.0",
     "cdk-ecr-deployment": "^3.0.71",
     "constructs": "^10.3.0",