Merge pull request #40 from DiSSCo/bug-fix/db-url

Match translator db url to orechstration backend

.github/workflows/.trivyignore

@@ -0,0 +1,3 @@
+# April 18 2024
+# Spring boot needs to update its version of spring
+CVE-2024-22262

src/main/java/eu/dissco/orchestration/backend/properties/TranslatorJobProperties.java

@@ -2,6 +2,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
@@ -24,4 +25,8 @@ public class TranslatorJobProperties {
   @NotBlank
   private String namespace = "translator-services";
 
+  @NotBlank
+  @Value("${spring.datasource.url}")
+  private String databaseUrl;
+
 }

src/main/java/eu/dissco/orchestration/backend/service/SourceSystemService.java

@@ -342,6 +342,7 @@ private Map<String, Object> getTemplateProperties(SourceSystemRecord sourceSyste
     map.put("containerName", jobName);
     map.put("kafkaHost", jobProperties.getKafkaHost());
     map.put("kafkaTopic", jobProperties.getKafkaTopic());
+    map.put("database_url", jobProperties.getDatabaseUrl());
     if (isCronJob) {
       map.put("cron", generateCron());
     }

src/main/resources/templates/biocase-cron-job.ftl

@@ -29,7 +29,7 @@ spec:
             - name: webclient.sourceSystemId
               value: ${sourceSystemId}
             - name: spring.datasource.url
-              value: jdbc:postgresql://terraform-20230822143945532600000001.cbppwfnjypll.eu-west-2.rds.amazonaws.com:5432/dissco
+              value: ${database_url}
             - name: spring.datasource.username
               valueFrom:
                 secretKeyRef:

src/main/resources/templates/biocase-translator-job.ftl

@@ -27,7 +27,7 @@ spec:
             - name: webclient.sourceSystemId
               value: ${sourceSystemId}
             - name: spring.datasource.url
-              value: jdbc:postgresql://terraform-20230822143945532600000001.cbppwfnjypll.eu-west-2.rds.amazonaws.com:5432/dissco
+              value: ${database_url}
             - name: spring.datasource.username
               valueFrom:
                 secretKeyRef:

src/main/resources/templates/dwca-cron-job.ftl

@@ -33,7 +33,7 @@ spec:
             - name: webclient.sourceSystemId
               value: ${sourceSystemId}
             - name: spring.datasource.url
-              value: jdbc:postgresql://terraform-20230822143945532600000001.cbppwfnjypll.eu-west-2.rds.amazonaws.com:5432/dissco
+              value: ${database_url}
             - name: spring.datasource.username
               valueFrom:
                 secretKeyRef:

src/main/resources/templates/dwca-translator-job.ftl

@@ -31,7 +31,7 @@ spec:
             - name: webclient.sourceSystemId
               value: ${sourceSystemId}
             - name: spring.datasource.url
-              value: jdbc:postgresql://terraform-20230822143945532600000001.cbppwfnjypll.eu-west-2.rds.amazonaws.com:5432/dissco
+              value: ${database_url}
             - name: spring.datasource.username
               valueFrom:
                 secretKeyRef:

src/test/java/eu/dissco/orchestration/backend/service/SourceSystemServiceTest.java

@@ -101,6 +101,7 @@ class SourceSystemServiceTest {
 
   @BeforeEach
   void setup() throws IOException {
+    jobProperties.setDatabaseUrl("jdbc:postgresql://localhost:5432/translator");
     service = new SourceSystemService(builder, handleComponent, repository, mappingService,
         kafkaPublisherService, MAPPER, yamlMapper, jobProperties, configuration, batchV1Api, random);
     initTime();