Merge branch 'development'

Author: winverse

infrastructure/Pulumi.production.yaml

@@ -1,4 +1,4 @@
 config:
   aws:region: ap-northeast-2
   velog:DOCKER_ENV: production
-  velog:target: server
+  velog:target: cron

infrastructure/Pulumi.stage.yaml

@@ -1,4 +1,4 @@
 config:
   aws:region: ap-northeast-2
   velog:DOCKER_ENV: stage
-  velog:target: server
+  velog:target: server,web

infrastructure/src/common/ecs.ts

@@ -40,6 +40,8 @@ export const createECSfargateService = ({
         subnets: subnetIds,
       },
       taskDefinitionArgs: {
+        cpu: option.taskCpu,
+        memory: option.taskMemory,
         executionRole: {
           roleArn: ecsTaskExecutionRole.arn,
         },

infrastructure/src/lib/ecsOptions.ts

@@ -1,37 +1,91 @@
 import { ENV } from '../env'
 
-const webEcsOption: EcsOption = {
-  desiredCount: ENV.isProduction ? 2 : 1,
-  containerCpu: ENV.isProduction ? 1024 : 512,
-  containerMemory: ENV.isProduction ? 2048 : 1024,
+// fargate cpu memory combination
+// See: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html
+// 0.25 vCPU : 0.5 GB ~ 2 GB
+// 0.5 vCPU : 1 GB ~ 4 GB
+// 1 vCPU : 2 GB ~ 8 GB
+// 2 vCPU : 4 GB ~ 16 GB
+// 4 vCPU : 8 GB ~ 30 GB
+
+const webProdEcsOption: EcsBaseOption = {
+  desiredCount: 2,
+  cpu: 1, // unit 1024
+  memory: 2, // unit 1024
+  maxCapacity: 12,
+  minCapacity: 2,
+}
+
+const webStageEcsOption: EcsBaseOption = {
+  desiredCount: 1,
+  cpu: 0.5, // unit 1024
+  memory: 1, // unit 1024
   maxCapacity: 12,
-  minCapacity: ENV.isProduction ? 2 : 1,
+  minCapacity: 1,
 }
 
-const serverEcsOption: EcsOption = {
-  desiredCount: ENV.isProduction ? 2 : 1,
-  containerCpu: ENV.isProduction ? 1024 : 512,
-  containerMemory: 1024,
+const serverProdEcsOption: EcsBaseOption = {
+  desiredCount: 2,
+  cpu: 0.5, // unit 1024
+  memory: 1, // unit 1024
   maxCapacity: 12,
-  minCapacity: ENV.isProduction ? 2 : 1,
+  minCapacity: 2,
 }
 
-const cronEcsOption: EcsOption = {
-  desiredCount: ENV.isProduction ? 1 : 0,
-  containerCpu: ENV.isProduction ? 1024 : 512,
-  containerMemory: 1024,
+const serverStageEcsOption: EcsBaseOption = {
+  desiredCount: 1,
+  cpu: 0.25, // unit 1024
+  memory: 1, // unit 1024
+  maxCapacity: 12,
+  minCapacity: 1,
+}
+
+const cronProdEcsOption: EcsBaseOption = {
+  desiredCount: 1,
+  cpu: 1, // unit 1024
+  memory: 2, // unit 1024
   maxCapacity: 1,
-  minCapacity: ENV.isProduction ? 1 : 0,
+  minCapacity: 1,
+}
+
+const cronStageEcsOption: EcsBaseOption = {
+  desiredCount: 0,
+  cpu: 0.25, // unit 1024
+  memory: 0.5, // unit 1024
+  maxCapacity: 0,
+  minCapacity: 0,
 }
 
 export const ecsOption = {
-  web: webEcsOption,
-  server: serverEcsOption,
-  cron: cronEcsOption,
+  web: generateEcsOption(ENV.isProduction ? webProdEcsOption : webStageEcsOption),
+  server: generateEcsOption(ENV.isProduction ? serverProdEcsOption : serverStageEcsOption),
+  cron: generateEcsOption(ENV.isProduction ? cronProdEcsOption : cronStageEcsOption),
+}
+
+function generateEcsOption(option: EcsBaseOption): EcsOption {
+  return {
+    desiredCount: option.desiredCount,
+    taskCpu: `${option.cpu} vCPU`,
+    taskMemory: `${option.memory} GB`,
+    containerCpu: 1024 * option.cpu,
+    containerMemory: 1024 * option.memory,
+    maxCapacity: option.maxCapacity,
+    minCapacity: option.minCapacity,
+  }
+}
+
+type EcsBaseOption = {
+  desiredCount: number
+  cpu: number
+  memory: number
+  maxCapacity: number
+  minCapacity: number
 }
 
 type EcsOption = {
   desiredCount: number
+  taskCpu: string
+  taskMemory: string
   containerCpu: number
   containerMemory: number
   maxCapacity: number

packages/velog-cron/src/services/PostService/index.ts

@@ -273,10 +273,14 @@ export class PostService implements Service {
     }
 
     const notAlphanumbericKorean = replaced.replace(/[a-zA-Zㄱ-힣0-9]/g, '') // remove korean
-    if (notAlphanumbericKorean.length / replaced.length > 0.35) {
+    if (notAlphanumbericKorean.length / replaced.length > 0.3) {
       score++
     }
 
+    if (!isForeign) {
+      score--
+    }
+
     const initScore = score
     const usedBannedAltKeywords: string[] = []
     for (const { value: keyword } of bannedAltKeywords) {
@@ -295,10 +299,10 @@ export class PostService implements Service {
         }
       }
 
-      if (score >= 3) {
+      if (score >= 4) {
         return {
           isSpam: true,
-          reason: `initScore: ${initScore}, foreign,  ${'bannedAltKeywords: '.concat(
+          reason: `initScore: ${initScore}, ${'bannedAltKeywords: '.concat(
             usedBannedAltKeywords.join(','),
           )}`,
         }

packages/velog-web/src/features/home/components/HomeTab/HomeTab.tsx

@@ -60,7 +60,7 @@ function HomeTab({ isFloatingHeader = false }: Props) {
           <motion.div
             initial={false}
             animate={{
-              left: isFeed ? '68.33%' : isRecent ? '38.33%' : '2%',
+              left: isFeed ? '70.33%' : isRecent ? '38.33%' : '2%',
             }}
             className={cx('indicator')}
           />