Skip to content

Commit 53967e3

Browse files
committed
Merge branch 'development'
2 parents 326b344 + d5174d3 commit 53967e3

File tree

58 files changed

+976
-606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+976
-606
lines changed

infrastructure/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "velog",
33
"main": "/src/index.ts",
44
"scripts": {
5-
"ssm": "tsx ./scripts/ssm.ts",
6-
"build": "tsc"
5+
"ssm": "tsx ./scripts/ssm.ts"
76
},
87
"dependencies": {
98
"@aws-sdk/client-ecr": "^3.413.0",

infrastructure/src/common/ecs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ export const createECSfargateService = ({
4646
container: {
4747
// name: withPrefix(`${packageType}-container`),
4848
image: imageUri,
49-
cpu: option.cpu,
50-
memory: option.memory,
49+
cpu: option.containerCpu,
50+
memory: option.containerMemory,
5151
essential: true,
5252
portMappings: [{ targetGroup: targetGroup }],
5353
environment: [

infrastructure/src/lib/ecsOptions.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
import { ENV } from '../env'
22

3-
const serverEcsOption: EcsOption = {
3+
const webEcsOption: EcsOption = {
44
desiredCount: ENV.isProduction ? 2 : 1,
5-
cpu: ENV.isProduction ? 512 : 512,
6-
memory: 1024,
5+
containerCpu: ENV.isProduction ? 1024 : 512,
6+
containerMemory: ENV.isProduction ? 2048 : 1024,
77
maxCapacity: 12,
88
minCapacity: ENV.isProduction ? 2 : 1,
99
}
1010

11-
const webEcsOption: EcsOption = {
11+
const serverEcsOption: EcsOption = {
1212
desiredCount: ENV.isProduction ? 2 : 1,
13-
cpu: ENV.isProduction ? 1024 : 512,
14-
memory: ENV.isProduction ? 2048 : 1024,
13+
containerCpu: ENV.isProduction ? 1024 : 512,
14+
containerMemory: 1024,
1515
maxCapacity: 12,
1616
minCapacity: ENV.isProduction ? 2 : 1,
1717
}
1818

1919
const cronEcsOption: EcsOption = {
20-
desiredCount: 1,
21-
cpu: 512,
22-
memory: 1024,
20+
desiredCount: ENV.isProduction ? 1 : 0,
21+
containerCpu: ENV.isProduction ? 1024 : 512,
22+
containerMemory: 1024,
2323
maxCapacity: 1,
24-
minCapacity: 1,
24+
minCapacity: ENV.isProduction ? 1 : 0,
2525
}
2626

2727
export const ecsOption = {
@@ -32,8 +32,8 @@ export const ecsOption = {
3232

3333
type EcsOption = {
3434
desiredCount: number
35-
cpu: number
36-
memory: number
35+
containerCpu: number
36+
containerMemory: number
3737
maxCapacity: number
3838
minCapacity: number
3939
}

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
"prepare": "husky install",
88
"format": "pnpm format --write .",
99
"precommit": "lint-staged",
10-
"dev": "pnpm -r dev"
10+
"dev": "pnpm -r dev",
11+
"build": "pnpm -r build",
12+
"prisma:init": "pnpm -r prisma:copy && pnpm -r prisma:generate"
1113
},
1214
"engines": {
1315
"node": ">=18.16",

packages/velog-common/.eslintrc.cjs

Lines changed: 0 additions & 24 deletions
This file was deleted.

packages/velog-common/package.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

packages/velog-common/scripts/createService.ts

Lines changed: 0 additions & 93 deletions
This file was deleted.

packages/velog-common/scripts/templates/lib/My.test.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/velog-common/scripts/templates/lib/MyService.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

packages/velog-common/scripts/templates/services/My.test.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/velog-common/scripts/templates/services/index.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

packages/velog-common/src/index.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

packages/velog-common/src/lib/redis/Redis.test.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/velog-common/src/lib/redis/RedisService.ts

Lines changed: 0 additions & 54 deletions
This file was deleted.

packages/velog-common/tsconfig.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

packages/velog-cron/.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
env/*
22
!env/.env.example
33

4-
54
prisma
65

7-
dist
6+
dist
7+
8+
# spam test data
9+
spam_post.json

packages/velog-cron/env/.env.example

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
PORT=
22
DATABASE_URL=
33
CRON_API_KEY=
4-
REDIS_HOST=
4+
REDIS_HOST=
5+
DISCORD_BOT_TOKEN=
6+
DISCORD_STATS_CHANNEL=
7+
DISCORD_SPAM_CHANNEL=

0 commit comments

Comments
 (0)