v2.0.10 (#437)

uwoobeat · web-flow · commit 08e2c873faa6 · 2025-09-26T00:37:21.000+09:00
diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml
@@ -25,21 +25,8 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
 
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:
           arguments: check
           cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
-
-      - name: SonarCloud scan
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew sonar --info --stacktrace
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,6 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.6'
     id 'com.diffplug.spotless' version '6.21.0'
     id 'jacoco'
-    id 'org.sonarqube' version '4.4.1.3373'
 }
 
 group = 'com.depromeet'
@@ -67,8 +66,8 @@ dependencies {
     // Redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
-    // AWS
-    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    // AWS S3
+    implementation 'software.amazon.awssdk:s3:2.26.7'
 
     // Firebase-admin
     implementation 'com.google.firebase:firebase-admin:9.2.0'
@@ -114,21 +113,6 @@ def jacocoExcludePatterns = [
         "**/config/**"
 ]
 
-sonar {
-    properties {
-        property "sonar.projectKey", "depromeet_10mm-server"
-        property "sonar.organization", "depromeet-1"
-        property "sonar.host.url", "https://sonarcloud.io"
-        property 'sonar.sources', 'src'
-        property 'sonar.language', 'java'
-        property 'sonar.sourceEncoding', 'UTF-8'
-        property 'sonar.exclusions', jacocoExcludePatterns.join(',')
-        property 'sonar.test.inclusions', '**/*Test.java'
-        property 'sonar.java.coveragePlugin', 'jacoco'
-        property 'sonar.coverage.jacoco.xmlReportPaths', jacocoDir.get().file("jacoco/index.xml").asFile
-    }
-}
-
 jacoco {
     toolVersion = "0.8.12"
 }
diff --git a/src/main/java/com/depromeet/domain/image/application/ImageService.java b/src/main/java/com/depromeet/domain/image/application/ImageService.java
@@ -1,10 +1,5 @@
 package com.depromeet.domain.image.application;
 
-import com.amazonaws.HttpMethod;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.Headers;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
-import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
 import com.depromeet.domain.image.dao.ImageRepository;
 import com.depromeet.domain.image.domain.Image;
 import com.depromeet.domain.image.domain.ImageFileExtension;
@@ -23,10 +18,9 @@
 import com.depromeet.global.common.constants.UrlConstants;
 import com.depromeet.global.error.exception.CustomException;
 import com.depromeet.global.error.exception.ErrorCode;
+import com.depromeet.global.util.ImageUtil;
 import com.depromeet.global.util.MemberUtil;
 import com.depromeet.global.util.SpringEnvironmentUtil;
-import com.depromeet.infra.config.s3.S3Properties;
-import java.util.Date;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -38,8 +32,7 @@
 public class ImageService {
     private final MemberUtil memberUtil;
     private final SpringEnvironmentUtil springEnvironmentUtil;
-    private final S3Properties s3Properties;
-    private final AmazonS3 amazonS3;
+    private final ImageUtil imageUtil;
     private final MissionRecordRepository missionRecordRepository;
     private final MissionRecordTtlRepository missionRecordTtlRepository;
     private final ImageRepository imageRepository;
@@ -60,13 +53,8 @@ public PresignedUrlResponse createMissionRecordPresignedUrl(
                         request.missionRecordId(),
                         imageKey,
                         request.imageFileExtension());
-        GeneratePresignedUrlRequest generatePresignedUrlRequest =
-                createGeneratePreSignedUrlRequest(
-                        s3Properties.bucket(),
-                        fileName,
-                        request.imageFileExtension().getUploadExtension());
 
-        String presignedUrl = amazonS3.generatePresignedUrl(generatePresignedUrlRequest).toString();
+        String presignedUrl = imageUtil.createPreSignedUrl(fileName, request.imageFileExtension());
 
         missionRecord.updateUploadStatusPending();
         missionRecordTtlRepository.deleteById(request.missionRecordId());
@@ -111,13 +99,9 @@ public PresignedUrlResponse createMemberProfilePresignedUrl(
                         currentMember.getId(),
                         imageKey,
                         request.imageFileExtension());
-        GeneratePresignedUrlRequest generatePresignedUrlRequest =
-                createGeneratePreSignedUrlRequest(
-                        s3Properties.bucket(),
-                        fileName,
-                        request.imageFileExtension().getUploadExtension());
 
-        String presignedUrl = amazonS3.generatePresignedUrl(generatePresignedUrlRequest).toString();
+        String presignedUrl = imageUtil.createPreSignedUrl(fileName, request.imageFileExtension());
+
         imageRepository.save(
                 Image.createImage(
                         ImageType.MEMBER_PROFILE,
@@ -200,26 +184,6 @@ private String createFileName(
                 + imageFileExtension.getUploadExtension();
     }
 
-    private String createUploadImageUrl(
-            ImageType imageType,
-            Long targetId,
-            String imageKey,
-            ImageFileExtension imageFileExtension) {
-        return s3Properties.endpoint()
-                + "/"
-                + s3Properties.bucket()
-                + "/"
-                + springEnvironmentUtil.getCurrentProfile()
-                + "/"
-                + imageType.getValue()
-                + "/"
-                + targetId
-                + "/"
-                + imageKey
-                + "."
-                + imageFileExtension.getUploadExtension();
-    }
-
     private String createReadImageUrl(
             ImageType imageType,
             Long targetId,
@@ -238,28 +202,6 @@ private String createReadImageUrl(
                 + imageFileExtension.getUploadExtension();
     }
 
-    private GeneratePresignedUrlRequest createGeneratePreSignedUrlRequest(
-            String bucket, String fileName, String fileExtension) {
-        GeneratePresignedUrlRequest generatePresignedUrlRequest =
-                new GeneratePresignedUrlRequest(bucket, fileName, HttpMethod.PUT)
-                        .withKey(fileName)
-                        .withContentType("image/" + fileExtension)
-                        .withExpiration(getPreSignedUrlExpiration());
-
-        generatePresignedUrlRequest.addRequestParameter(
-                Headers.S3_CANNED_ACL, CannedAccessControlList.PublicRead.toString());
-
-        return generatePresignedUrlRequest;
-    }
-
-    private Date getPreSignedUrlExpiration() {
-        Date expiration = new Date();
-        var expTimeMillis = expiration.getTime();
-        expTimeMillis += 1000 * 60 * 30;
-        expiration.setTime(expTimeMillis);
-        return expiration;
-    }
-
     private void validateMissionRecordUserMismatch(Mission mission, Member member) {
         if (!mission.getMember().getId().equals(member.getId())) {
             throw new CustomException(ErrorCode.MISSION_RECORD_USER_MISMATCH);
diff --git a/src/main/java/com/depromeet/global/util/ImageUtil.java b/src/main/java/com/depromeet/global/util/ImageUtil.java
@@ -0,0 +1,40 @@
+package com.depromeet.global.util;
+
+import com.depromeet.domain.image.domain.ImageFileExtension;
+import com.depromeet.infra.config.s3.S3Properties;
+import java.time.Duration;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ImageUtil {
+
+    private final S3Presigner s3Presigner;
+    private final S3Properties s3Properties;
+
+    @SneakyThrows
+    public String createPreSignedUrl(String fileName, ImageFileExtension fileExtension) {
+        PutObjectPresignRequest request =
+                PutObjectPresignRequest.builder()
+                        .signatureDuration(Duration.ofMinutes(30))
+                        .putObjectRequest(
+                                builder ->
+                                        builder.bucket(s3Properties.bucket())
+                                                .key(fileName)
+                                                .contentType(getContentType(fileExtension))
+                                                .acl(ObjectCannedACL.PUBLIC_READ))
+                        .build();
+        return s3Presigner.presignPutObject(request).url().toString();
+    }
+
+    private static String getContentType(ImageFileExtension fileExtension) {
+        return "image/" + fileExtension.getUploadExtension();
+    }
+}
diff --git a/src/main/java/com/depromeet/infra/config/s3/S3Config.java b/src/main/java/com/depromeet/infra/config/s3/S3Config.java
@@ -1,31 +1,46 @@
 package com.depromeet.infra.config.s3;
 
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import java.net.URI;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
 
 @Configuration
 @RequiredArgsConstructor
 public class S3Config {
     private final S3Properties s3Properties;
 
+    private AwsBasicCredentials getCredentials() {
+        return AwsBasicCredentials.create(s3Properties.accessKey(), s3Properties.secretKey());
+    }
+
+    private S3Configuration getConfiguration() {
+        return S3Configuration.builder().pathStyleAccessEnabled(true).build();
+    }
+
     @Bean
-    public AmazonS3 amazonS3() {
-        AWSCredentials credentials =
-                new BasicAWSCredentials(s3Properties.accessKey(), s3Properties.secretKey());
-        AwsClientBuilder.EndpointConfiguration endpointConfiguration =
-                new AwsClientBuilder.EndpointConfiguration(
-                        s3Properties.endpoint(), s3Properties.region());
+    public S3Client s3Client() {
+        return S3Client.builder()
+                .endpointOverride(URI.create(s3Properties.endpoint()))
+                .credentialsProvider(StaticCredentialsProvider.create(getCredentials()))
+                .region(Region.of(s3Properties.region()))
+                .serviceConfiguration(getConfiguration())
+                .build();
+    }
 
-        return AmazonS3ClientBuilder.standard()
-                .withEndpointConfiguration(endpointConfiguration)
-                .withCredentials(new AWSStaticCredentialsProvider(credentials))
+    @Bean
+    public S3Presigner s3Presigner() {
+        return S3Presigner.builder()
+                .endpointOverride(URI.create(s3Properties.endpoint()))
+                .credentialsProvider(StaticCredentialsProvider.create(getCredentials()))
+                .region(Region.of(s3Properties.region()))
+                .serviceConfiguration(getConfiguration())
                 .build();
     }
 }
diff --git a/src/main/resources/application-storage.yml b/src/main/resources/application-storage.yml
@@ -3,8 +3,8 @@ spring:
     activate:
       on-profile: "storage"
 storage:
-  accessKey: ${STORAGE_ACCESS_KEY:}
-  secretKey: ${STORAGE_SECRET_KEY:}
-  bucket: ${STORAGE_BUCKET:}
+  accessKey: ${STORAGE_ACCESS_KEY:default}
+  secretKey: ${STORAGE_SECRET_KEY:default}
+  bucket: ${STORAGE_BUCKET:default}
   region: ${STORAGE_REGION:ap-northeast-2}
   endpoint: ${STORAGE_ENDPOINT:https://s3.ap-northeast-2.amazonaws.com}
