Skip to content

Commit 37926e2

Browse files
committed
refactor: Lambda 설정 로딩 방식을 spring.config.import로 변경
- @Profile에 lambda-dev 추가 (CrewDatabaseConfig, PlaygroundDataSourceConfig, RealTime, Slack 관련) - SecretPropertiesEnvironmentPostProcessor 삭제 (spring.config.import가 Lambda에서 정상 동작 확인) - application-lambda-dev.yml에 spring.config.import 추가
1 parent 37fc5fd commit 37926e2

10 files changed

Lines changed: 8 additions & 109 deletions

File tree

main/src/main/java/org/sopt/makers/crew/main/global/config/CrewDatabaseConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
entityManagerFactoryRef = "primaryEntityManagerFactory", // EntityManager의 이름
3636
transactionManagerRef = "primaryTransactionManager" // 트랜잭션 매니저의 이름
3737
)
38-
@Profile({"local", "dev", "prod", "test", "traffic"})
38+
@Profile({"local", "dev", "prod", "test", "traffic", "lambda-dev"})
3939
public class CrewDatabaseConfig {
4040

4141
@Bean

main/src/main/java/org/sopt/makers/crew/main/global/config/PlaygroundDataSourceConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
entityManagerFactoryRef = "secondEntityManagerFactory",
2828
transactionManagerRef = "secondTransactionManager"
2929
)
30-
@Profile({"local", "dev", "prod", "test", "traffic"})
30+
@Profile({"local", "dev", "prod", "test", "traffic", "lambda-dev"})
3131
public class PlaygroundDataSourceConfig {
3232
@Bean
3333
@ConfigurationProperties("spring.playground-datasource")

main/src/main/java/org/sopt/makers/crew/main/global/config/SecretPropertiesEnvironmentPostProcessor.java

Lines changed: 0 additions & 101 deletions
This file was deleted.

main/src/main/java/org/sopt/makers/crew/main/global/util/RealTime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.springframework.stereotype.Component;
77

88
@Component
9-
@Profile({"local", "dev", "prod", "traffic"})
9+
@Profile({"local", "dev", "prod", "traffic", "lambda-dev"})
1010
public class RealTime implements Time {
1111
@Override
1212
public LocalDateTime now() {

main/src/main/java/org/sopt/makers/crew/main/slack/SlackConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.slack.api.bolt.AppConfig;
1111
import com.slack.api.methods.MethodsClient;
1212

13-
@Profile({"dev"})
13+
@Profile({"dev", "lambda-dev"})
1414
@Configuration
1515
public class SlackConfig {
1616

main/src/main/java/org/sopt/makers/crew/main/slack/SlackController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import lombok.RequiredArgsConstructor;
1818
import lombok.extern.slf4j.Slf4j;
1919

20-
@Profile({"dev"})
20+
@Profile({"dev", "lambda-dev"})
2121
@RestController
2222
@RequestMapping("/slack")
2323
@RequiredArgsConstructor

main/src/main/java/org/sopt/makers/crew/main/slack/SlackEventListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@Slf4j
1414
@Component
15-
@Profile({"dev"})
15+
@Profile({"dev", "lambda-dev"})
1616
@RequiredArgsConstructor
1717
public class SlackEventListener {
1818

main/src/main/java/org/sopt/makers/crew/main/slack/SlackSocketModeStarter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import lombok.RequiredArgsConstructor;
1515
import lombok.extern.slf4j.Slf4j;
1616

17-
@Profile({"dev"})
17+
@Profile({"dev", "lambda-dev"})
1818
@Component
1919
@Slf4j
2020
@RequiredArgsConstructor

main/src/main/resources/META-INF/spring.factories

Lines changed: 0 additions & 1 deletion
This file was deleted.

main/src/main/resources/application-lambda-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ spring:
1010
config:
1111
activate:
1212
on-profile: lambda-dev
13+
import: application-secret.properties
1314

1415
main:
1516
lazy-initialization: true

0 commit comments

Comments
 (0)