Remove configserver import from general configuration

.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()
-}
+val formatter: DateTimeFormatter = ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
 
 tasks.bootJar {
-    enabled = false
+    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.jar {
-    enabled = true
-    archiveClassifier.set("")
+springBoot {
+    buildInfo()
+    mainClass.set("de.twomartens.wahlrecht.MainApplicationKt")
 }
-
-tasks.bootDistZip {
-    dependsOn(tasks.jar)
-}
-
-tasks.bootDistTar {
-    dependsOn(tasks.jar)
-}
-
-tasks.bootStartScripts {
-    dependsOn(tasks.jar)
-}

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-server/server.gradle.kts

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

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/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:
-    config:
-      import: "optional:configserver:http://localhost:8888/config"
+  config:
+    import:
+      - "classpath:config/wahlrecht.yaml"
   main:
     banner-mode: off
   profiles:
@@ -42,16 +42,6 @@ spring:
     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:
     display-request-duration: true

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

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

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

@@ -0,0 +1,8 @@
+de.twomartens.wahlrecht:
+  defaultTimeZone: Europe/Berlin
+  greeting: "Hello %s"
+  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 $@