[RELEASE] 250826 릴리즈

.github/CODEOWNERS

@@ -1 +1 @@
-* @Gyuhyeok99 @nayonsoso @wibaek
+* @Gyuhyeok99 @nayonsoso @wibaek @whqtker @lsy1307

.github/workflows/stage-cd.yml → .github/workflows/dev-cd.yml

@@ -1,8 +1,8 @@
-name: "[STAGE] Build Gradle and Deploy"
+name: "[DEV] Build Gradle and Deploy"
 
 on:
   push:
-    branches: [ "release" ]
+    branches: [ "develop" ]
   workflow_dispatch:
 
 jobs:
@@ -38,38 +38,47 @@ jobs:
       - name: Copy jar file to remote
         uses: appleboy/scp-action@master
         with:
-          host: ${{ secrets.STAGE_HOST }}
-          username: ${{ secrets.STAGE_USERNAME }}
-          key: ${{ secrets.STAGE_PRIVATE_KEY }}
+          host: ${{ secrets.DEV_HOST }}
+          username: ${{ secrets.DEV_USERNAME }}
+          key: ${{ secrets.DEV_PRIVATE_KEY }}
           source: "./build/libs/*.jar"
-          target: "/home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage/"
+          target: "/home/${{ secrets.DEV_USERNAME }}/solid-connection-dev/"
 
       - name: Copy docker file to remote
         uses: appleboy/scp-action@master
         with:
-          host: ${{ secrets.STAGE_HOST }}
-          username: ${{ secrets.STAGE_USERNAME }}
-          key: ${{ secrets.STAGE_PRIVATE_KEY }}
+          host: ${{ secrets.DEV_HOST }}
+          username: ${{ secrets.DEV_USERNAME }}
+          key: ${{ secrets.DEV_PRIVATE_KEY }}
           source: "./Dockerfile"
-          target: "/home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage/"
+          target: "/home/${{ secrets.DEV_USERNAME }}/solid-connection-dev/"
 
       - name: Copy docker compose file to remote
         uses: appleboy/scp-action@master
         with:
-          host: ${{ secrets.STAGE_HOST }}
-          username: ${{ secrets.STAGE_USERNAME }}
-          key: ${{ secrets.STAGE_PRIVATE_KEY }}
-          source: "./docker-compose.stage.yml"
-          target: "/home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage/"
+          host: ${{ secrets.DEV_HOST }}
+          username: ${{ secrets.DEV_USERNAME }}
+          key: ${{ secrets.DEV_PRIVATE_KEY }}
+          source: "./docker-compose.dev.yml"
+          target: "/home/${{ secrets.DEV_USERNAME }}/solid-connection-dev/"
+
+      - name: Copy alloy config file to remote
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.DEV_HOST }}
+          username: ${{ secrets.DEV_USERNAME }}
+          key: ${{ secrets.DEV_PRIVATE_KEY }}
+          source: "./docs/infra-config/config.alloy"
+          target: "/home/${{ secrets.DEV_USERNAME }}/solid-connection-dev/"
 
       - name: Run docker compose
         uses: appleboy/ssh-action@master
         with:
-          host: ${{ secrets.STAGE_HOST }}
-          username: ${{ secrets.STAGE_USERNAME }}
-          key: ${{ secrets.STAGE_PRIVATE_KEY }}
+          host: ${{ secrets.DEV_HOST }}
+          username: ${{ secrets.DEV_USERNAME }}
+          key: ${{ secrets.DEV_PRIVATE_KEY }}
           script_stop: true
           script: |
-            cd /home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage
+            cd /home/${{ secrets.DEV_USERNAME }}/solid-connection-dev
             docker compose down
-            docker compose -f docker-compose.stage.yml up -d --build
+            docker compose -f docker-compose.dev.yml up -d --build

.github/workflows/prod-cd.yml

@@ -61,7 +61,16 @@ jobs:
         key: ${{ secrets.PRIVATE_KEY }}
         source: "./docker-compose.prod.yml"
         target: "/home/${{ secrets.USERNAME }}/solid-connect-server/"
-
+
+    - name: Copy alloy config file to remote
+      uses: appleboy/scp-action@master
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+        key: ${{ secrets.PRIVATE_KEY }}
+        source: "./docs/infra-config/config.alloy"
+        target: "/home/${{ secrets.USERNAME }}/solid-connect-server/"
+
     - name: Run docker compose
       uses: appleboy/ssh-action@master
       with:

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+logs/
 
 ### STS ###
 .apt_generated

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.1.5'
     id 'io.spring.dependency-management' version '1.1.4'
+    id 'org.flywaydb.flyway' version '9.16.3'
 }
 
 group = 'com.example'
@@ -31,6 +32,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.flywaydb:flyway-mysql'
+    runtimeOnly 'com.h2database:h2'
 
     // QueryDSL
     implementation 'io.github.openfeign.querydsl:querydsl-jpa:6.11'
@@ -58,10 +60,14 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:mysql'
+    testImplementation 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'org.awaitility:awaitility:4.2.0'
 
     // Etc
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'com.amazonaws:aws-java-sdk-s3:1.12.782'
+    implementation 'org.springframework.boot:spring-boot-starter-websocket'
 }
 
 tasks.named('test', Test) {
@@ -72,3 +78,21 @@ tasks.named('test', Test) {
 sourceSets {
     main.java.srcDirs += ['build/generated/sources/annotationProcessor/java/main']
 }
+
+// build 단계에서 flyway 검증
+flyway {
+    url = 'jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1'
+    user = 'sa'
+    password = ''
+    locations = ['filesystem:src/main/resources/db/migration']
+    validateMigrationNaming = true
+    ignoreMigrationPatterns = ['*:pending']
+}
+
+tasks.named('build') {
+    dependsOn 'flywayValidate'
+}
+
+tasks.named('bootJar') {
+    dependsOn 'flywayValidate'
+}

docker-compose.stage.yml → docker-compose.dev.yml

@@ -19,15 +19,28 @@ services:
       - redis
     network_mode: host
 
-  solid-connection-stage:
+  solid-connection-dev:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: solid-connection-stage
+    container_name: solid-connection-dev
     ports:
       - "8080:8080"
     environment:
-      - SPRING_PROFILES_ACTIVE=stage
+      - SPRING_PROFILES_ACTIVE=dev
+    volumes:
+      - ./logs:/var/log/spring
     depends_on:
       - redis
     network_mode: host
+
+  alloy:
+    image: grafana/alloy:latest
+    container_name: alloy
+    ports:
+      - "12345:12345"
+    volumes:
+      - ./logs:/var/log/spring
+      - ./docs/config.alloy:/etc/alloy/config.alloy:ro
+    environment:
+      - ALLOY_ENV=dev

docker-compose.prod.yml

@@ -28,5 +28,18 @@ services:
       - SPRING_PROFILES_ACTIVE=prod
       - SPRING_DATA_REDIS_HOST=redis
       - SPRING_DATA_REDIS_PORT=6379
+    volumes:
+      - ./logs:/var/log/spring
     depends_on:
       - redis
+
+  alloy:
+    image: grafana/alloy:latest
+    container_name: alloy
+    ports:
+      - "12345:12345"
+    volumes:
+      - ./logs:/var/log/spring
+      - ./docs/config.alloy:/etc/alloy/config.alloy:ro
+    environment:
+      - ALLOY_ENV=production