From 0db4c671d4acbe3cb74b0ccb60e9c507d1d12f89 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:01:50 +0000 Subject: [PATCH 1/4] Create draft PR for #693 From 6e228b2d386b2b40e7fc47e8c15443d885d75dac Mon Sep 17 00:00:00 2001 From: Kwoun Ki Ho Date: Mon, 23 Sep 2024 15:08:56 +0900 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20load-test=20profile=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application.yml | 122 +++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index a5f2e8d54..38928eabf 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -106,6 +106,128 @@ management: enabled: true monitoring-profile: develop +--- +spring: + config: + activate: + on-profile: dev + datasource: + url: ${DB_URL} + driver-class-name: com.mysql.cj.jdbc.Driver + username: ${DB_USER} + password: ${DB_PASSWORD} + flyway: + enabled: true + baseline-on-migrate: true + jpa: + show-sql: true + properties: + hibernate: + format_sql: true + dialect: org.hibernate.dialect.MySQL8Dialect + hibernate: + ddl-auto: ${DDL_AUTO} + defer-datasource-initialization: false + +security: + jwt: + token: + secret-key: ${JWT_TOKEN_SECRET_KEY} + expire-length: ${JWT_TOKEN_EXPIRE_CYCLE} + algorithm: ${JWT_SIGN_ALGORITHM} + +cookie: + access-token-key: ${COOKIE_ACCESS_TOKEN_KEY} + http-only: ${COOKIE_HTTP_ONLY} + secure: ${COOKIE_SECURE} + domain: ${COOKIE_DOMAIN} + path: ${COOKIE_PATH} + same-site: ${COOKIE_SAME_SITE} + max-age: ${COOKIE_MAX_AGE} + +dataloader: + enable: true +server: + port: ${SERVER_PORT} + +management: + server: + port: ${MONITORING_PORT} + endpoints: + web: + base-path: ${MONITORING_BASE_PATH} + exposure: + include: prometheus + enabled-by-default: false + jmx: + exposure: + exclude: "*" + endpoint: + prometheus: + enabled: true + +monitoring-profile: develop + +--- +spring: + config: + activate: + on-profile: load-test + datasource: + url: ${DB_URL} + driver-class-name: com.mysql.cj.jdbc.Driver + username: ${DB_USER} + password: ${DB_PASSWORD} + flyway: + enabled: true + baseline-on-migrate: true + jpa: + show-sql: true + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL8Dialect + hibernate: + ddl-auto: ${DDL_AUTO} + defer-datasource-initialization: false + +security: + jwt: + token: + secret-key: ${JWT_TOKEN_SECRET_KEY} + expire-length: ${JWT_TOKEN_EXPIRE_CYCLE} + algorithm: ${JWT_SIGN_ALGORITHM} + +cookie: + access-token-key: ${COOKIE_ACCESS_TOKEN_KEY} + http-only: ${COOKIE_HTTP_ONLY} + secure: ${COOKIE_SECURE} + domain: ${COOKIE_DOMAIN} + path: ${COOKIE_PATH} + same-site: ${COOKIE_SAME_SITE} + max-age: ${COOKIE_MAX_AGE} + +dataloader: + enable: false +server: + port: ${SERVER_PORT} + +management: + server: + port: ${MONITORING_PORT} + endpoints: + web: + base-path: ${MONITORING_BASE_PATH} + exposure: + include: prometheus + enabled-by-default: false + jmx: + exposure: + exclude: "*" + endpoint: + prometheus: + enabled: true + +monitoring-profile: load-test --- spring: From 9a589153452384b53cd134563de6217f04158d4d Mon Sep 17 00:00:00 2001 From: Kwoun Ki Ho Date: Mon, 23 Sep 2024 15:12:32 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=EB=B6=88=ED=95=84=EC=9A=94=20prof?= =?UTF-8?q?ile=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application.yml | 61 ---------------------- 1 file changed, 61 deletions(-) diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 38928eabf..bd977ab4c 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -45,67 +45,6 @@ dataloader: monitoring-profile: local ---- -spring: - config: - activate: - on-profile: dev - datasource: - url: ${DB_URL} - driver-class-name: com.mysql.cj.jdbc.Driver - username: ${DB_USER} - password: ${DB_PASSWORD} - flyway: - enabled: true - baseline-on-migrate: true - jpa: - show-sql: true - properties: - hibernate: - format_sql: true - dialect: org.hibernate.dialect.MySQL8Dialect - hibernate: - ddl-auto: ${DDL_AUTO} - defer-datasource-initialization: false - -security: - jwt: - token: - secret-key: ${JWT_TOKEN_SECRET_KEY} - expire-length: ${JWT_TOKEN_EXPIRE_CYCLE} - algorithm: ${JWT_SIGN_ALGORITHM} - -cookie: - access-token-key: ${COOKIE_ACCESS_TOKEN_KEY} - http-only: ${COOKIE_HTTP_ONLY} - secure: ${COOKIE_SECURE} - domain: ${COOKIE_DOMAIN} - path: ${COOKIE_PATH} - same-site: ${COOKIE_SAME_SITE} - max-age: ${COOKIE_MAX_AGE} - -dataloader: - enable: true -server: - port: ${SERVER_PORT} - -management: - server: - port: ${MONITORING_PORT} - endpoints: - web: - base-path: ${MONITORING_BASE_PATH} - exposure: - include: prometheus - enabled-by-default: false - jmx: - exposure: - exclude: "*" - endpoint: - prometheus: - enabled: true - -monitoring-profile: develop --- spring: config: From 7d9b797e2b34f8fd6e13492ba53762ae8e9d3727 Mon Sep 17 00:00:00 2001 From: Kwoun Ki Ho Date: Mon, 23 Sep 2024 15:31:18 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20load-test=20->=20test=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index bd977ab4c..f9cc3c191 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -111,7 +111,7 @@ monitoring-profile: develop spring: config: activate: - on-profile: load-test + on-profile: test datasource: url: ${DB_URL} driver-class-name: com.mysql.cj.jdbc.Driver @@ -166,7 +166,7 @@ management: prometheus: enabled: true -monitoring-profile: load-test +monitoring-profile: test --- spring: