fix: Remove kafka

.drone.yml

@@ -118,10 +118,13 @@ steps:
       - ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
       - git clone ssh://giteajim@git.2martens.de:22/2martens/cloud-configuration.git .
       - git checkout main
-  - name: modify deployed image
+  - name: update image version
     image: alpine
     commands:
-      - sed -i -r "s/(wahlrecht_image_version:).*/\1\ ${DRONE_SEMVER}/" ansible/inventories/host_vars/api-server/public.yaml
+      - mkdir $HOME/bin
+      - wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 -O $HOME/bin/yq && chmod +x $HOME/bin/yq
+      - sed -i -r "s/(tag:).*/\1\ \"${DRONE_SEMVER}\"/" argocd/wahlrecht/${DRONE_DEPLOY_TO}/overwrite_values.yaml
+      - cd argocd/wahlrecht/${DRONE_DEPLOY_TO} && $HOME/bin/yq '. *= load("overwrite_values.yaml")' default_values.yaml > values.yaml
   - name: save modified variable file
     image: alpine/git
     environment:
@@ -134,32 +137,13 @@ 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 add ansible/inventories/host_vars/api-server/public.yaml
+      - git add argocd/wahlrecht/${DRONE_DEPLOY_TO}/*
       - git diff-index --quiet HEAD || git commit -m "[Drone] Changed wahlrecht_image_version to ${DRONE_SEMVER}"
       - git push origin main
-  - name: deploy image
-    image: plugins/ansible:latest
-    volumes:
-      - name: cache
-        path: /root/.ansible
-    settings:
-      playbook: ansible/deploy_spring.yaml
-      inventory: ansible/inventories/production
-      galaxy: ansible/requirements.yaml
-      galaxy_force: false
-      private_key:
-        from_secret: private_ssh_key
-      vault_password:
-        from_secret: vault_password
-
-volumes:
-  - name: cache
-    host:
-      path: /var/lib/drone/cache/.ansible
 
 trigger:
   target:
-    - production
+    - test
   event:
     include:
       - promote

.run/MainApplication.run.xml

@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="MainApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
-    <module name="wahlrecht.server.main" />
-    <option name="SPRING_BOOT_MAIN_CLASS" value="de.twomartens.wahlrecht.MainApplication" />
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="true" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".env" />
-      </ENTRIES>
-    </extension>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>

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

@@ -54,7 +54,7 @@ normalization.runtimeClasspath.metaInf {
 }
 
 tasks.register("cleanLibs") {
-    delete("${buildDir}/libs")
+    delete("${layout.buildDirectory}/libs")
 }
 
 tasks.build {

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

@@ -9,10 +9,10 @@ apply(plugin="com.netflix.nebula.release")
 tasks.register("writeVersionProperties") {
     group = "version"
     mustRunAfter("release")
-    outputs.file("$buildDir/version.properties")
+    outputs.file("${layout.buildDirectory}/version.properties")
-    val directory = buildDir
+    val directory = layout.buildDirectory.asFile
     doLast {
-        Files.createDirectories(directory.toPath())
+        Files.createDirectories(directory.get().toPath())
-        File("$buildDir/version.properties").writeText("VERSION=${project.version}\n")
+        File("${layout.buildDirectory}/version.properties").writeText("VERSION=${project.version}\n")
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

module-deploy/deploy.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
 
 jib {
     from {
-        image = "amazoncorretto:" + properties["projectSourceCompatibility"]
+        image = "amazoncorretto:" + properties["projectSourceCompatibility"] + "-alpine"
         platforms {
             platform {
                 architecture = "amd64"

module-server/server.gradle.kts

@@ -10,5 +10,4 @@ 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/FilterConfiguration.kt

@@ -0,0 +1,13 @@
+package de.twomartens.wahlrecht.configuration
+
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.web.filter.ForwardedHeaderFilter
+
+@Configuration
+open class FilterConfiguration {
+  @Bean
+  open fun forwardedFilter(): ForwardedHeaderFilter {
+    return ForwardedHeaderFilter()
+  }
+}

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

@@ -8,13 +8,13 @@ import java.time.Clock
 
 @Configuration
 open class InterceptorConfiguration {
-    @Bean
+  @Bean
-    open fun loggingInterceptorRest(clock: Clock): LoggingInterceptorRest {
+  open fun loggingInterceptorRest(clock: Clock): LoggingInterceptorRest {
-        return LoggingInterceptorRest(clock)
+    return LoggingInterceptorRest(clock)
-    }
+  }
 
-    @Bean
+  @Bean
-    open fun headerInterceptorRest(): HeaderInterceptorRest {
+  open fun headerInterceptorRest(): HeaderInterceptorRest {
-        return HeaderInterceptorRest()
+    return HeaderInterceptorRest()
-    }
+  }
 }

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

@@ -6,7 +6,6 @@ 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
@@ -36,7 +35,5 @@ 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/security/SpringPolicyEnforcer.kt

@@ -13,53 +13,54 @@ import org.keycloak.representations.idm.authorization.Permission
 class SpringPolicyEnforcer(private val policyEnforcer: PolicyEnforcer,
                            private val policyEnforcerConfig: PolicyEnforcerConfig) {
 
-    fun enforce(request: HttpRequest, response: HttpResponse): AuthorizationContext {
+  fun enforce(request: HttpRequest, response: HttpResponse): AuthorizationContext {
-        if (log.isDebugEnabled) {
+    if (log.isDebugEnabled) {
-            log.debug("Policy enforcement is enabled. Enforcing policy decisions for path [{}].", request.uri)
+      log.debug("Policy enforcement is enabled. Enforcing policy decisions for path [{}].", request.uri)
-        }
-        val context = authorize(request, response)
-        if (log.isDebugEnabled) {
-            log.debug("Policy enforcement result for path [{}] is : {}", request.uri, if (context.isGranted) "GRANTED" else "DENIED")
-            log.debug("Returning authorization context with permissions:")
-            for (permission in context.permissions) {
-                log.debug(permission.toString())
-            }
-        }
-        return context
     }
-
+    val context = authorize(request, response)
-    private fun authorize(request: HttpRequest, response: HttpResponse): AuthorizationContext {
+    if (log.isDebugEnabled) {
-        val enforcementMode = policyEnforcerConfig.enforcementMode
+      log.debug("Policy enforcement result for path [{}] is : {}", request.uri, if (context.isGranted) "GRANTED" else "DENIED")
-        return if (EnforcementMode.DISABLED == enforcementMode) {
+      log.debug("Returning authorization context with permissions:")
-            createAuthorizedContext()
+      for (permission in context.permissions) {
-        } else policyEnforcer.enforce(request, response)
+        log.debug(permission.toString())
+      }
     }
+    return context
+  }
 
-    private fun createAuthorizedContext(): AuthorizationContext {
+  private fun authorize(request: HttpRequest, response: HttpResponse): AuthorizationContext {
-        return object : ClientAuthorizationContext(policyEnforcer.authzClient) {
+    val enforcementMode = policyEnforcerConfig.enforcementMode
-            override fun hasPermission(resourceName: String, scopeName: String): Boolean {
+    log.debug("Authorize with enforcement mode: [{}]", enforcementMode)
-                return true
+    return if (EnforcementMode.DISABLED == enforcementMode) {
-            }
+      createAuthorizedContext()
+    } else policyEnforcer.enforce(request, response)
+  }
 
-            override fun hasResourcePermission(resourceName: String): Boolean {
+  private fun createAuthorizedContext(): AuthorizationContext {
-                return true
+    return object : ClientAuthorizationContext(policyEnforcer.authzClient) {
-            }
+      override fun hasPermission(resourceName: String, scopeName: String): Boolean {
+        return true
+      }
 
-            override fun hasScopePermission(scopeName: String): Boolean {
+      override fun hasResourcePermission(resourceName: String): Boolean {
-                return true
+        return true
-            }
+      }
 
-            override fun getPermissions(): List<Permission> {
+      override fun hasScopePermission(scopeName: String): Boolean {
-                return emptyList()
+        return true
-            }
+      }
 
-            override fun isGranted(): Boolean {
+      override fun getPermissions(): List<Permission> {
-                return true
+        return emptyList()
-            }
+      }
-        }
+
+      override fun isGranted(): Boolean {
+        return true
+      }
     }
+  }
 
-    companion object {
+  companion object {
-        private val log = KotlinLogging.logger {}
+    private val log = KotlinLogging.logger {}
-    }
+  }
 }

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

@@ -1,9 +1,5 @@
-server.port: 12000
-management.server.port: 12001
-
-
 spring:
   config:
     import:
       - "classpath:config/wahlrecht.yaml"
-      - "optional:configserver:http://localhost:8888/config"
+      - "optional:configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"

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

@@ -1,7 +1,4 @@
 spring:
   config:
     import:
-      - "configserver:http://configserver:8888/config"
+      - "configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"
-  kafka:
-    bootstrap-servers:
-      - kafka:9092

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

@@ -1,12 +1,12 @@
 server:
-  port: 12000
+  port: ${PORT:12000}
   shutdown: graceful
   forward-headers-strategy: framework
 
 ### technical configurations ###
 management:
   # for security, don't use same port as application
-  server.port: 12001
+  server.port: ${ACTUATOR_PORT:12001}
   health:
     livenessState.enabled: true
     readinessState.enabled: true
@@ -38,7 +38,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: https://id.2martens.de/realms/2martens/protocol/openid-connect/certs
+          jwk-set-uri: ${KEYCLOAK_URL:https://id.2martens.de}/realms/${KEYCLOAK_REALM:2martens}/protocol/openid-connect/certs
   application:
     name: wahlrecht