Dev

.github/workflows/code-analyze-sonarqube.yml

@@ -0,0 +1,61 @@
+name: Code Analyze With SonarQube
+
+run-name: Run code analyze triggered by ${{github.actor}}
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+      - main
+      - dev
+    paths:
+      - 'src/**'
+  push:
+    branches:
+      - dev
+    paths:
+      - 'src/**'
+
+jobs:
+  build:
+    name: Build and analyze
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        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: 'temurin'
+
+      - name: Cache SonarQube packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - name: Build with tests
+        env:
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+        continue-on-error: true
+        run: ./gradlew build --info
+
+      - name: SonarQube Analysis
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+        run: ./gradlew sonar --info

.github/workflows/deploy.yml

@@ -1,10 +1,13 @@
-name: CI/CD Deploy
+name: CI/CD Deploy and Start services
 
-run-name: Deploy springboot as backend image to ECR by ${{github.actor}}
+run-name: Deploy to ECR and Start services by ${{github.actor}}
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+    paths:
+      - 'src/**'
 
 jobs:
   build:
@@ -29,20 +32,31 @@ jobs:
       - name: Build with Gradle Wrapper
         run: ./gradlew build -x test
 
-      - name: Build image
-        run: |
-          docker build -t ${{ secrets.AWS_ORGANIZATION }}/backend .
-          docker tag ${{ secrets.AWS_ORGANIZATION }}/backend:latest ${{ secrets.AWS_ECR_BACKEND_REPO }}:latest
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
         with:
-          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-          aws-region: ${{ secrets.AWS_REGION }}
+          username: ${{secrets.DOCKER_USERNAME}}
+          password: ${{secrets.DOCKER_TOKEN}}
 
-      - name: Login to Amazon ECR
-        uses: aws-actions/amazon-ecr-login@v2
+      - name: Build and Push Docker Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{secrets.DOCKER_USERNAME}}/if-be:latest
 
-      - name: Push image to ECR
-        run: |
-          docker push ${{ secrets.AWS_ECR_BACKEND_REPO }}:latest
+  start-services:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Connect to cloud server and run Docker commands
+        uses: appleboy/ssh-action@v1.2.2
+        with:
+          host: ${{secrets.BACKEND_HOST}}
+          username: ${{secrets.CLOUD_USERNAME}}
+          key: ${{secrets.CLOUD_SECRET_KEY}}
+          port: ${{secrets.CLOUD_PORT}}
+          script: |
+            cd ~
+            /bin/bash run_springboot.sh

build.gradle

@@ -2,6 +2,8 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.4.5'
 	id 'io.spring.dependency-management' version '1.1.7'
+	id "org.sonarqube" version "6.0.1.5171"
+	id 'jacoco'
 }
 
 group = 'com.cleanengine'
@@ -23,6 +25,26 @@ repositories {
 	mavenCentral()
 }
 
+jacoco { //추가함
+	toolVersion = "0.8.13"
+}
+
+jacocoTestReport {
+	dependsOn test
+	reports {
+		xml.required = true
+		html.required = true
+	}
+
+//	afterEvaluate {
+//		getClassDirectories().setFrom(files(classDirectories.files.collect{
+//			fileTree(dir : it, includes: [
+//					"com/cleanengine/coin/realitybot/**"
+//			])
+//		}))
+//	}
+}
+
 dependencies {
 
   implementation 'org.springframework.boot:spring-boot-starter-websocket' // WS + STOMP
@@ -45,8 +67,13 @@ dependencies {
 	runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.springframework.security:spring-security-test'
+	testImplementation 'org.springframework.boot:spring-boot-testcontainers:3.4.5'
+	testImplementation 'org.testcontainers:junit-jupiter'
+	testImplementation 'org.testcontainers:mariadb'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
+	testImplementation 'org.junit.platform:junit-platform-suite:1.10.0'
 	// Spring Security + OAuth2
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
@@ -58,5 +85,22 @@ dependencies {
 }
 
 tasks.named('test') {
-	useJUnitPlatform()
+	useJUnitPlatform{
+		excludeTags 'testcontainers'
+	}
+	finalizedBy jacocoTestReport
 }
+
+sonar {
+  properties {
+    property "sonar.projectKey", "CleanEngine_cleanengine-be_2b6f2f63-fa39-426c-b9c7-8aa127fd14d8"
+    property "sonar.projectName", "cleanengine-be"
+    property "sonar.host.url", System.getenv('SONAR_HOST_URL') ?: 'http://localhost:9000'
+    property "sonar.token", System.getenv('SONAR_TOKEN') ?: ''
+    property "sonar.java.source", '21'
+    property "sonar.java.target", '21'
+    property "sonar.sourceEncoding", "UTF-8"
+    property "sonar.java.coveragePlugin", "jacoco"
+    property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+  }
+}

docker/docker-compose.yml

@@ -0,0 +1,51 @@
+version: '3.8'
+
+services:
+  app:
+    image: eclipse-temurin:21-jre-alpine
+    container_name: my-spring-app
+    volumes:
+      - ../build/libs/coin-0.0.1-SNAPSHOT.jar:/app/coin-0.0.1-SNAPSHOT.jar
+      - /etc/localtime:/etc/localtime:ro
+      - /home/ubuntu/logs/springboot:/app/logs
+    working_dir: /app
+    command: ["java", "-jar", "coin-0.0.1-SNAPSHOT.jar", "--spring.profiles.active=dev,mariadb-local"]
+    ports:
+      - "8080:8080"
+    env_file:
+      - ./local.properties
+    environment:
+      - TZ=Asia/Seoul
+    depends_on:
+      mariadb:
+        condition: service_healthy
+    networks:
+      - app-network
+
+  mariadb:
+    image: mariadb:latest
+    container_name: mariadb
+    ports:
+      - "3306:3306"
+    env_file:
+      - ./local.properties
+    environment:
+      - TZ=Asia/Seoul
+    volumes:
+      - mariadb_data:/var/lib/mysql
+      - ./mariadb/init.sql:/docker-entrypoint-initdb.d/init.sql
+    healthcheck:
+      test: [ "CMD", "healthcheck.sh", "--connect", "--innodb_initialized" ]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+    networks:
+      - app-network
+
+networks:
+  app-network:
+    driver: bridge
+
+volumes:
+  mariadb_data:
+    driver: local