Added kafka server config

.drone.yml

@@ -80,7 +80,7 @@ steps:
       - touch $HOME/.ssh/known_hosts
       - chmod 600 $HOME/.ssh/known_hosts
       - ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
-      - GIT_SSH=/drone/src/module-deploy/scripts/ssh-git-command.sh ./gradlew final jib
+      - ./gradlew -Prelease.useLastTag=true final jib
 
 volumes:
   - name: cache

.gitignore

@@ -12,6 +12,7 @@ build/
 **/*.log
 **/*.hprof
 **/generated/**
+env.sh
 
 ### STS ###
 .apt_generated

buildSrc/src/main/kotlin/twomartens.java.gradle.kts

@@ -1,6 +1,4 @@
 import org.gradle.accessors.dm.LibrariesForLibs
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
 
 plugins {
     jacoco
@@ -51,22 +49,6 @@ tasks.jacocoTestReport {
     }
 }
 
-val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
-
-tasks.jar {
-    doFirst {
-        manifest {
-            attributes["Implementation-Title"] = rootProject.name
-            attributes["Implementation-Version"] = archiveVersion.get()
-            attributes["Implementation-Vendor"] = "Jim Martens"
-            attributes["Build-Timestamp"] = ZonedDateTime.now().format(formatter)
-            attributes["Created-By"] = "Gradle ${gradle.gradleVersion}"
-            attributes["Build-Jdk"] = "${providers.systemProperty("java.version").get()} (${providers.systemProperty("java.vendor").get()} ${providers.systemProperty("java.vm.version").get()})"
-            attributes["Build-OS"] = "${providers.systemProperty("os.name").get()} ${providers.systemProperty("os.arch").get()} ${providers.systemProperty("os.version").get()}"
-        }
-    }
-}
-
 normalization.runtimeClasspath.metaInf {
     ignoreAttribute("Build-Timestamp")
 }

buildSrc/src/main/kotlin/twomartens.nebula-release.gradle.kts

@@ -13,6 +13,6 @@ tasks.register("writeVersionProperties") {
     val directory = buildDir
     doLast {
         Files.createDirectories(directory.toPath())
-        File("$buildDir/version.properties").writeText("VERSION=${project.version.toString()}\n")
+        File("$buildDir/version.properties").writeText("VERSION=${project.version}\n")
     }
 }

buildSrc/src/main/kotlin/twomartens.spring-boot.gradle.kts

@@ -1,4 +1,7 @@
 import org.gradle.accessors.dm.LibrariesForLibs
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeFormatter.ofPattern
 
 plugins {
     id("org.springframework.boot")
@@ -57,27 +60,21 @@ tasks.named("buildAll") {
     dependsOn("integrationTest")
 }
 
-springBoot {
-    buildInfo()
-}
-
-tasks.bootJar {
-    enabled = false
-}
+val formatter: DateTimeFormatter = ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
 
 tasks.jar {
-    enabled = true
-    archiveClassifier.set("")
+    manifest {
+        attributes["Implementation-Title"] = rootProject.name
+        attributes["Implementation-Version"] = archiveVersion.get()
+        attributes["Implementation-Vendor"] = "Jim Martens"
+        attributes["Build-Timestamp"] = ZonedDateTime.now().format(formatter)
+        attributes["Created-By"] = "Gradle ${gradle.gradleVersion}"
+        attributes["Build-Jdk"] = "${providers.systemProperty("java.version").get()} (${providers.systemProperty("java.vendor").get()} ${providers.systemProperty("java.vm.version").get()})"
+        attributes["Build-OS"] = "${providers.systemProperty("os.name").get()} ${providers.systemProperty("os.arch").get()} ${providers.systemProperty("os.version").get()}"
+    }
 }
 
-tasks.bootDistZip {
-    dependsOn(tasks.jar)
+springBoot {
+    buildInfo()
+    mainClass.set("de.twomartens.wahlrecht.MainApplicationKt")
 }
-
-tasks.bootDistTar {
-    dependsOn(tasks.jar)
-}
-
-tasks.bootStartScripts {
-    dependsOn(tasks.jar)
-}

gradle/libs.versions.toml

@@ -38,6 +38,7 @@ spring-boot-oauth2-resource-server = { module = "org.springframework.boot:spring
 spring-boot-config = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot" }
 spring-cloud = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "spring-cloud" }
 spring-cloud-starter = { module = "org.springframework.cloud:spring-cloud-starter" }
+spring-cloud-starter-bus-kafka = { module = "org.springframework.cloud:spring-cloud-starter-bus-kafka" }
 spring-cloud-starter-config = { module = "org.springframework.cloud:spring-cloud-starter-config" }
 spring-cloud-config-server = { module = "org.springframework.cloud:spring-cloud-config-server" }
 spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter" }

http-requests/calculate-result.http

@@ -1,4 +1,4 @@
-POST http://localhost:12000/wahlrecht/v1/calculate
+POST {{backend}}/wahlrecht/v1/calculate
 Content-Type: application/json
 
 {

http-requests/get-elections.http

@@ -0,0 +1,2 @@
+GET {{backend}}/wahlrecht/v1/elections
+Content-Type: application/json

http-requests/http-client.env.json

@@ -0,0 +1,8 @@
+{
+  "dev": {
+    "backend": "http://localhost:12000"
+  },
+  "prod" : {
+    "backend": "https://api.2martens.de"
+  }
+}

module-deploy/deploy.gradle.kts

@@ -31,10 +31,8 @@ jib {
         }
     }
     container {
-        extraClasspath = listOf("/configmap")
-        mainClass = "de.twomartens.wahlrecht.MainApplication"
+        mainClass = "de.twomartens.wahlrecht.MainApplicationKt"
         jvmFlags = listOf("-XX:+UseContainerSupport",
-                "-XX:MaxRAMPercentage=75.0",
-                "-Dlog4j.configurationFile=/configmap/log4j2.xml")
+                "-XX:MaxRAMPercentage=75.0")
     }
 }

module-deploy/k8s/prod/application-prod.yaml

@@ -1,2 +0,0 @@
-server:
-  port: 12000

module-deploy/scripts/ssh-git-command.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-ssh $@

module-server/server.gradle.kts

@@ -10,4 +10,5 @@ dependencies {
     annotationProcessor(libs.mapstruct.processor)
     kapt(libs.mapstruct.processor)
     implementation(libs.spring.cloud.starter.config)
-}
+    implementation(libs.spring.cloud.starter.bus.kafka)
+}

module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/KafkaConfiguration.kt

@@ -0,0 +1,18 @@
+package de.twomartens.wahlrecht.configuration
+
+import org.apache.kafka.clients.admin.AdminClientConfig
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Profile
+import org.springframework.kafka.core.KafkaAdmin
+
+@Configuration
+open class KafkaConfiguration {
+    @Bean
+    @Profile("prod")
+    open fun kafkaProd() = KafkaAdmin(mapOf(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG to "kafka:9092"))
+
+    @Bean
+    @Profile("dev")
+    open fun kafkaDev() = KafkaAdmin(mapOf(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG to "localhost:9092"))
+}

module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/OpenApiConfiguration.kt

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.security.OAuthFlows
 import io.swagger.v3.oas.annotations.security.SecurityScheme
 import io.swagger.v3.oas.models.OpenAPI
 import io.swagger.v3.oas.models.info.Info
+import io.swagger.v3.oas.models.servers.Server
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -35,5 +36,7 @@ open class OpenApiConfiguration {
                     .version(apiVersion)
                     .description(apiDescription)
             )
+            .addServersItem(Server().url("http://localhost:12000"))
+            .addServersItem(Server().url("https://api.2martens.de"))
     }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/WebConfiguration.kt

@@ -16,10 +16,13 @@ open class WebConfiguration(private val headerInterceptorRest: HeaderInterceptor
     override fun addCorsMappings(registry: CorsRegistry) {
         val registration = registry.addMapping("/**")
         registration.allowedMethods(
-            HttpMethod.GET.name(), HttpMethod.POST.name(),
-            HttpMethod.PUT.name(), HttpMethod.OPTIONS.name()
+                HttpMethod.GET.name(), HttpMethod.POST.name(),
+                HttpMethod.PUT.name(), HttpMethod.HEAD.name()
         )
         registration.allowCredentials(true)
-        registration.allowedOrigins("http://localhost:4200")
+        registration.allowedOrigins(
+                "http://localhost:4200",
+                "https://wahlrecht.2martens.de"
+        )
     }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/controller/VersionHtmlController.kt

@@ -32,14 +32,16 @@ class VersionHtmlController {
     }
 
     private fun getTitle(): String {
-        val title = VersionHtmlController::class.java.getPackage().implementationTitle
+        val title = VersionHtmlController::class.java.`package`.implementationTitle
+                ?: return "application"
         return title.ifBlank {
             "application"
         }
     }
 
     private fun getVersion(): String {
-        val version = VersionHtmlController::class.java.getPackage().implementationVersion
+        val version = VersionHtmlController::class.java.`package`.implementationVersion
+                ?: return "DEVELOPER"
         return version.ifBlank {
             "DEVELOPER"
         }

module-server/src/main/kotlin/de/twomartens/wahlrecht/controller/v1/HealthCheckController.kt

@@ -1,5 +1,6 @@
 package de.twomartens.wahlrecht.controller.v1
 
+import de.twomartens.wahlrecht.property.ServiceProperties
 import io.swagger.v3.oas.annotations.Hidden
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
@@ -7,11 +8,12 @@ import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @RequestMapping(value = ["/wahlrecht/v1"])
-class HealthCheckController {
+class HealthCheckController(private val properties: ServiceProperties) {
+
 
     @Hidden
     @GetMapping("/healthCheck")
     fun healthCheck(message: String): String {
-        return message
+        return properties.greeting.format(message)
     }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/monitoring/actuator/RestHealthIndicator.kt

@@ -1,6 +1,7 @@
 package de.twomartens.wahlrecht.monitoring.actuator
 
 import de.twomartens.wahlrecht.interceptor.HeaderInterceptorRest
+import de.twomartens.wahlrecht.property.ServiceProperties
 import org.springframework.boot.actuate.health.Health
 import org.springframework.boot.actuate.health.HealthIndicator
 import org.springframework.boot.actuate.health.Status
@@ -28,8 +29,10 @@ import java.time.Clock
  */
 @Component
 class RestHealthIndicator(
-    clock: Clock, interceptor: HeaderInterceptorRest,
-    serverProperties: ServerProperties, private val restTemplateRestHealthIndicator: RestTemplate
+        clock: Clock, interceptor: HeaderInterceptorRest,
+        serverProperties: ServerProperties,
+        private val restTemplateRestHealthIndicator: RestTemplate,
+        private val serviceProperties: ServiceProperties
 ) : AbstractHealthIndicator(clock, Preparable { interceptor.markAsHealthCheck() }), HealthIndicator {
     private val randomizer = SecureRandom()
     private val urlPrefix: String = (HTTP_PREFIX + HOST + HOST_PORT_SEPARATOR
@@ -43,10 +46,10 @@ class RestHealthIndicator(
         val random = randomizer.nextInt(100000, 999999).toString()
         val url = "$urlPrefix{random}"
         val response = restTemplateRestHealthIndicator.getForEntity(url, String::class.java, random)
-        val status = if (response.body == random) Status.UP else Status.DOWN
+        val status = if (response.body == serviceProperties.greeting.format(random)) Status.UP else Status.DOWN
         return Health.status(status)
-            .withDetail(DETAIL_ENDPOINT_KEY, url)
-            .build()
+                .withDetail(DETAIL_ENDPOINT_KEY, url)
+                .build()
     }
 
     companion object {

module-server/src/main/kotlin/de/twomartens/wahlrecht/service/PropertyReloadService.kt

@@ -1,41 +0,0 @@
-package de.twomartens.wahlrecht.service
-
-import mu.KotlinLogging
-import org.apache.logging.log4j.message.StringMapMessage
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.cloud.context.refresh.ContextRefresher
-import org.springframework.scheduling.annotation.Scheduled
-import org.springframework.stereotype.Service
-import java.util.concurrent.TimeUnit
-
-/**
- * automatically reloads application*.yaml. reload can also be triggered manually by doing a post
- * request on http://localhost:12001/actuator/refresh
- */
-@Service
-class PropertyReloadService(@Qualifier("configDataContextRefresher") private val contextRefresher: ContextRefresher) {
-    @Scheduled(
-        fixedDelay = REFRESH_SECONDS.toLong(),
-        initialDelay = REFRESH_SECONDS.toLong(),
-        timeUnit = TimeUnit.SECONDS
-    )
-    fun refresh() {
-        val properties = contextRefresher.refresh()
-        if (properties.isNotEmpty()) {
-            log.info(
-                StringMapMessage()
-                    .with(PARAM_MESSAGE, "properties changed")
-                    .with(PARAM_PROPERTIES, properties.joinToString("\n"))
-                    .asString()
-            )
-        }
-    }
-
-    companion object {
-        const val REFRESH_SECONDS = 60
-        const val PARAM_MESSAGE = "message"
-        const val PARAM_PROPERTIES = "labels.properties"
-
-        private val log = KotlinLogging.logger {}
-    }
-}

module-server/src/main/resources/application-dev.yaml

@@ -1,2 +1,9 @@
 server.port: 12000
 management.server.port: 12001
+
+
+spring:
+  config:
+    import:
+      - "classpath:config/wahlrecht.yaml"
+      - "optional:configserver:http://localhost:8888/config"

module-server/src/main/resources/application-prod.yaml

@@ -0,0 +1,5 @@
+spring:
+  config:
+    import:
+      - "classpath:config/wahlrecht.yaml"
+      - "optional:configserver:http://configserver:8888/config"

module-server/src/main/resources/application.yaml

@@ -23,9 +23,9 @@ management:
     http.server.requests: true
 
 spring:
-  spring:
+  cloud:
     config:
-      import: "optional:configserver:http://localhost:8888/config"
+      name: wahlrecht
   main:
     banner-mode: off
   profiles:
@@ -38,19 +38,6 @@ spring:
       resourceserver:
         jwt:
           jwk-set-uri: https://id.2martens.de/realms/2martens/protocol/openid-connect/certs
-  application:
-    name: wahlrecht
-
-
-# properties for application
-de.twomartens.wahlrecht:
-  defaultTimeZone: Europe/Berlin
-  greeting: "Hello %s"
-  statusprobe:
-    scheduleDuration: 60
-    maxKafkaFailureDuration: 5
-    maxBlobFailureCount: 5
-    maxFailurePercent: 50
 
 springdoc:
   swagger-ui:

module-server/src/main/resources/config/wahlrecht-prod.yaml

@@ -0,0 +1,2 @@
+de.twomartens.wahlrecht:
+  greeting: "Moin %s, you are great"

module-server/src/main/resources/config/wahlrecht.yaml

@@ -0,0 +1,8 @@
+de.twomartens.wahlrecht:
+  defaultTimeZone: Europe/Berlin
+  greeting: "Hello %s, on millenium"
+  statusprobe:
+    scheduleDuration: 60
+    maxKafkaFailureDuration: 5
+    maxBlobFailureCount: 5
+    maxFailurePercent: 50

scripts/major.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew -Prelease.scope=major $@

scripts/minor.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew -Prelease.scope=minor $@

scripts/patch.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew -Prelease.scope=patch $@