⚡ MarkSphere v1.0.12

스케줄링 코드 AWS Lambda, CloudWatch로 이전
CloudFront 도입

Author: son0307

scripts/deploy.sh

@@ -11,6 +11,7 @@ export AWS_ACCESS_KEY=$(aws ssm get-parameter --name "/marksphere/aws-access-key
 export AWS_SECRET_KEY=$(aws ssm get-parameter --name "/marksphere/aws-secret-key" --with-decryption --query "Parameter.Value" --output text)
 export REDIS_HOST=$(aws ssm get-parameter --name "/marksphere/redis-host" --with-decryption --query "Parameter.Value" --output text)
 export LAMBDA_FUNCTION_NAME=$(aws ssm get-parameter --name "/marksphere/lambda-function-name" --with-decryption --query "Parameter.Value" --output text)
+export AWS_CLOUDFRONT_DOMAIN=$(aws ssm get-parameter --name "/marksphere/aws-cloudfront-domain" --with-decryption --query "Parameter.Value" --output text)
 
 JAR_NAME=$(ls $REPOSITORY/build/libs/ | grep '.jar' | tail -n 1)
 JAR_PATH=$REPOSITORY/build/libs/$JAR_NAME

src/main/java/com/sonkim/bookmarking/common/s3/service/S3Service.java

@@ -12,15 +12,13 @@
 import software.amazon.awssdk.services.lambda.model.InvokeRequest;
 import software.amazon.awssdk.services.lambda.model.InvokeResponse;
 import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.presigner.S3Presigner;
-import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
-import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
 import software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest;
 import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest;
 
-import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
@@ -39,6 +37,9 @@ public class S3Service {
     @Value("${aws.lambda.function-name}")
     private String lambdaFunctionName;
 
+    @Value("${aws.cloudfront.domain}")
+    private String cloudFrontDomain;
+
     public S3Service(S3Client s3Client, @Value("${aws.s3.bucket-name}") String bucketName, S3Presigner s3Presigner, LambdaClient lambdaClient, ObjectMapper objectMapper) {
         this.s3Client = s3Client;
         this.bucketName = bucketName;
@@ -47,19 +48,16 @@ public S3Service(S3Client s3Client, @Value("${aws.s3.bucket-name}") String bucke
         this.objectMapper = objectMapper;
     }
 
-    public URL generatePresignedGetUrl(String prefix, String key) {
-        GetObjectRequest getObjectRequest = GetObjectRequest.builder()
-                .bucket(bucketName)
-                .key(prefix + key)
-                .build();
-
-        GetObjectPresignRequest getObjectPresignRequest = GetObjectPresignRequest.builder()
-                .signatureDuration(Duration.ofMinutes(10))
-                .getObjectRequest(getObjectRequest)
-                .build();
+    public String generateImageUrl(String prefix, String key) {
+        try {
+            String encodedKey = URLEncoder.encode(key, StandardCharsets.UTF_8)
+                    .replace("+", "%20");
 
-        PresignedGetObjectRequest presignedGetObjectRequest = s3Presigner.presignGetObject(getObjectPresignRequest);
-        return presignedGetObjectRequest.url();
+            return cloudFrontDomain + "/" + prefix + encodedKey;
+        } catch (Exception e) {
+            log.error("Failed to encode key: {}", key, e);
+            return cloudFrontDomain + "/" + prefix + key;
+        }
     }
 
     public PresignedUrlDto generatePresignedPutUrl(String fileName) {

src/main/java/com/sonkim/bookmarking/common/scheduler/S3CleanupScheduler.java

@@ -323,7 +323,7 @@ public List<BookmarkResponseDto> enrichBookmarksWithDetails(List<Bookmark> bookm
 
     private String getFinalImageUrl(Bookmark bookmark) {
         if (bookmark.getImageKey() != null) {
-            return s3Service.generatePresignedGetUrl("bookmarks/", bookmark.getImageKey()).toString();
+            return s3Service.generateImageUrl("bookmarks/", bookmark.getImageKey());
         } else if (bookmark.getOriginalImageUrl() != null) {
             return bookmark.getOriginalImageUrl();
         }

src/main/java/com/sonkim/bookmarking/common/scheduler/TagCleanupScheduler.java

@@ -216,7 +216,7 @@ private CommentDto.AuthorInfo getAuthorInfo(User user) {
         String imageKey = user.getProfile().getImageKey();
 
         if (imageKey != null && !imageKey.isBlank()) {
-            imageUrl = s3Service.generatePresignedGetUrl("profile-images/", imageKey).toString();
+            imageUrl = s3Service.generateImageUrl("profile-images/", imageKey);
         }
 
         return CommentDto.AuthorInfo.builder()

src/main/java/com/sonkim/bookmarking/common/scheduler/TeamCleanupScheduler.java

@@ -53,7 +53,7 @@ public MyProfileDto.MyProfileResponseDto getMyProfile(Long userId) {
         String imageKey = user.getProfile().getImageKey();
 
         if (imageKey != null) {
-            imageUrl = s3Service.generatePresignedGetUrl("profile-images/", imageKey).toString();
+            imageUrl = s3Service.generateImageUrl("profile-images/", imageKey);
         }
 
         // DTO로 변환하여 반환

src/main/java/com/sonkim/bookmarking/domain/bookmark/service/BookmarkService.java

@@ -78,7 +78,7 @@ public List<TeamMemberDto.MemberResponseDto> getTeamMembers(Long teamId) {
                     String imageUrl = null;
                     String imageKey = member.getUser().getProfile().getImageKey();
                     if (imageKey != null && !imageKey.isBlank()) {
-                        imageUrl = s3Service.generatePresignedGetUrl("profile-images/", member.getUser().getProfile().getImageKey()).toString();
+                        imageUrl = s3Service.generateImageUrl("profile-images/", member.getUser().getProfile().getImageKey());
                     }
 
                     return TeamMemberDto.MemberResponseDto.builder()

src/main/java/com/sonkim/bookmarking/domain/comment/service/CommentService.java

@@ -27,6 +27,9 @@ aws.s3.bucket-name=socialbookmarking-bucket
 # AWS Lambda
 aws.lambda.function-name=${LAMBDA_FUNCTION_NAME}
 
+# AWS CloudFront
+aws.cloudfront.domain=${AWS_CLOUDFRONT_DOMAIN}
+
 spring.data.redis.host=${REDIS_HOST}
 spring.data.redis.port=6379