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"
deploymentName: fedora-metadata-extractor
kafkaConfigs: prod-kafka-bootstrap-servers
fedoraConfigs: prod-fedora-configs
fedoraConfigs: fedora-admin-credentials
outputTopic: fedora-output
inputTopic: fedora-events
\ No newline at end of file
......@@ -50,14 +50,7 @@ class KafkaTopology(
private val objectMapper = ObjectMapper().registerKotlinModule()
private val fedora = FedoraClientImpl.builder()
.urls(
settings.appSettings.getProperty("fedora.internalDomain"),
settings.appSettings.getProperty("fedora.externalDomain")
)
.credentials(
settings.appSettings.getProperty("fedora.user"),
settings.appSettings.getProperty("fedora.password")
)
.properties(settings.appSettings)
.build()
fun build(): Topology {
......
......@@ -27,10 +27,10 @@ class Service(file: String = "app.yml") {
val settings = SettingsLoader(
listOf(
"fedora.user",
"fedora.username",
"fedora.password",
"fedora.internalDomain",
"fedora.externalDomain"
"fedora.internalBaseUrl",
"fedora.externalBaseUrl"
),
file,
useStreamsConfig = true
......
app:
fedora:
user: ${FEDORA_USER:?system}
username: ${FEDORA_USER:?system}
password: ${FEDORA_PASSWORD:?system}
internalDomain: ${FEDORA_INTERNAL_DOMAIN:?system}
externalDomain: ${FEDORA_EXTERNAL_DOMAIN:?system}
internalBaseUrl: ${FEDORA_INTERNAL_BASE_URL:?system}
externalBaseUrl: ${FEDORA_EXTERNAL_BASE_URL:?system}
kafka:
streams:
bootstrap.servers: ${KAFKA_BOOTSTRAP_SERVERS:?system}
......
Markdown is supported
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