Move configserver import to bootstrap.yaml

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-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/OpenApiConfiguration.kt

@@ -36,7 +36,7 @@ open class OpenApiConfiguration {
                     .version(apiVersion)
                     .description(apiDescription)
             )
-                .addServersItem(Server().url("http://localhost:12000"))
-                .addServersItem(Server().url("https://api.2martens.de"))
+            .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.yaml

@@ -23,8 +23,6 @@ management:
     http.server.requests: true
 
 spring:
-  config:
-    import: "optional:configserver:http://127.0.0.1:8888/config"
   main:
     banner-mode: off
   profiles:

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

@@ -0,0 +1,3 @@
+spring:
+  config:
+    import: "optional:configserver:http://configserver:8888/config"