Merge pull request #292 from prgrms-aibe-devcourse/develop

Chore: 메인 브랜치 병합 #276

Author: kjyy08

src/main/java/kr/co/amateurs/server/config/S3Config.java

@@ -8,25 +8,32 @@
 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 java.net.URI;
 
 @Configuration
 public class S3Config {
 
-    @Value("${cloud.aws.credentials.access-key}")
+    @Value("${cloudflare.r2.endpoint}")
+    private String endpoint;
+
+    @Value("${cloudflare.r2.access-key}")
     private String accessKey;
 
-    @Value("${cloud.aws.credentials.secret-key}")
+    @Value("${cloudflare.r2.secret-key}")
     private String secretKey;
 
-    @Value("${cloud.aws.region.static}")
-    private String region;
-
     @Bean
     public S3Client s3Client() {
         AwsBasicCredentials credentials = AwsBasicCredentials.create(accessKey, secretKey);
         return S3Client.builder()
-                .region(Region.of(region))
+                .endpointOverride(URI.create(endpoint))
+                .region(Region.of("auto"))
                 .credentialsProvider(StaticCredentialsProvider.create(credentials))
+                .serviceConfiguration(S3Configuration.builder()
+                        .pathStyleAccessEnabled(true)
+                        .build())
                 .build();
     }
 }

src/main/java/kr/co/amateurs/server/service/file/FileService.java

@@ -36,10 +36,10 @@
 @RequiredArgsConstructor
 public class FileService {
 
-    @Value("${cloud.aws.cloudfront.domain}")
+    @Value("${cloudflare.r2.public-url}")
     public String publicUrl;
 
-    @Value("${cloud.aws.s3.bucket}")
+    @Value("${cloudflare.r2.bucket}")
     private String bucket;
 
     private final S3Client s3Client;

src/main/java/kr/co/amateurs/server/service/file/UnreferencedImageClearScheduler.java

@@ -23,10 +23,10 @@ public class UnreferencedImageClearScheduler {
     private final PostImageRepository postImageRepository;
     private final FileService fileService;
 
-    @Value("${cloud.aws.cloudfront.domain}")
+    @Value("${cloudflare.r2.public-url}")
     public String publicUrl;
 
-    @Value("${cloud.aws.s3.bucket}")
+    @Value("${cloudflare.r2.bucket}")
     private String bucket;
 
     // 한번에 처리할 작업의 크기(메모리 오버 대비)

src/main/resources/application-dev.yml

@@ -88,18 +88,6 @@ jwt:
   access-token-expiration-ms: 3600000
   refresh-token-expiration-ms: 1209600000
 
-cloud:
-  aws:
-    credentials:
-      access-key: ${AWS_ACCESS_KEY}
-      secret_key: ${AWS_SECRET_KEY}
-    region:
-      static: ${S3_REGION}
-    s3:
-      bucket: ${S3_BUCKET_NAME}
-    cloudfront:
-      domain: ${CLOUD_FRONT_DOMAIN_NAME}
-
 management:
   endpoints:
     web:
@@ -135,4 +123,12 @@ otel:
   metrics:
     exporter: none
   logs:
-    exporter: none
+    exporter: none
+
+cloudflare:
+  r2:
+    endpoint: ${CLOUDFLARE_R2_ENDPOINT}
+    access-key: ${CLOUDFLARE_R2_ACCESS_KEY}
+    secret-key: ${CLOUDFLARE_R2_SECRET_KEY}
+    bucket: ${CLOUDFLARE_R2_BUCKET}
+    public-url: ${CLOUDFLARE_R2_PUBLIC_URL}

src/main/resources/application-local.yml

@@ -103,18 +103,6 @@ jwt:
   access-token-expiration-ms: 3600000
   refresh-token-expiration-ms: 1209600000
 
-cloud:
-  aws:
-    credentials:
-      access-key: ${AWS_ACCESS_KEY}
-      secret_key: ${AWS_SECRET_KEY}
-    region:
-      static: ${S3_REGION}
-    s3:
-      bucket: ${S3_BUCKET_NAME}
-    cloudfront:
-      domain: ${CLOUD_FRONT_DOMAIN_NAME}
-
 oauth:
   success-redirect-url: http://localhost:5173
 
@@ -138,4 +126,12 @@ otel:
   metrics:
     exporter: none
   logs:
-    exporter: none
+    exporter: none
+
+cloudflare:
+  r2:
+    endpoint: ${CLOUDFLARE_R2_ENDPOINT}
+    access-key: ${CLOUDFLARE_R2_ACCESS_KEY}
+    secret-key: ${CLOUDFLARE_R2_SECRET_KEY}
+    bucket: ${CLOUDFLARE_R2_BUCKET}
+    public-url: ${CLOUDFLARE_R2_PUBLIC_URL}

src/main/resources/application-prod.yml

@@ -112,18 +112,6 @@ jwt:
   access-token-expiration-ms: 3600000
   refresh-token-expiration-ms: 1209600000
 
-cloud:
-  aws:
-    credentials:
-      access-key: ${AWS_ACCESS_KEY}
-      secret_key: ${AWS_SECRET_KEY}
-    region:
-      static: ${S3_REGION}
-    s3:
-      bucket: ${S3_BUCKET_NAME}
-    cloudfront:
-      domain: ${CLOUD_FRONT_DOMAIN_NAME}
-
 management:
   endpoints:
     web:
@@ -173,3 +161,11 @@ otel:
       endpoint: ${OTEL_COLLECTOR_URL}
       compression: gzip
       timeout: 10s
+
+cloudflare:
+  r2:
+    endpoint: ${CLOUDFLARE_R2_ENDPOINT}
+    access-key: ${CLOUDFLARE_R2_ACCESS_KEY}
+    secret-key: ${CLOUDFLARE_R2_SECRET_KEY}
+    bucket: ${CLOUDFLARE_R2_BUCKET}
+    public-url: ${CLOUDFLARE_R2_PUBLIC_URL}

src/test/resources/application-test.yml

@@ -72,18 +72,6 @@ jwt:
   access-token-expiration-ms: 3600000
   refresh-token-expiration-ms: 1209600000
 
-cloud:
-  aws:
-    credentials:
-      access-key: testAccessKey
-      secret_key: testSecretKey
-    region:
-      static: test-region
-    s3:
-      bucket: test-bucket-name
-    cloudfront:
-      domain: testdomain.net
-
 de:
   flapdoodle:
     mongodb:
@@ -100,4 +88,12 @@ app:
 
 verification:
   service:
-    url: http://localhost:5000/verify/url
+    url: http://localhost:5000/verify/url
+
+cloudflare:
+  r2:
+    endpoint: http://test-endpoint
+    access-key: test-access-key
+    secret-key: test-secret-key
+    bucket: test-bucket
+    public-url: test-public-url