refactor : 운영환경별 YML 분리 및 배포 환경 설정 구조 개선

Author: taekkong

.github/workflows/test-server-cd.yml

@@ -60,6 +60,7 @@ jobs:
               --name $NEW_CONTAINER \
               --network common \
               -e SPRING_PROFILES_ACTIVE=server \
+              # DB
               -e SPRING_DATASOURCE_URL="${{secrets.TEST_DB_URL}}" \
               -e SPRING_DATASOURCE_USERNAME="${{secrets.TEST_DB_USERNAME}}" \
               -e SPRING_DATASOURCE_PASSWORD="${{secrets.TEST_DB_PASSWORD}}" \
@@ -72,7 +73,8 @@ jobs:
               -e SPRING_RABBITMQ_USERNAME="${{secrets.TEST_RABBITMQ_USERNAME}}" \
               -e SPRING_RABBITMQ_PASSWORD="${{secrets.TEST_RABBITMQ_PASSWORD}}" \
               # Redis
-              -e redis-password-test="${{secrets.TEST_REDIS_PASSWORD}}" \
+              -e REDIS_HOST="${{secrets.TEST_REDIS_HOST}}" \
+              -e REDIS_PASSWORD="${{secrets.TEST_REDIS_PASSWORD}}" \
               # OAuth2
               -e kakao.client-id="${{secrets.OAUTH_KAKAO_CLIENT_ID}}" \
               -e google.client-id="${{secrets.OAUTH_GOOGLE_CLIENT_ID}}" \

src/main/resources/application-server.yml

@@ -10,10 +10,10 @@ spring:
 
   data: #RedisTemplate 등을 사용하기 위한 직접 연결용
     redis:
-      host: }
+      host: ${REDIS_HOST}
       port: 6379
       timeout: 6000
-      password: ${redis-password}
+      password: ${REDIS_PASSWORD}
   cache: #Spring Cache를 사용하기 위한 Redis
     type: redis
     redis:
@@ -38,3 +38,4 @@ sentry:
   send-default-pii: true
   environment: prod
   traces-sample-rate: 0.2
+

src/main/resources/application.yml

@@ -1,32 +1,42 @@
 spring:
   application:
     name: back
+
   profiles:
     active: dev
+
   output:
     ansi:
       enabled: always
+
   datasource:
     hikari:
       auto-commit: false
+
   jackson:
     serialization:
       fail-on-empty-beans: false
+
   jpa:
     show-sql: true
     hibernate:
       ddl-auto: create-drop
+
     properties:
       hibernate:
         format_sql: true
         highlight_sql: true
         use_sql_comments: true
+
   config:
     import: optional:classpath:application-secrets.yml
+
   servlet:
     multipart:
       max-file-size: 10MB
       max-request-size: 10MB
+
+  # Spring AI 설정
   ai:
     openai:
       base-url: https://api.groq.com/openai # 내부 서버를 groq으로
@@ -35,6 +45,8 @@ spring:
         options:
           model: meta-llama/llama-4-scout-17b-16e-instruct
           temperature: 0
+
+  # RabbitMQ 설정
   rabbitmq:
     host: ${SPRING_RABBITMQ_HOST:localhost}
     port: 5672
@@ -46,19 +58,63 @@ spring:
           enabled: true
           initial-interval: 2000
           max-attempts: 3
+
   data: #RedisTemplate 등을 사용하기 위한 직접 연결용
     redis:
       host: localhost
       port: 6379
       timeout: 6000
-      password: ${redis-password}
+
   cache: #Spring Cache를 사용하기 위한 Redis
     type: redis
     redis:
       time-to-live: 300000
       cache-null-values: false
       key-prefix:
 
+  #OAuth2 설정
+  security:
+    oauth2:
+      client:
+        registration:
+          kakao:
+            client-id: ${kakao.client-id}
+            scope:
+              - profile_nickname
+              - profile_image
+            authorization-grant-type: authorization_code
+          google:
+            client-id: ${google.client-id}
+            client-secret: ${google.client-secret}
+            scope:
+              - profile
+            authorization-grant-type: authorization_code
+        provider:
+          kakao:
+            authorization-uri: https://kauth.kakao.com/oauth/authorize
+            token-uri: https://kauth.kakao.com/oauth/token
+            user-info-uri: https://kapi.kakao.com/v2/user/me
+            user-name-attribute: id
+          google:
+            authorization-uri: https://accounts.google.com/o/oauth2/v2/auth
+            token-uri: https://oauth2.googleapis.com/token
+            user-info-uri: https://www.googleapis.com/oauth2/v3/userinfo
+            user-name-attribute: sub
+
+  #S3 설정
+  cloud:
+    aws:
+      credentials:
+        access-key: ${aws.access-key}
+        secret-key: ${aws.secret-key}
+      region:
+        static: ap-northeast-2
+      s3:
+        bucket: ${aws.bucket}
+      stack:
+        auto: false
+
+#Spring doc 설정
 springdoc:
   default-produces-media-type: application/json;charset=UTF-8
 logging:
@@ -93,3 +149,9 @@ jwt:
   access-token-validity: ${JWT_ACCESS_TOKEN_VALIDITY}
   refresh-token-validity: ${JWT_REFRESH_TOKEN_VALIDITY}
 
+naver:
+  client_id: ${NAVER_CLIENT_ID}
+  client_secret: ${NAVER_CLIENT_SECRET}
+
+liveblocks:
+  secret-key: ${liveblocks-secret-key}