diff --git a/src/main/kotlin/com/mjucow/eatda/common/config/S3Config.kt b/src/main/kotlin/com/mjucow/eatda/common/config/S3Config.kt index fb3f3cc..9273db2 100644 --- a/src/main/kotlin/com/mjucow/eatda/common/config/S3Config.kt +++ b/src/main/kotlin/com/mjucow/eatda/common/config/S3Config.kt @@ -3,11 +3,13 @@ package com.mjucow.eatda.common.config import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration +import org.springframework.context.annotation.Profile import software.amazon.awssdk.auth.credentials.AwsBasicCredentials import software.amazon.awssdk.regions.Region import software.amazon.awssdk.services.s3.presigner.S3Presigner @Configuration +@Profile("prod") class S3Config( @Value("\${aws.s3.credentials.access-key}") private val accessKey: String, diff --git a/src/main/kotlin/com/mjucow/eatda/domain/s3/service/S3Service.kt b/src/main/kotlin/com/mjucow/eatda/domain/s3/service/S3Service.kt index 2bcd1ca..9829835 100644 --- a/src/main/kotlin/com/mjucow/eatda/domain/s3/service/S3Service.kt +++ b/src/main/kotlin/com/mjucow/eatda/domain/s3/service/S3Service.kt @@ -1,6 +1,7 @@ package com.mjucow.eatda.domain.s3.service import org.springframework.beans.factory.annotation.Value +import org.springframework.context.annotation.Profile import org.springframework.stereotype.Service import software.amazon.awssdk.services.s3.model.GetObjectRequest import software.amazon.awssdk.services.s3.model.PutObjectRequest @@ -11,6 +12,7 @@ import java.net.URL import java.time.Duration @Service +@Profile("prod") class S3Service( private val s3Presigner: S3Presigner, @Value("\${aws.s3.bucket}") diff --git a/src/main/kotlin/com/mjucow/eatda/presentation/s3/S3Controller.kt b/src/main/kotlin/com/mjucow/eatda/presentation/s3/S3Controller.kt index 4a0fc06..3f2172d 100644 --- a/src/main/kotlin/com/mjucow/eatda/presentation/s3/S3Controller.kt +++ b/src/main/kotlin/com/mjucow/eatda/presentation/s3/S3Controller.kt @@ -3,6 +3,7 @@ package com.mjucow.eatda.presentation.s3 import com.mjucow.eatda.domain.s3.dto.PresignedUrlDto import com.mjucow.eatda.domain.s3.service.S3Service import com.mjucow.eatda.presentation.common.ApiResponse +import org.springframework.context.annotation.Profile import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RequestParam @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/api/v1/s3") @RestController +@Profile("prod") class S3Controller( private val s3Service: S3Service, ) : S3ApiPresentation { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d829cdc..1b116f7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -65,13 +65,6 @@ spring: host: localhost port: 16379 -aws: - s3: - credentials: - access-key: ${S3_ACCESS_KEY} - secret-key: ${S3_SECRET_KEY} - bucket: ${S3_BUCKET} - --- spring: diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index ec9d75e..bd53901 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -22,10 +22,3 @@ spring: port: 6379 logging.config: classpath:logback-test.xml - -aws: - s3: - credentials: - access-key: ${S3_ACCESS_KEY} - secret-key: ${S3_SECRET_KEY} - bucket: ${S3_BUCKET} diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index e7983ea..e48abb6 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -1,20 +1,20 @@ - + + + + + + ch.qos.logback.classic.encoder.PatternLayoutEncoder by default --> %d{HH:mm:ss.SSS} %-5level %logger - %msg%n + + + - - - - - - -