현재까지 개발된 사항 메인 브랜치 통합

.github/workflows/ci.cd.prod.yml

@@ -7,24 +7,14 @@ on:
     types:
       - closed
   workflow_dispatch: # 수동 실행 가능
-
-
 # 병합됐을 때 
 jobs:
-  deploy:
+  Build:
     runs-on: ubuntu-latest
     steps:
       # 체크아웃
       - uses: actions/checkout@v4
 
-      # AWS 인증 (IAM 사용자 Access Key, Secret Key 활용)
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
-
       # Gradle 권한 설정
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
@@ -36,6 +26,22 @@ jobs:
           java-version: 21
           distribution: 'temurin'
 
+      # application.yml 운영 환경 용 생성
+      - name: Make application.yml
+        run: |
+          mkdir -p ./src/main/resources
+          chmod -R 777 ./src/main/resources
+          cd ./src/main/resources
+
+          touch ./application.yml
+          touch ./application-prod.yml
+          touch ./application-prod-secret.yml          
+
+          echo "${{ secrets.PROD_COMMON }}" | base64 --decode > ./application.yml
+          echo "${{ secrets.PROD }}" | base64 --decode > ./application-prod.yml
+          echo "${{ secrets.PROD_SECRET }}" | base64 --decode > ./application-prod-secret.yml
+
+
       # Gradle cache 설정
       - name: Cache Gradle packages
         uses: actions/cache@v4
@@ -44,29 +50,89 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
 
-      # Gradle build (우선 Test 제외)
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+      - name: MySQL 컨테이너 실행
+        run: |
+          docker run --name log4u-mysql \
+            -e MYSQL_ROOT_PASSWORD=root \
+            -e MYSQL_DATABASE=log4u \
+            -e MYSQL_USER=dev \
+            -e MYSQL_PASSWORD=devcos4-team08 \
+            -d \
+            -p 3307:3306 \
+            mysql:8.0.33
+
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          DB_URL: jdbc:mysql://localhost:3307/log4u
+          DB_USERNAME: dev
+          DB_PASSWORD: devcos4-team08
+
+        # 테스트용으로 dev 프로필 사용(시크릿 제외하고 prod 와 동일)
+        run: |
+          chmod +x ./gradlew        
+          ./gradlew build jacocoTestReport -Pprofile=dev 
+
+      - name: Docker MySQL 종료 및 제거
+        run: |
+          docker stop log4u-mysql
+          docker rm log4u-mysql
+
+      # AWS 인증 (IAM 사용자 Access Key, Secret Key 활용)
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
         with:
-          arguments: clean build -x test
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
 
+      - name: Secret 파일 수동 생성
+        run: |
+          mkdir -p ./src/main/resources
+          echo "${{ secrets.PROD_SECRET }}" | base64 --decode > ./src/main/resources/application-prod-secret.yml
+
+          mkdir -p ./deploy-package/src/main/resources
+          rsync -av --exclude='deploy-package' ./ ./deploy-package
+          cp ./src/main/resources/application-prod-secret.yml ./deploy-package/src/main/resources/application-prod-secret.yml
+
+      - name: 빌드 결과 수동 생성
+        run: |
+          mkdir -p ./deploy-package/build/libs
+          cp build/libs/Log4U-0.0.1-SNAPSHOT.jar ./deploy-package/build/libs/
 
       # 빌드 결과물을 S3 버킷에 업로드
       - name: Upload to AWS S3
         run: |
           aws deploy push \
             --application-name ${{ secrets.CODE_DEPLOY_APP_NAME }} \
             --ignore-hidden-files \
-            --s3-location s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \
-            --source .
+            --s3-location s3://${{ secrets.S3_BUCKET_NAME }}/prod/${{ github.sha }}.zip \
+            --source ./deploy-package
 
       # S3 버킷에 있는 파일을 대상으로 CodeDeploy 실행
-      - name: Deploy to AWS EC2 from S3
+      - name: Deploy to AWS EC2 from S3g
         run: |
           aws deploy create-deployment \
             --application-name ${{ secrets.CODE_DEPLOY_APP_NAME }} \
             --deployment-config-name CodeDeployDefault.AllAtOnce \
             --deployment-group-name ${{ secrets.CODE_DEPLOY_DEPLOYMENT_GROUP_NAME }} \
-            --s3-location bucket=$S3_BUCKET_NAME,key=$GITHUB_SHA.zip,bundleType=zip
-
-
+            --s3-location bucket=${{ secrets.S3_BUCKET_NAME }},key=prod/${{ github.sha }}.zip,bundleType=zip 
+
+# 향후 빌드 파일 개선용 주석
+# - name: 필요한 파일 수동 생성
+#  run: |
+#    mkdir -p ./deploy-package/src/main/resources
+#
+#    # appspec.yml 복사
+#    cp ./appspec.yml ./deploy-package/
+#    
+#    # scripts 디렉토리 및 내부 .sh 파일 복사
+#    cp -r ./scripts/*.sh ./deploy-package/
+#    
+#    # yml 복사
+#    cp ./src/main/resources/application*.yml ./deploy-package/
+#    
+#    # jar 복사
+#    cp ./build/libs/Log4U-0.0.1-SNAPSHOT.jar ./deploy-package/
+

.github/workflows/code-review-claude.yml

@@ -2,7 +2,10 @@ name: Code Review from Claude
 
 on:
   pull_request:
-    types: [opened, synchronize]
+    # dev에 pr 할때만 리뷰
+    branches:
+      - develop
+    types: [ opened, synchronize ]
 
 permissions:
   contents: read

.github/workflows/dev-build.yml

@@ -0,0 +1,72 @@
+name: log4u-dev-build
+on:
+  pull_request:
+    branches:
+      - develop # develop pr
+    types: [ opened, synchronize, reopened ]
+  workflow_dispatch:
+jobs:
+  build:
+    name: Build and analyze
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'zulu' # Alternative distribution options are available
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+
+      - name: MySQL 컨테이너 실행
+        run: |
+          docker run --name log4u-mysql \
+            -e MYSQL_ROOT_PASSWORD=root \
+            -e MYSQL_DATABASE=log4u \
+            -e MYSQL_USER=dev \
+            -e MYSQL_PASSWORD=devcos4-team08 \
+            -d \
+            -p 3307:3306 \
+            mysql:8.0.33
+
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          DB_URL: jdbc:mysql://localhost:3307/log4u
+          DB_USERNAME: dev
+          DB_PASSWORD: devcos4-team08
+
+        # dev 프로필 사용
+        run: |
+          chmod +x ./gradlew
+          # 소나클라우드 임시 비활성화 ./gradlew build jacocoTestReport sonar --info -Pprofile=dev -Dsonar.branch.name=${{ github.ref_name }}
+          ./gradlew build jacocoTestReport -Pprofile=dev 
+
+      - name: Docker MySQL 종료 및 제거
+        run: |
+          docker stop log4u-mysql
+          docker rm log4u-mysql
+
+      - name: Upload Test Report
+        uses: actions/upload-artifact@v4
+        with:
+          name: problems-report
+          path: build/reports/problems/problems-report.html

.gitignore

@@ -35,3 +35,6 @@ out/
 
 ### VS Code ###
 .vscode/
+/src/main/resources/application-secret.yml
+/src/main/resources/application-prod-secret.yml
+/src/main/resources/application-dev-secret.yml

README.md

@@ -0,0 +1,23 @@
+## 개발 환경 설정
+
+[AWS API SERVER](http://ec2-13-209-127-186.ap-northeast-2.compute.amazonaws.com)
+---
+
+* 루트 디렉토리(WEB3_4_Log4U_BE)에서 다음 명령 실행
+* 개발용 MYSQL 빌드
+
+```
+# 이미지 빌드
+cd docker
+docker build -t log4u-mysql .
+
+# 최초 실행 1(볼륨 존재)
+docker run -d --name log4u-mysql -p 3307:3306 -v {file}:/var/lib/mysql log4u-mysql
+
+# 최초 실행 2(볼륨 없이)
+docker run -d --name log4u-mysql -p 3307:3306  log4u-mysql
+
+# 이미 존재할 경우 
+docker start log4u-mysql
+
+```

appspec.yml

@@ -3,7 +3,7 @@ os: linux
 
 files:
   - source: /
-    destination: /home/ubuntu/build
+    destination: /home/ubuntu/app
     overwrite: yes
 
 permissions:
@@ -13,16 +13,11 @@ permissions:
     group: ubuntu
 
 hooks:
-  AfterInstall:
+  ApplicationStop:
     - location: scripts/stop.sh
       timeout: 2000
       runas: ubuntu
 
-  AfterInstall:
-    - location: scripts/docker-start.sh
-      timeout: 2000
-      runas: ubuntu
-
   ApplicationStart:
     - location: scripts/deploy.sh
       timeout: 2000