Oppdaterte R&R versjon og fikset konfigurering som passer.

Author: kristoiv

gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
 
-rapid_version=1.6d6256d
+rapid_version=20210428115805-514c80c
 logging_version=1.7.9
 konfig_version=1.6.10.0
 brukernotifikasjon_schemas_version=1.2021.01.18-11.12-b9c8c40b98d1

src/main/kotlin/no/nav/hjelpemidler/Application.kt

@@ -42,17 +42,17 @@ fun main() {
             Configuration.rapidConfig["KAFKA_RAPID_TOPIC"]!!,
             emptyList(),
             KafkaConfig(
-                Configuration.rapidConfig["KAFKA_BOOTSTRAP_SERVERS"]!!,
+                Configuration.rapidConfig["KAFKA_BROKERS"]!!,
                 Configuration.rapidConfig["KAFKA_CONSUMER_GROUP_ID"]!!,
                 Configuration.rapidConfig["KAFKA_CLIENT_ID"]!!,
                 null,
                 null,
                 Configuration.rapidConfig["KAFKA_TRUSTSTORE_PATH"]!!,
-                Configuration.rapidConfig["KAFKA_TRUSTSTORE_PASSWORD"]!!,
+                Configuration.rapidConfig["KAFKA_CREDSTORE_PASSWORD"]!!,
                 "jks",
                 "PKCS12",
                 Configuration.rapidConfig["KAFKA_KEYSTORE_PATH"]!!,
-                Configuration.rapidConfig["KAFKA_KEYSTORE_PASSWORD"]!!,
+                Configuration.rapidConfig["KAFKA_CREDSTORE_PASSWORD"]!!,
                 Configuration.rapidConfig["KAFKA_RESET_POLICY"]!!,
                 false,
                 null,

src/main/kotlin/no/nav/hjelpemidler/configuration/Configuration.kt

@@ -64,14 +64,13 @@ internal object Configuration {
     val rapidConfig: Map<String, String> = mapOf(
         "RAPID_KAFKA_CLUSTER" to "gcp",
         "RAPID_APP_NAME" to "hm-oebs-listener",
-        "KAFKA_BOOTSTRAP_SERVERS" to config()[Key("kafka.brokers", stringType)],
+        "KAFKA_BROKERS" to config()[Key("kafka.brokers", stringType)],
         "KAFKA_CONSUMER_GROUP_ID" to "hm-oebs-listener-v1",
         "KAFKA_RAPID_TOPIC" to config()[Key("kafka.aiven.topic", stringType)],
         "KAFKA_RESET_POLICY" to config()[Key("kafka.reset.policy", stringType)],
         "KAFKA_TRUSTSTORE_PATH" to config()[Key("KAFKA_TRUSTSTORE_PATH", stringType)],
-        "KAFKA_TRUSTSTORE_PASSWORD" to config()[Key("KAFKA_CREDSTORE_PASSWORD", stringType)],
         "KAFKA_KEYSTORE_PATH" to config()[Key("KAFKA_KEYSTORE_PATH", stringType)],
-        "KAFKA_KEYSTORE_PASSWORD" to config()[Key("KAFKA_CREDSTORE_PASSWORD", stringType)],
+        "KAFKA_CREDSTORE_PASSWORD" to config()[Key("KAFKA_CREDSTORE_PASSWORD", stringType)],
         "HTTP_PORT" to config()[Key("HTTP_PORT", stringType)],
         "KAFKA_CLIENT_ID" to config()[Key("kafka.client.id", stringType)],
     ) + System.getenv().filter { it.key.startsWith("NAIS_") }