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

package/dist/actions/new.action.js

@@ -32,11 +32,14 @@ async function newAction(name = '', options, command) {
     const destDir = path_1.default.join(process.cwd(), projectName);
     console.log('Generating MBC cqrs serverless application in', destDir);
     (0, fs_1.mkdirSync)(destDir, { recursive: true });
-    (0, fs_1.cpSync)(path_1.default.join(__dirname, '../../templates'), destDir, { recursive: true });
+    useTemplate(destDir);
     usePackageVersion(destDir, packageVersion, projectName);
     const gitignore = path_1.default.join(destDir, 'gitignore');
     (0, fs_1.copyFileSync)(gitignore, path_1.default.join(destDir, '.gitignore'));
     (0, fs_1.unlinkSync)(gitignore);
+    const infraGitignore = path_1.default.join(destDir, 'infra/gitignore');
+    (0, fs_1.copyFileSync)(infraGitignore, path_1.default.join(destDir, 'infra/.gitignore'));
+    (0, fs_1.unlinkSync)(infraGitignore);
     (0, fs_1.copyFileSync)(path_1.default.join(destDir, '.env.local'), path_1.default.join(destDir, '.env'));
     let logs = (0, child_process_1.execSync)('git init', { cwd: destDir });
     console.log(logs.toString());
@@ -45,6 +48,26 @@ async function newAction(name = '', options, command) {
     console.log(logs.toString());
 }
 exports.default = newAction;
+function useTemplate(destDir) {
+    if (isLatestCli()) {
+        (0, fs_1.cpSync)(path_1.default.join(__dirname, '../../templates'), destDir, {
+            recursive: true,
+        });
+    }
+    else {
+        (0, child_process_1.execSync)('npm i @mbc-cqrs-serverless/cli', { cwd: destDir });
+        (0, fs_1.cpSync)(path_1.default.join(destDir, 'node_modules/@mbc-cqrs-serverless/cli/templates'), destDir, { recursive: true });
+        (0, fs_1.rmSync)(path_1.default.join(destDir, 'node_modules'), {
+            recursive: true,
+        });
+    }
+}
+function isLatestCli() {
+    const latestVersion = getPackageVersion('@mbc-cqrs-serverless/cli', true)[0];
+    const packageJson = JSON.parse((0, fs_1.readFileSync)(path_1.default.join(__dirname, '../../package.json')).toString());
+    const curVersion = packageJson.version;
+    return latestVersion === curVersion;
+}
 function usePackageVersion(destDir, packageVersion, projectName) {
     const packageJson = JSON.parse((0, fs_1.readFileSync)(path_1.default.join(__dirname, '../../package.json')).toString());
     const fname = path_1.default.join(destDir, 'package.json');
@@ -70,6 +93,7 @@ function getPackageVersion(packageName, isLatest = false) {
 exports.exportsForTesting = {
     usePackageVersion,
     getPackageVersion,
+    isLatestCli,
 };
 if (process.env.NODE_ENV !== 'test') {
     exports.exportsForTesting = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mbc-cqrs-serverless/cli",
-  "version": "0.1.23-beta.0",
+  "version": "0.1.25-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": "7fb8a6963920e0b39cf4d64fafdfd8d68ce6c317"
+  "gitHead": "7c50d386295bdd70d6db5d325e6892f0cb4d9f62"
 }

package/templates/.dockerignore

@@ -0,0 +1,11 @@
+infra
+infra-local
+test
+dist
+dist_layer
+node_modules
+.envrc
+.eslintrc.js
+.prettierrc
+jest.config.js
+README.md

package/templates/Dockerfile

@@ -0,0 +1,32 @@
+FROM node:20-bullseye-slim AS builder
+
+# RUN apk update
+# RUN apk --no-cache add make gcc g++ --virtual .builds-deps build-base python3 musl-dev openssl-dev
+
+WORKDIR /app
+
+COPY package*.json ./
+COPY prisma ./prisma/
+
+RUN npm install
+
+COPY . .
+
+RUN npm run build:prod
+
+FROM node:20-bullseye-slim
+
+# RUN apk update
+# RUN apk --no-cache add make gcc g++ --virtual .builds-deps build-base python3 musl-dev openssl-dev
+
+WORKDIR /app
+
+COPY --from=builder /app/package*.json ./
+COPY prisma ./prisma/
+RUN npm ci --omit=dev
+
+COPY --from=builder /app/dist ./dist
+
+# COPY .env .env
+
+CMD ["npm", "run", "start:prod"]

package/templates/infra/.prettierrc

@@ -0,0 +1,8 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "endOfLine": "auto",
+  "tabWidth": 2,
+  "useTabs": false
+}

package/templates/infra/README.md

@@ -0,0 +1,25 @@
+# Welcome to your CDK TypeScript project
+
+This is a blank project for CDK development with TypeScript.
+
+The `cdk.json` file tells the CDK Toolkit how to execute your app.
+
+## Use SSO profile
+
+```bash
+export AWS_PROFILE=
+```
+
+## Useful commands
+
+- `npm run build` compile typescript to js
+- `npm run watch` watch for changes and compile
+- `npm run test` perform the jest unit tests
+- `cdk deploy` deploy this stack to your default AWS account/region
+- `cdk diff` compare deployed stack with current state
+- `cdk synth` emits the synthesized CloudFormation template
+
+## Useful resources
+
+- https://constructs.dev/
+- https://docs.aws.amazon.com/cdk/v2/guide/best-practices.html

package/templates/infra/asset/schema.graphql

@@ -0,0 +1,32 @@
+type Message @aws_api_key @aws_iam @aws_cognito_user_pools @aws_oidc {
+  id: String!
+  table: String!
+  pk: String!
+  sk: String!
+  tenantCode: String!
+  action: String!
+  content: AWSJSON!
+}
+
+type Query {
+  getMessage(id: String!): Message
+}
+
+type Mutation {
+  sendMessage(message: AWSJSON!): Message! @aws_iam
+}
+
+type Subscription {
+  onMessage(tenantCode: String!, action: String, id: String): Message
+    @aws_subscribe(mutations: ["sendMessage"])
+    @aws_api_key
+    @aws_iam
+    @aws_cognito_user_pools
+    @aws_oidc
+}
+
+schema {
+  query: Query
+  mutation: Mutation
+  subscription: Subscription
+}

package/templates/infra/bin/infra.ts

@@ -0,0 +1,47 @@
+#!/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 { 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,
+  })
+}
+
+app.synth()

package/templates/infra/cdk.json

@@ -0,0 +1,48 @@
+{
+  "app": "npx ts-node --prefer-ts-exts bin/infra.ts",
+  "watch": {
+    "include": ["**"],
+    "exclude": [
+      "README.md",
+      "cdk*.json",
+      "**/*.d.ts",
+      "**/*.jsx",
+      "tsconfig.json",
+      "package*.json",
+      "yarn.lock",
+      "node_modules",
+      "test"
+    ]
+  },
+  "context": {
+    "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
+    "@aws-cdk/core:checkSecretUsage": true,
+    "@aws-cdk/core:target-partitions": ["aws", "aws-cn"],
+    "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
+    "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
+    "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
+    "@aws-cdk/aws-iam:minimizePolicies": true,
+    "@aws-cdk/core:validateSnapshotRemovalPolicy": true,
+    "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true,
+    "@aws-cdk/aws-s3:createDefaultLoggingPolicy": true,
+    "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true,
+    "@aws-cdk/aws-apigateway:disableCloudWatchRole": true,
+    "@aws-cdk/core:enablePartitionLiterals": true,
+    "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true,
+    "@aws-cdk/aws-iam:standardizedServicePrincipals": true,
+    "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true,
+    "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true,
+    "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
+    "@aws-cdk/aws-route53-patters:useCertificate": true,
+    "@aws-cdk/customresources:installLatestAwsSdkDefault": false,
+    "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true,
+    "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true,
+    "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true,
+    "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true,
+    "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true,
+    "@aws-cdk/aws-redshift:columnId": true,
+    "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": true,
+    "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
+    "@aws-cdk/aws-apigateway:requestValidatorUniqueId": true
+  }
+}

package/templates/infra/config/constant.ts

@@ -0,0 +1,8 @@
+export const PIPELINE_NAME = ''
+export const GIT_REPO = ''
+export const GIT_CONNECTION_ARN = ''
+export const ACM_HTTP_CERTIFICATE_ARN = '' // ACM_US_EAST_1
+export const ACM_APPSYNC_CERTIFICATE_ARN = '' // ACM_US_EAST_1
+export const HOSTED_ZONE_ID = ''
+export const HOSTED_ZONE_NAME = ''
+export const COGNITO_URL = ''

package/templates/infra/config/dev/index.ts

@@ -0,0 +1,48 @@
+import { ApplicationLogLevel, SystemLogLevel } from 'aws-cdk-lib/aws-lambda'
+import { Config } from '../type'
+
+const config: Config = {
+  env: 'dev',
+  appName: '',
+
+  domain: {
+    http: '',
+    appsync: '',
+  },
+
+  userPoolId: '',
+
+  vpc: {
+    id: '',
+    subnetIds: [],
+    securityGroupIds: [],
+  },
+  rds: {
+    accountSsmKey: '',
+    endpoint: '',
+    dbName: '',
+  },
+
+  logLevel: {
+    lambdaSystem: SystemLogLevel.DEBUG,
+    lambdaApplication: ApplicationLogLevel.TRACE,
+    level: 'verbose',
+  },
+
+  frontBaseUrl: '',
+  fromEmailAddress: '',
+
+  // wafArn: '',
+
+  // ecs: {
+  //   maxInstances: 1,
+  //   minInstances: 1,
+  //   cpu: 512,
+  //   memory: 1024,
+  //   cpuThreshold: 70,
+  //   scaleStep: 1,
+  //   autoRollback: false,
+  // },
+}
+
+export default config

package/templates/infra/config/index.ts

@@ -0,0 +1,17 @@
+import { Config, Env } from './type'
+import dev from './dev'
+import stg from './stg'
+import prod from './prod'
+
+export function getConfig(env: Env): Config {
+  if (env === 'prod') {
+    return prod
+  }
+  if (env === 'stg') {
+    return stg
+  }
+  return dev
+}
+
+export * from './constant'
+export * from './type'

package/templates/infra/config/prod/index.ts

@@ -0,0 +1,48 @@
+import { SystemLogLevel, ApplicationLogLevel } from 'aws-cdk-lib/aws-lambda'
+import { Config } from '../type'
+
+const config: Config = {
+  env: 'prod',
+  appName: '',
+
+  domain: {
+    http: '',
+    appsync: '',
+  },
+
+  userPoolId: '',
+
+  vpc: {
+    id: '',
+    subnetIds: [],
+    securityGroupIds: [],
+  },
+  rds: {
+    accountSsmKey: '',
+    endpoint: '',
+    dbName: '',
+  },
+
+  logLevel: {
+    lambdaSystem: SystemLogLevel.DEBUG,
+    lambdaApplication: ApplicationLogLevel.TRACE,
+    level: 'info',
+  },
+
+  frontBaseUrl: '',
+  fromEmailAddress: '',
+
+  // wafArn: '',
+
+  // ecs: {
+  //   maxInstances: 2,
+  //   minInstances: 1,
+  //   cpu: 2048,
+  //   memory: 4096,
+  //   cpuThreshold: 70,
+  //   scaleStep: 1,
+  //   autoRollback: true,
+  // },
+}
+
+export default config

package/templates/infra/config/stg/index.ts

@@ -0,0 +1,48 @@
+import { SystemLogLevel, ApplicationLogLevel } from 'aws-cdk-lib/aws-lambda'
+import { Config } from '../type'
+
+const config: Config = {
+  env: 'stg',
+  appName: '',
+
+  domain: {
+    http: '',
+    appsync: '',
+  },
+
+  userPoolId: '',
+
+  vpc: {
+    id: '',
+    subnetIds: [],
+    securityGroupIds: [],
+  },
+  rds: {
+    accountSsmKey: '',
+    endpoint: '',
+    dbName: '',
+  },
+
+  logLevel: {
+    lambdaSystem: SystemLogLevel.DEBUG,
+    lambdaApplication: ApplicationLogLevel.TRACE,
+    level: 'info',
+  },
+
+  frontBaseUrl: '',
+  fromEmailAddress: '',
+
+  // wafArn: '',
+
+  // ecs: {
+  //   maxInstances: 1,
+  //   minInstances: 1,
+  //   cpu: 512,
+  //   memory: 1024,
+  //   cpuThreshold: 70,
+  //   scaleStep: 1,
+  //   autoRollback: true,
+  // },
+}
+
+export default config

package/templates/infra/config/type.ts

@@ -0,0 +1,53 @@
+import { ApplicationLogLevel, SystemLogLevel } from 'aws-cdk-lib/aws-lambda'
+
+export type Env = 'dev' | 'stg' | 'prod'
+
+export type Config = {
+  env: Env
+  appName: string
+
+  // domain
+  domain: {
+    http: string
+    appsync: string
+  }
+
+  // existing resources
+  userPoolId?: string
+
+  vpc: {
+    id: string
+    subnetIds: string[]
+    securityGroupIds: string[]
+  }
+
+  rds: {
+    accountSsmKey: string
+    endpoint: string
+    dbName: string
+  }
+
+  systemAccountSsmKey?: string
+
+  logLevel?: {
+    lambdaSystem?: SystemLogLevel
+    lambdaApplication?: ApplicationLogLevel
+    level?: 'verbose' | 'debug' | 'info' | 'warn' | 'error' | 'fatal'
+  }
+
+  frontBaseUrl: string
+  fromEmailAddress: string
+
+  wafArn?: string
+
+  ecs?: {
+    // https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html
+    maxInstances: number
+    minInstances: number
+    cpu: number
+    memory: number
+    cpuThreshold?: number
+    scaleStep?: number
+    autoRollback?: boolean
+  }
+}

package/templates/infra/gitignore

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

package/templates/infra/jest.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+  testEnvironment: 'node',
+  roots: ['<rootDir>/test'],
+  testMatch: ['**/*.test.ts'],
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+}

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

@@ -0,0 +1,85 @@
+import { execSync } from 'child_process'
+import { existsSync } from 'fs'
+import * as path from 'path'
+import { Env } from '../config'
+
+let isBuild = false
+
+export function buildApp(env: Env, isLocal = false) {
+  const cwd = path.resolve(__dirname, '../..')
+  console.log('build app started with cwd:', env, cwd)
+
+  const layerPath = 'dist_layer'
+  const appPath = 'dist'
+  const layerFullPath = path.resolve(cwd, layerPath)
+  const appFullPath = path.resolve(cwd, appPath)
+
+  if (isLocal || (existsSync(layerFullPath) && existsSync(appFullPath))) {
+    console.log('return from cached build folder')
+    return {
+      layerPath: layerFullPath,
+      appPath: appFullPath,
+    }
+  }
+
+  const runCommand = function (cmd: string) {
+    console.log(cmd)
+    const ret = execSync(cmd, { cwd })
+    console.log(ret.toString())
+  }
+
+  // clean up
+  console.log('============= clean up =============')
+  runCommand(`rm -rf ${layerPath}`)
+  runCommand(`rm -rf ${appPath}`)
+  runCommand(`rm -rf node_modules`)
+
+  // install packages
+  console.log('============= install packages =============')
+  runCommand('npm ci')
+
+  // build nestjs application
+  console.log('============= build nestjs application =============')
+  runCommand('npm run build:prod')
+
+  // remove unnecessary packages
+  console.log('============= remove unnecessary packages =============')
+  runCommand('npm ci --omit=dev --omit=optional')
+  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',
+  )
+  runCommand('rm -rf node_modules/.prisma/client/libquery_engine-*')
+  runCommand(
+    'mv prisma/libquery_engine-linux-arm64-* node_modules/.prisma/client',
+  )
+  runCommand('rm -rf node_modules/prisma/libquery_engine-*')
+  runCommand('rm -rf node_modules/@prisma/engines/**')
+
+  // copy to layer
+  console.log('============= copy to layer =============')
+  const nodejsLayerPath = `${layerPath}/nodejs`
+  runCommand(`mkdir -p ${nodejsLayerPath}`)
+  runCommand(`mv node_modules ${nodejsLayerPath}`)
+
+  console.log('============= build app finished =============')
+
+  if (isLocal) {
+    console.log('============= install local packages =============')
+    runCommand('npm install')
+  }
+
+  isBuild = true
+
+  return {
+    layerPath: layerFullPath,
+    appPath: appFullPath,
+  }
+}