rydder litt i config

Author: di0nys1us

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

@@ -69,9 +69,7 @@ fun main() {
         }
         install(Authentication) {
             token("oebsToken") {
-                validate(requireNotNull(Configuration.application["OEBSTOKEN"]) {
-                    "OEBSTOKEN mangler"
-                })
+                validate(Configuration.oebsToken)
             }
         }
         val context = Context(rapidApp)

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

@@ -8,7 +8,6 @@ import com.natpryce.konfig.overriding
 import com.natpryce.konfig.stringType
 
 internal object Configuration {
-
     private val prodProperties = ConfigurationMap(
         Profile.PROD.entry(),
 
@@ -37,7 +36,12 @@ internal object Configuration {
         Profile.LOCAL.entry(),
 
         "HTTP_PORT" to "8085",
-        "OEBSTOKEN" to "abc",
+
+        "NAIS_APP_NAME" to "hm-oebs-listener",
+        "NAIS_CLUSTER_NAME" to "local",
+        "NAIS_NAMESPACE" to "teamdigihot",
+
+        "OEBSTOKEN" to "token",
 
         "kafka.aiven.consumer" to "hm-oebs-listener-v1",
         "kafka.aiven.topic" to "teamdigihot.hm-soknadsbehandling-v1",
@@ -48,7 +52,7 @@ internal object Configuration {
         "KAFKA_TRUSTSTORE_PATH" to "",
         "KAFKA_CREDSTORE_PASSWORD" to "",
 
-        "SENSU_URL" to "https://test",
+        "SENSU_URL" to "https://test/sensu",
         "SLACK_HOOK" to "https://test/slack"
     )
 
@@ -73,14 +77,16 @@ internal object Configuration {
         "HTTP_PORT" to get("HTTP_PORT"),
     ) + System.getenv().filter { it.key.startsWith("NAIS_") }
 
-    val application: Map<String, String> = mapOf(
-        "APP_PROFILE" to get("application.profile"),
-        "SENSU_URL" to get("SENSU_URL"),
-        "OEBSTOKEN" to get("OEBSTOKEN"),
-        "SLACK_HOOK" to get("SLACK_HOOK"),
-    ) + System.getenv().filter { it.key.startsWith("NAIS_") }
+    val application = get("NAIS_APP_NAME")
+    val cluster = get("NAIS_CLUSTER_NAME")
+    val namespace = get("NAIS_NAMESPACE")
 
     val profile: Profile = get("application.profile").let { Profile.valueOf(it) }
+    val sensuUrl = get("SENSU_URL")
+    val oebsToken = get("OEBSTOKEN")
+    val slackHook = get("SLACK_HOOK")
+    val ntfyUrl = "https://ntfy.sh"
+    val ntfyTopic = "teamdigihot.hm-oebs-listener"
 
     enum class Profile {
         PROD, DEV, LOCAL;

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

@@ -25,7 +25,7 @@ object Ntfy {
     }
 
     fun publish(notification: Notification) = runBlocking(Dispatchers.IO) {
-        val response = client.post("https://ntfy.sh") {
+        val response = client.post(Configuration.ntfyUrl) {
             contentType(ContentType.Application.Json)
             setBody(notification)
         }
@@ -36,7 +36,7 @@ object Ntfy {
     }
 
     data class Notification(
-        val topic: String = "teamdigihot.hm-oebs-listener",
+        val topic: String = Configuration.ntfyTopic,
         val title: String? = null,
         val message: String? = null,
         val priority: Priority = Priority.DEFAULT,

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

@@ -23,7 +23,7 @@ object Slack {
         }
     }
 
-    fun post(url: String = Configuration.application["SLACK_HOOK"]!!, text: String, channel: String) =
+    fun post(url: String = Configuration.slackHook, text: String, channel: String) =
         runBlocking(Dispatchers.IO) {
             val response = client
                 .post(url) {

src/main/kotlin/no/nav/hjelpemidler/metrics/SensuMetrics.kt

@@ -1,9 +1,9 @@
 package no.nav.hjelpemidler.metrics
 
+import mu.KotlinLogging
 import no.nav.helse.rapids_rivers.MessageContext
 import no.nav.hjelpemidler.Configuration
 import org.influxdb.dto.Point
-import org.slf4j.LoggerFactory
 import java.net.URI
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
@@ -15,8 +15,8 @@ import java.util.concurrent.TimeUnit
 class SensuMetrics(messageContext: MessageContext) {
     private val kafkaMetrics = KafkaMetrics(messageContext)
 
-    private val log = LoggerFactory.getLogger(SensuMetrics::class.java)
-    private val sensuURL = Configuration.application["SENSU_URL"] ?: "http://localhost/unconfigured"
+    private val log = KotlinLogging.logger {}
+    private val sensuUrl = Configuration.sensuUrl
     private val sensuName = "hm-oebs-listener-events"
 
     private val httpClient = HttpClient.newBuilder()
@@ -101,7 +101,7 @@ class SensuMetrics(messageContext: MessageContext) {
         val body = HttpRequest.BodyPublishers.ofString(sensuEvent.json)
         val request = HttpRequest.newBuilder()
             .POST(body)
-            .uri(URI.create(sensuURL))
+            .uri(URI.create(sensuUrl))
             .setHeader("User-Agent", "Java 11 HttpClient Bot") // add request header
             .header("Content-Type", "application/json")
             .header("X-Correlation-ID", UUID.randomUUID().toString())
@@ -126,9 +126,9 @@ class SensuMetrics(messageContext: MessageContext) {
 
     companion object {
         private val DEFAULT_TAGS: Map<String, String> = mapOf(
-            "application" to (Configuration.application["NAIS_APP_NAME"] ?: "hm-oebs-listener"),
-            "cluster" to (Configuration.application["NAIS_CLUSTER_NAME"] ?: "dev-fss"),
-            "namespace" to (Configuration.application["NAIS_NAMESPACE"] ?: "teamdigihot")
+            "application" to Configuration.application,
+            "cluster" to Configuration.cluster,
+            "namespace" to Configuration.namespace,
         )
 
         private const val SOKNADER = "hm-oebs-listener"