⚡ MarkSphere v1.0.15

AWS EC2 -> OCI
AWS RDS -> TiDB
AWS S3 -> Cloudflare R2
AWS CloudFront -> Cloudflare CDN
AWS Route 53 -> Cloudflare DNS
아키텍처 변경

Author: son0307

src/main/java/com/sonkim/bookmarking/common/config/S3Config.java

@@ -11,40 +11,53 @@
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.presigner.S3Presigner;
 
+import java.net.URI;
+
 @Configuration
 public class S3Config {
 
-    @Value("${aws.s3.accessKeyId}")
-    private String accessKeyId;
+    @Value("${cloud.r2.credentials.access-key}")
+    private String r2AccessKey;
+
+    @Value("${cloud.r2.credentials.secret-key}")
+    private String r2SecretKey;
+
+    @Value("${cloud.r2.endpoint}")
+    private String endpoint;
 
-    @Value("${aws.s3.secretAccessKey}")
-    private String secretAccessKey;
+    @Value("${aws.lambda.access-key}")
+    private String lambdaAccessKey;
+
+    @Value("${aws.lambda.scret-key}")
+    private String lambdaSecretKey;
 
     @Bean
     public S3Client s3Client() {
-        AwsBasicCredentials credentials = AwsBasicCredentials.create(accessKeyId, secretAccessKey);
+        AwsBasicCredentials credentials = AwsBasicCredentials.create(r2AccessKey, r2SecretKey);
         AwsCredentialsProvider provider = StaticCredentialsProvider.create(credentials);
 
         return S3Client.builder()
-                .region(Region.AP_NORTHEAST_2)
+                .region(Region.of("auto"))
+                .endpointOverride(URI.create(endpoint))
                 .credentialsProvider(provider)
                 .build();
     }
 
     @Bean
     public S3Presigner s3Presigner() {
-        AwsBasicCredentials credentials = AwsBasicCredentials.create(accessKeyId, secretAccessKey);
+        AwsBasicCredentials credentials = AwsBasicCredentials.create(r2AccessKey, r2SecretKey);
         AwsCredentialsProvider provider = StaticCredentialsProvider.create(credentials);
 
         return S3Presigner.builder()
-                .region(Region.AP_NORTHEAST_2)
+                .region(Region.of("auto"))
+                .endpointOverride(URI.create(endpoint))
                 .credentialsProvider(provider)
                 .build();
     }
 
     @Bean
     public LambdaClient lambdaClient() {
-        AwsBasicCredentials credentials = AwsBasicCredentials.create(accessKeyId, secretAccessKey);
+        AwsBasicCredentials credentials = AwsBasicCredentials.create(lambdaAccessKey, lambdaSecretKey);
         AwsCredentialsProvider provider = StaticCredentialsProvider.create(credentials);
 
         return LambdaClient.builder()

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

@@ -37,10 +37,10 @@ public class S3Service {
     @Value("${aws.lambda.function-name}")
     private String lambdaFunctionName;
 
-    @Value("${aws.cloudfront.domain}")
+    @Value("${cloudflare.cdn.domain}")
     private String cloudFrontDomain;
 
-    public S3Service(S3Client s3Client, @Value("${aws.s3.bucket-name}") String bucketName, S3Presigner s3Presigner, LambdaClient lambdaClient, ObjectMapper objectMapper) {
+    public S3Service(S3Client s3Client, @Value("${cloud.r2.bucket}") String bucketName, S3Presigner s3Presigner, LambdaClient lambdaClient, ObjectMapper objectMapper) {
         this.s3Client = s3Client;
         this.bucketName = bucketName;
         this.s3Presigner = s3Presigner;

src/main/resources/application.properties

@@ -5,7 +5,7 @@ spring.profiles.active=local
 spring.jpa.show-sql=true
 spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect
 
-# MySQL
+# DB Config
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=${DB_URL}
 spring.datasource.username=${DB_USERNAME}
@@ -19,16 +19,19 @@ spring.jwt.refresh-token-expiration-ms=604800000
 # YouTube Data API Key
 google.youtube.api.key=${YOUTUBE_API_KEY}
 
-# S3
-aws.s3.accessKeyId=${AWS_ACCESS_KEY}
-aws.s3.secretAccessKey=${AWS_SECRET_KEY}
-aws.s3.bucket-name=socialbookmarking-bucket
+# R2 Config
+cloud.r2.credentials.access-key=${R2_ACCESS_KEY_ID}
+cloud.r2.credentials.secret-key=${R2_SECRET_ACCESS_KEY}
+cloud.r2.bucket=marksphere-storage
+cloud.r2.endpoint=${R2_ENDPOINT}
 
 # AWS Lambda
+aws.lambda.access-key=${AWS_ACCESS_KEY}
+aws.lambda.scret-key=${AWS_SECRET_KEY}
 aws.lambda.function-name=${LAMBDA_FUNCTION_NAME}
 
-# AWS CloudFront
-aws.cloudfront.domain=${AWS_CLOUDFRONT_DOMAIN}
+# Cloudflare CDN
+cloudflare.cdn.domain=${CLOUDFLARE_CDN_DOMAIN}
 
 spring.data.redis.host=${REDIS_HOST}
 spring.data.redis.port=6379