Fix configuration

helm-charts/values.yaml

@@ -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

src/main/kotlin/KafkaTopology.kt

@@ -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 {

src/main/kotlin/Service.kt

@@ -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

src/main/resources/app.yml

 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}