diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 28fab29f9e443b50b32b87d68c9ffdedc0220d4d..1f3c97142e3282e62cc84628cffb0ce376b21ace 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -58,6 +58,21 @@ spec:
component: antragsraum-server
{{- end }}
+ - from:
+ - namespaceSelector:
+ matchLabels:
+ kubernetes.io/metadata.name: {{ (.Values.networkPolicy).zentralerEingangNamespace }}
+ podSelector:
+ matchExpressions:
+ - key: ozg-component
+ operator: In
+ values:
+ - eingangsadapter
+ - xta-adapter
+ ports:
+ - protocol: TCP
+ port: 9090
+
{{- with (.Values.networkPolicy).additionalIngressConfigLocal }}
{{ toYaml . | indent 2 }}
{{- end }}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 5182d0baab596a8abe3a67fcaa32c1f87e78b615..30fe6d16e7959cfd36ad808debca0000f7ea0419 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -58,7 +58,10 @@ vorgangmanagerName: vorgang-manager
usermanagerName: user-manager
zufiManager:
- address: dns://zufi.zufi-manager:9090
+ address: dns://zufi-manager.zufi:9090
elasticsearch:
certificateSecretName: elasticsearch-certificate
+
+networkPolicy:
+ zentralerEingangNamespace: zentraler-eingang
\ No newline at end of file
diff --git a/src/test/helm/deployment_zufimanager_address_env_test.yaml b/src/test/helm/deployment_zufimanager_address_env_test.yaml
index 4771f72d053c23395bf8a67afb2684241875cd71..8a16fc9df3dd161711d0a6803f2383106222cba8 100644
--- a/src/test/helm/deployment_zufimanager_address_env_test.yaml
+++ b/src/test/helm/deployment_zufimanager_address_env_test.yaml
@@ -39,4 +39,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_zufi-manager_address
- value: dns://zufi.zufi-manager:9090
+ value: dns://zufi-manager.zufi:9090
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index f63746306c5edeaa76f17028551c04243a137d31..4a10bb1398946fc48c6e90783a1c3af5fc592e6f 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -158,6 +158,53 @@ tests:
- failedTemplate:
errorMessage: ozgcloud.antragraum.namespace must be set if antragraum is enabled
+ - it: should add default ingress rule for zentraler-eingang
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-namespace
+ asserts:
+ - contains:
+ path: spec.ingress
+ content:
+ from:
+ - namespaceSelector:
+ matchLabels:
+ kubernetes.io/metadata.name: zentraler-eingang
+ podSelector:
+ matchExpressions:
+ - key: ozg-component
+ operator: In
+ values:
+ - eingangsadapter
+ - xta-adapter
+ ports:
+ - protocol: TCP
+ port: 9090
+
+ - it: should add ingress rule for zentraler-eingang
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-namespace
+ zentralerEingangNamespace: custom-namespace
+ asserts:
+ - contains:
+ path: spec.ingress
+ content:
+ from:
+ - namespaceSelector:
+ matchLabels:
+ kubernetes.io/metadata.name: custom-namespace
+ podSelector:
+ matchExpressions:
+ - key: ozg-component
+ operator: In
+ values:
+ - eingangsadapter
+ - xta-adapter
+ ports:
+ - protocol: TCP
+ port: 9090
+
- it: should add egress rule to elasticsearch
set:
diff --git a/vorgang-manager-interface/src/main/protobuf/binaryfile.proto b/vorgang-manager-interface/src/main/protobuf/binaryfile.proto
index 8f1e06f73e0299978faf0f7918b7f595def81758..75e8fe4f5fc9dde1ed30ccf4d6b92ede60208a31 100644
--- a/vorgang-manager-interface/src/main/protobuf/binaryfile.proto
+++ b/vorgang-manager-interface/src/main/protobuf/binaryfile.proto
@@ -26,7 +26,7 @@ syntax = "proto3";
package de.ozgcloud.vorgang.grpc.binaryFile;
import "callcontext.proto";
-import "filemodel.proto";
+import "file.model.proto";
option java_multiple_files = true;
option java_package = "de.ozgcloud.vorgang.grpc.binaryFile";
@@ -42,12 +42,6 @@ service BinaryFileService {
rpc FindBinaryFilesMetaData(GrpcBinaryFilesRequest) returns (GrpcFindFilesResponse) {
}
-
- rpc GetAttachments(GrpcGetAttachmentsRequest) returns (GrpcGetAttachmentsResponse) {
- }
-
- rpc GetRepresentations(GrpcGetRepresentationsRequest) returns (GrpcGetRepresentationsResponse) {
- }
}
message GrpcBinaryFilesRequest {
@@ -93,22 +87,6 @@ message GrpcGetBinaryFileDataResponse {
bytes fileContent = 1;
}
-message GrpcGetAttachmentsRequest {
- de.ozgcloud.vorgang.grpc.command.GrpcCallContext context = 1;
- string eingangId = 2;
-}
-message GrpcGetAttachmentsResponse {
- repeated GrpcBinaryFile file = 1;
-}
-
-message GrpcGetRepresentationsRequest {
- de.ozgcloud.vorgang.grpc.command.GrpcCallContext context = 1;
- string eingangId = 2;
-}
-message GrpcGetRepresentationsResponse {
- repeated GrpcBinaryFile file = 1;
-}
-
message GrpcBinaryFile {
string id = 1;
string name = 2;
diff --git a/vorgang-manager-interface/src/main/protobuf/filemodel.proto b/vorgang-manager-interface/src/main/protobuf/file.model.proto
similarity index 98%
rename from vorgang-manager-interface/src/main/protobuf/filemodel.proto
rename to vorgang-manager-interface/src/main/protobuf/file.model.proto
index 87f45d6f43d0136f356e416e5161f6406635fc6a..0e82120cb1870ae28f60ebd314d6257b76178042 100644
--- a/vorgang-manager-interface/src/main/protobuf/filemodel.proto
+++ b/vorgang-manager-interface/src/main/protobuf/file.model.proto
@@ -29,7 +29,7 @@ import "callcontext.proto";
option java_multiple_files = true;
option java_outer_classname = "FileModelProto";
-option deprecated = true;
+
message GrpcGetAttachmentsRequest {
de.ozgcloud.vorgang.grpc.command.GrpcCallContext context = 1;
diff --git a/vorgang-manager-interface/src/main/protobuf/file.proto b/vorgang-manager-interface/src/main/protobuf/file.proto
index 05a71d514b1da3af3b355f0bb9ab47ffa222a540..724c5408539da390da032cccad13d984ddc97553 100644
--- a/vorgang-manager-interface/src/main/protobuf/file.proto
+++ b/vorgang-manager-interface/src/main/protobuf/file.proto
@@ -25,12 +25,11 @@ syntax = "proto3";
package de.ozgcloud.vorgang.grpc.file;
-import "filemodel.proto";
+import "file.model.proto";
option java_multiple_files = true;
option java_package = "de.ozgcloud.vorgang.grpc.file";
option java_outer_classname = "FileProto";
-option deprecated = true;
service FileService {
rpc GetAttachments(GrpcGetAttachmentsRequest) returns (GrpcGetAttachmentsResponse) {
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java
index 4c7bb459c80b6c4e5a3aa39a88afcad0d0ebf9aa..5c887aa6ed5846ec1cd28c7521713addd786b79e 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java
@@ -25,9 +25,6 @@ import java.net.URLConnection;
import java.util.Base64;
import java.util.Map;
import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import java.util.stream.Stream;
import jakarta.activation.MimetypesFileTypeMap;
@@ -98,12 +95,7 @@ class PersistPostfachNachrichtByCommandService implements PersistPostfachNachric
createUploadedFilesReference(vorgangId),
createOzgFile(attachment.getName(), contentType, decContent.length),
Optional.empty(),
- new ByteArrayInputStream(decContent)).get(10, TimeUnit.MINUTES).toString();
- } catch (ExecutionException | TimeoutException e) {
- throw new TechnicalException(e.getMessage(), e);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new TechnicalException(e.getMessage(), e);
+ new ByteArrayInputStream(decContent)).toString();
} catch (IOException e) {
throw new TechnicalException("Can not read attached file", e);
}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileService.java
index a93e596a1061f7050b7768ff04bdc7d027fe0f46..0d7b3bce1e8afec53d0c9a0cf082376d95f31b1c 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileService.java
@@ -60,17 +60,17 @@ public class FileService implements BinaryFileService {
return repository.findRepresentationsByEingangId(eingangId);
}
- public CompletableFuture<FileId> uploadFileStream(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
+ public FileId uploadFileStream(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
return uploadFile(ref, file, userId, content);
}
@Async
public CompletableFuture<FileId> uploadFileStreamAsync(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
- return uploadFile(ref, file, userId, content);
+ return CompletableFuture.completedFuture(uploadFile(ref, file, userId, content));
}
- CompletableFuture<FileId> uploadFile(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
- return CompletableFuture.completedFuture(binaryFileRepository.addContentStream(ref, file, userId, content));
+ FileId uploadFile(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
+ return binaryFileRepository.addContentStream(ref, file, userId, content);
}
public InputStream getUploadedFileStream(FileId fileId) {
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcOzgFileMapper.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcOzgFileMapper.java
index eb119d1fab2e66f973ba53547af623014568f7c3..3a961ad8c2f121b1eb52efcb611b4cf614538070 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcOzgFileMapper.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcOzgFileMapper.java
@@ -32,12 +32,7 @@ import org.mapstruct.NullValueCheckStrategy;
import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
// TODO rename to GrpcBinaryFileMapper
-/**
- * @deprecated will be renamed to GrpcBinaryFileMapper
- *
- */
@Mapper(uses = FileIdMapper.class, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-@Deprecated(since = "0.25", forRemoval = true)
interface GrpcOzgFileMapper {
@Mapping(target = "mergeFrom", ignore = true)
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java
index 7075a16dbee0496c3b2663dc8111fe3ef1300098..8043e664848e3c8f6e2beb30065b4324fd8422b2 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.*;
import java.io.InputStream;
import java.util.Map;
import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
import java.util.stream.Stream;
import org.apache.http.entity.ContentType;
@@ -196,7 +195,7 @@ class PersistPostfachNachrichtByCommandServiceTest {
class TestPersistAttachment {
@BeforeEach
void init() {
- when(fileService.uploadFileStream(any(), any(), any(), any())).thenReturn(CompletableFuture.completedFuture(FileId.from("42")));
+ when(fileService.uploadFileStream(any(), any(), any(), any())).thenReturn(FileId.from("42"));
}
@DisplayName("Upload files Reference")
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java
index 020616069044352cefa37d2c441a85e445e506f6..014f2626f235ae0be3919bd5efe3f29dd25b110c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java
@@ -32,7 +32,6 @@ import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
-import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
@@ -112,8 +111,7 @@ class FileServiceTest {
@Test
void shouldReturnId() throws Exception {
- var id = service.uploadFileStream(ref, file, user, contentStream).get(5,
- TimeUnit.SECONDS);
+ var id = service.uploadFileStream(ref, file, user, contentStream);
assertThat(id).isEqualTo(IncomingFileTestFactory.ID);
}