more updates

Author: seran

.gitignore

@@ -270,6 +270,7 @@ jdk_17_maven/cs/rest/signal-server/service/target/
 jdk_17_maven/cs/rest/signal-server/api-doc/target/
 jdk_17_maven/em/embedded/rest/signal-server/target/
 jdk_17_maven/cs/rest/familie-tilbake/target/
+jdk_17_maven/em/embedded/rest/familie-tilbake/target/
 
 /jdk_8_maven/em/embedded/grpc/ncs/target/
 /jdk_8_maven/em/embedded/grpc/scs/target/

jdk_17_maven/em/embedded/rest/familie-tilbake/src/main/java/em/embedded/familie/tilbake/EmbeddedEvoMasterController.java

@@ -28,6 +28,8 @@ public class EmbeddedEvoMasterController extends EmbeddedSutController {
 
     private static final int POSTGRES_PORT = 5432;
 
+    private static final String INIT_DB_SCRIPT = "init.sql";
+
     private static final GenericContainer postgresContainer = new GenericContainer("postgres:" + POSTGRES_VERSION)
             .withEnv("POSTGRES_PASSWORD", POSTGRES_PASSWORD)
             .withEnv("POSTGRES_HOST_AUTH_METHOD", "trust") //to allow all connections without a password
@@ -87,17 +89,25 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
     public String startSut() {
         postgresContainer.start();
 
+        String postgresURL = "postgres://" + postgresContainer.getHost() + ":" + postgresContainer.getMappedPort(POSTGRES_PORT) + "/familietilbake";
+
         ctx = SpringApplication.run(Launcher.class, new String[]{
                 "--server.port=0",
-                "--spring.profiles.active=local",
+                "--spring.profiles.active=dev",
                 "--management.server.port=-1",
                 "--server.ssl.enabled=false",
-                "--spring.datasource.url=jdbc:postgresql://localhost:5432/familie-tilbake",
+                "--spring.datasource.url=jdbc:" + postgresURL,
                 "--spring.datasource.username=postgres",
-                "--spring.datasource.password=test",
+                "--spring.datasource.password=" + POSTGRES_PASSWORD,
                 "--sentry.logging.enabled=false",
+                "--sentry.environment=local",
+                "--logging.path=target",
+                "--spring.main.web-application-type=none"
         });
 
+        // https://www.baeldung.com/spring-boot-application-context-exception
+        // spring.main.web-application-type=none
+
         if (sqlConnection != null) {
             try {
                 sqlConnection.close();
@@ -112,7 +122,7 @@ public String startSut() {
             throw new RuntimeException(e);
         }
 
-        dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES, sqlConnection));
+        dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES, sqlConnection).withInitSqlOnResourcePath(INIT_DB_SCRIPT));
 
         return "http://localhost:" + getSutPort();
     }

jdk_17_maven/em/embedded/rest/familie-tilbake/src/main/resources/init.sql

@@ -0,0 +1 @@
+CREATE DATABASE familietilbake;

jdk_17_maven/em/embedded/rest/signal-server/src/main/java/em/embedded/textsecuregcm/EmbeddedEvoMasterController.java

@@ -103,17 +103,19 @@ public String startSut() {
 
         application = new WhisperServerService();
 
+        String redisURL = "redis://" + redisContainer.getHost() + ":" + redisContainer.getMappedPort(REDIS_PORT) + "/";
+
         //Dirty hack for DW...
         System.setProperty("dw.server.applicationConnectors[0].port", "0");
         System.setProperty("dw.server.adminConnectors[0].port", "0");
 
-        System.setProperty("dw.cacheCluster.configurationUri", "redis://0.0.0.0:" + redisContainer.getFirstMappedPort() + "/");
-        System.setProperty("dw.clientPresenceCluster.configurationUri", "redis://0.0.0.0:" + redisContainer.getFirstMappedPort() + "/");
-        System.setProperty("dw.pubsub.uri", "redis://0.0.0.0:" + redisContainer.getFirstMappedPort() + "/");
-        System.setProperty("dw.pushSchedulerCluster.configurationUri", "redis://0.0.0.0:" + redisContainer.getFirstMappedPort() + "/");
-        System.setProperty("dw.rateLimitersCluster.configurationUri", "redis://0.0.0.0:" + redisContainer.getFirstMappedPort() + "/");
-        System.setProperty("dw.messageCache.cluster.configurationUri", "redis://0.0.0.0:" + redisContainer.getFirstMappedPort() + "/");
-        System.setProperty("dw.metricsCluster.configurationUri", "redis://0.0.0.0:" + redisContainer.getFirstMappedPort() + "/");
+        System.setProperty("dw.cacheCluster.configurationUri", redisURL);
+        System.setProperty("dw.clientPresenceCluster.configurationUri", redisURL);
+        System.setProperty("dw.pubsub.uri", redisURL);
+        System.setProperty("dw.pushSchedulerCluster.configurationUri", redisURL);
+        System.setProperty("dw.rateLimitersCluster.configurationUri", redisURL);
+        System.setProperty("dw.messageCache.cluster.configurationUri", redisURL);
+        System.setProperty("dw.metricsCluster.configurationUri", redisURL);
 
         try {
             application.run("server", "src/main/resources/em-sample.yml");