Commit 404ed424 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Fix configuration

parent 17e25bde
Pipeline #11781 passed with stages
in 4 minutes and 46 seconds
...@@ -9,6 +9,6 @@ tag: "latest" ...@@ -9,6 +9,6 @@ tag: "latest"
deploymentName: fedora-metadata-extractor deploymentName: fedora-metadata-extractor
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
fedoraConfigs: prod-fedora-configs fedoraConfigs: fedora-admin-credentials
outputTopic: fedora-output outputTopic: fedora-output
inputTopic: fedora-events inputTopic: fedora-events
\ No newline at end of file
...@@ -50,14 +50,7 @@ class KafkaTopology( ...@@ -50,14 +50,7 @@ class KafkaTopology(
private val objectMapper = ObjectMapper().registerKotlinModule() private val objectMapper = ObjectMapper().registerKotlinModule()
private val fedora = FedoraClientImpl.builder() private val fedora = FedoraClientImpl.builder()
.urls( .properties(settings.appSettings)
settings.appSettings.getProperty("fedora.internalDomain"),
settings.appSettings.getProperty("fedora.externalDomain")
)
.credentials(
settings.appSettings.getProperty("fedora.user"),
settings.appSettings.getProperty("fedora.password")
)
.build() .build()
fun build(): Topology { fun build(): Topology {
......
...@@ -27,10 +27,10 @@ class Service(file: String = "app.yml") { ...@@ -27,10 +27,10 @@ class Service(file: String = "app.yml") {
val settings = SettingsLoader( val settings = SettingsLoader(
listOf( listOf(
"fedora.user", "fedora.username",
"fedora.password", "fedora.password",
"fedora.internalDomain", "fedora.internalBaseUrl",
"fedora.externalDomain" "fedora.externalBaseUrl"
), ),
file, file,
useStreamsConfig = true useStreamsConfig = true
......
app: app:
fedora: fedora:
user: ${FEDORA_USER:?system} username: ${FEDORA_USER:?system}
password: ${FEDORA_PASSWORD:?system} password: ${FEDORA_PASSWORD:?system}
internalDomain: ${FEDORA_INTERNAL_DOMAIN:?system} internalBaseUrl: ${FEDORA_INTERNAL_BASE_URL:?system}
externalDomain: ${FEDORA_EXTERNAL_DOMAIN:?system} externalBaseUrl: ${FEDORA_EXTERNAL_BASE_URL:?system}
kafka: kafka:
streams: streams:
bootstrap.servers: ${KAFKA_BOOTSTRAP_SERVERS:?system} bootstrap.servers: ${KAFKA_BOOTSTRAP_SERVERS:?system}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment