Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Commit 334ff0e

Browse files
hhundhhund
committed
process version in generated .env file, env var used in docker-compose
Added new process version environment variable to generated .env file. PROCESS_VERSION environment variable now used in process exclude config in docker-compose file.
1 parent 5a37f79 commit 334ff0e

4 files changed

Lines changed: 37 additions & 14 deletions

File tree

‎codex-processes-ap1-docker-test-setup/docker-compose.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ services:
162162
ORG_HIGHMED_DSF_BPE_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_DIC
163163
ORG_HIGHMED_DSF_BPE_FHIR_SERVER_BASE_URL: https://dic/fhir
164164
ORG_HIGHMED_DSF_BPE_PROCESS_EXCLUDED: |
165-
wwwnetzwerk-universitaetsmedizinde_dataTranslate/0.5.1
166-
wwwnetzwerk-universitaetsmedizinde_dataReceive/0.5.1
165+
wwwnetzwerk-universitaetsmedizinde_dataTranslate/${PROCESS_VERSION}
166+
wwwnetzwerk-universitaetsmedizinde_dataReceive/${PROCESS_VERSION}
167167
DE_NETZWERK_UNIVERSITAETSMEDIZIN_CODEX_GTH_IDENTIFIER_VALUE: Test_GTH
168168
DE_NETZWERK_UNIVERSITAETSMEDIZIN_CODEX_CRR_PUBLIC_KEY: /run/secrets/codex_crr_public_key.pem
169169
DE_NETZWERK_UNIVERSITAETSMEDIZIN_CODEX_GECCO_SERVER_BASE_URL: http://dic-fhir-store:8080/fhir
@@ -295,9 +295,9 @@ services:
295295
ORG_HIGHMED_DSF_BPE_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_GTH
296296
ORG_HIGHMED_DSF_BPE_FHIR_SERVER_BASE_URL: https://gth/fhir
297297
ORG_HIGHMED_DSF_BPE_PROCESS_EXCLUDED: |
298-
wwwnetzwerk-universitaetsmedizinde_dataTrigger/0.5.1
299-
wwwnetzwerk-universitaetsmedizinde_dataSend/0.5.1
300-
wwwnetzwerk-universitaetsmedizinde_dataReceive/0.5.1
298+
wwwnetzwerk-universitaetsmedizinde_dataTrigger/${PROCESS_VERSION}
299+
wwwnetzwerk-universitaetsmedizinde_dataSend/${PROCESS_VERSION}
300+
wwwnetzwerk-universitaetsmedizinde_dataReceive/${PROCESS_VERSION}
301301
DE_NETZWERK_UNIVERSITAETSMEDIZIN_CODEX_GTH_IDENTIFIER_VALUE: Test_GTH
302302
DE_NETZWERK_UNIVERSITAETSMEDIZIN_CODEX_CRR_IDENTIFIER_VALUE: Test_CRR
303303
networks:
@@ -403,9 +403,9 @@ services:
403403
ORG_HIGHMED_DSF_BPE_FHIR_SERVER_ORGANIZATION_IDENTIFIER_VALUE: Test_CRR
404404
ORG_HIGHMED_DSF_BPE_FHIR_SERVER_BASE_URL: https://crr/fhir
405405
ORG_HIGHMED_DSF_BPE_PROCESS_EXCLUDED: |
406-
wwwnetzwerk-universitaetsmedizinde_dataTrigger/0.5.1
407-
wwwnetzwerk-universitaetsmedizinde_dataSend/0.5.1
408-
wwwnetzwerk-universitaetsmedizinde_dataTranslate/0.5.1
406+
wwwnetzwerk-universitaetsmedizinde_dataTrigger/${PROCESS_VERSION}
407+
wwwnetzwerk-universitaetsmedizinde_dataSend/${PROCESS_VERSION}
408+
wwwnetzwerk-universitaetsmedizinde_dataTranslate/${PROCESS_VERSION}
409409
DE_NETZWERK_UNIVERSITAETSMEDIZIN_CODEX_GTH_IDENTIFIER_VALUE: Test_GTH
410410
DE_NETZWERK_UNIVERSITAETSMEDIZIN_CODEX_CRR_IDENTIFIER_VALUE: Test_CRR
411411
DE_NETZWERK_UNIVERSITAETSMEDIZIN_CODEX_CRR_PRIVATE_KEY: /run/secrets/codex_crr_private_key.pem

‎codex-processes-ap1-test-data-generator/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
42
<modelVersion>4.0.0</modelVersion>
53

64
<artifactId>codex-processes-ap1-test-data-generator</artifactId>
@@ -16,6 +14,10 @@
1614
</properties>
1715

1816
<dependencies>
17+
<dependency>
18+
<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
19+
<artifactId>codex-process-data-transfer</artifactId>
20+
</dependency>
1921
<dependency>
2022
<groupId>de.hs-heilbronn.mi</groupId>
2123
<artifactId>log4j2-utils</artifactId>
@@ -61,7 +63,7 @@
6163
<executable>java</executable>
6264
<arguments>
6365
<argument>-classpath</argument>
64-
<classpath/>
66+
<classpath />
6567
<argument>de.netzwerk_universitaetsmedizin.codex.processes.tools.generator.TestDataGenerator</argument>
6668
</arguments>
6769
<workingDirectory>${project.basedir}</workingDirectory>

‎codex-processes-ap1-test-data-generator/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/tools/generator/EnvGenerator.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.slf4j.Logger;
1616
import org.slf4j.LoggerFactory;
1717

18+
import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.DataTransferProcessPluginDefinition;
1819
import de.netzwerk_universitaetsmedizin.codex.processes.tools.generator.CertificateGenerator.CertificateFiles;
1920

2021
public class EnvGenerator
@@ -23,6 +24,7 @@ public class EnvGenerator
2324

2425
private static final String USER_THUMBPRINTS = "USER_THUMBPRINTS";
2526
private static final String USER_THUMBPRINTS_PERMANENTDELETE = "USER_THUMBPRINTS_PERMANENT_DELETE";
27+
private static final String PROCESS_VERSION = "PROCESS_VERSION";
2628

2729
private static final class EnvEntry
2830
{
@@ -66,7 +68,9 @@ public void generateAndWriteDockerTestFhirEnvFiles(Map<String, CertificateFiles>
6668
new EnvEntry("GTH_" + USER_THUMBPRINTS, gthUserThumbprints, "GTH_" + USER_THUMBPRINTS_PERMANENTDELETE,
6769
gthUserThumbprintsPermanentDelete));
6870

69-
writeEnvFile(Paths.get("../codex-processes-ap1-docker-test-setup/.env"), entries);
71+
Map<String, String> additionalEntries = Map.of(PROCESS_VERSION, DataTransferProcessPluginDefinition.VERSION);
72+
73+
writeEnvFile(Paths.get("../codex-processes-ap1-docker-test-setup/.env"), entries, additionalEntries);
7074
}
7175

7276
private Stream<String> filterAndMapToThumbprint(Map<String, CertificateFiles> clientCertificateFilesByCommonName,
@@ -78,7 +82,7 @@ private Stream<String> filterAndMapToThumbprint(Map<String, CertificateFiles> cl
7882
.map(CertificateFiles::getCertificateSha512ThumbprintHex);
7983
}
8084

81-
private void writeEnvFile(Path target, List<? extends EnvEntry> entries)
85+
private void writeEnvFile(Path target, List<? extends EnvEntry> entries, Map<String, String> additionalEntries)
8286
{
8387
StringBuilder builder = new StringBuilder();
8488

@@ -98,6 +102,17 @@ private void writeEnvFile(Path target, List<? extends EnvEntry> entries)
98102
builder.append("\n\n");
99103
}
100104

105+
if (!additionalEntries.isEmpty())
106+
builder.append('\n');
107+
108+
for (Entry<String, String> entry : additionalEntries.entrySet())
109+
{
110+
builder.append('\n');
111+
builder.append(entry.getKey());
112+
builder.append('=');
113+
builder.append(entry.getValue());
114+
}
115+
101116
try
102117
{
103118
logger.info("Writing .env file to {}", target.toString());

‎pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656

5757
<dependencyManagement>
5858
<dependencies>
59+
<dependency>
60+
<groupId>${project.groupId}</groupId>
61+
<artifactId>codex-process-data-transfer</artifactId>
62+
<version>${project.version}</version>
63+
</dependency>
64+
5965
<!-- highmed-dsf -->
6066
<dependency>
6167
<groupId>org.highmed.dsf</groupId>

0 commit comments

Comments
 (0)