Skip to content
Snippets Groups Projects
Commit 399c4276 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-4188-AlfaKonfigurationsparameter

parents 08a60519 c332ef41
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 84 additions and 105 deletions
.gitignore
+ 4
− 4
View file @ 399c4276
......@@ -14,10 +14,10 @@ target/
*.ipr
# Client
goofy-client/.vscode/
goofy-client/apps/coverage/
goofy-client/node/*
goofy-client/temp/*
alfa-client/.vscode/
alfa-client/apps/coverage/
alfa-client/node/*
alfa-client/temp/*
.attach**
.factorypath
README.md
+ 1
− 1
View file @ 399c4276
## Versionen
* Frontend: siehe [Client README.md](./goofy-client/README.md)
* Frontend: siehe [Client README.md](./alfa-client/README.md)
## IDE Setup
Window > Preferences > Maven > Automatically update Maven projects configuration
alfa-client/apps/alfa-e2e/Jenkinsfile
+ 18
− 32
View file @ 399c4276
......@@ -171,25 +171,26 @@ pipeline {
checkoutGitopsE2eBranch()
deleteOzgCloudStack([env.MAIN_BEZEICHNER])
deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
generateMainNamespaceYaml()
generateEaNamespaceYaml()
pushGitopsRepo()
waitForOzgCloudStackRollout([env.MAIN_BEZEICHNER])
waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
post {
failure {
script {
deleteOzgCloudStack([env.MAIN_BEZEICHNER])
deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
}
}
stage('Rollout E2E EA') {
stage('Init PortForwards') {
when {
expression { !SKIP_RUN }
}
......@@ -197,22 +198,7 @@ pipeline {
script {
FAILED_STAGE = env.STAGE_NAME
checkoutGitopsE2eBranch()
deleteOzgCloudStack([env.EA_BEZEICHNER])
generateEaNamespaceYaml()
pushGitopsRepo()
waitForOzgCloudStackRollout([env.EA_BEZEICHNER])
}
}
post {
failure {
script {
deleteOzgCloudStack([env.EA_BEZEICHNER])
}
forwardElasticSearch()
}
}
}
......@@ -414,9 +400,9 @@ Void initEnvUserVersions(userVersions) {
env.ALFA_IMAGE_TAG = userVersions.AlfaImageTag
env.ALFA_HELM_CHART_VERSION = userVersions.AlfaHelmChartVersion
env.ALFA_HELM_REPO_URL = userVersions.AlfaHelmRepoUrl
env.VORGANG_MANAGER_IMAGE_TAG = userVersions.VorgangManagrImageTag
env.VORGANG_MANAGER_HELM_CHART_VERSION = userVersions.VorgangManagrHelmChartVersion
env.VORGANG_MANAGER_HELM_REPO_URL = userVersions.VorgangManagrHelmRepoUrl
env.VORGANG_MANAGER_IMAGE_TAG = userVersions.VorgangManagerImageTag
env.VORGANG_MANAGER_HELM_CHART_VERSION = userVersions.VorgangManagerHelmChartVersion
env.VORGANG_MANAGER_HELM_REPO_URL = userVersions.VorgangManagerHelmRepoUrl
env.USER_MANAGER_IMAGE_TAG = userVersions.UserManagerImageTag
env.USER_MANAGER_HELM_CHART_VERSION = userVersions.UserManagerHelmChartVersion
env.USER_MANAGER_HELM_REPO_URL = userVersions.UserManagerHelmRepoUrl
......
alfa-server/Dockerfile
+ 2
− 2
View file @ 399c4276
......@@ -24,7 +24,7 @@
FROM openjdk:16-alpine
COPY /target/goofy-server.jar /opt/goofy.jar
COPY /target/alfa-server.jar /opt/alfa.jar
WORKDIR /opt
CMD ["java", "-jar", "goofy.jar"]
\ No newline at end of file
CMD ["java", "-jar", "alfa.jar"]
\ No newline at end of file
alfa-server/src/main/resources/application-nf.yaml
+ 5
− 1
View file @ 399c4276
......@@ -2,3 +2,7 @@ ozgcloud:
vorgang:
processorNames:
- ticketCheck
processor:
- formId: mob_dtickerst/mob_dtickerst
formEngineName: AFM
\ No newline at end of file
alfa-service/pom.xml
+ 8
− 8
View file @ 399c4276
......@@ -109,19 +109,19 @@
<!-- own projects -->
<dependency>
<groupId>de.itvsh.ozg.pluto</groupId>
<artifactId>pluto-interface</artifactId>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-interface</artifactId>
</dependency>
<dependency>
<groupId>de.itvsh.ozg.pluto</groupId>
<artifactId>pluto-utils</artifactId>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-utils</artifactId>
</dependency>
<dependency>
<groupId>de.itvsh.kop.common</groupId>
<artifactId>kop-common-pdf</artifactId>
</dependency>
<dependency>
<groupId>de.itvsh.kop.user</groupId>
<groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager-interface</artifactId>
</dependency>
......@@ -163,11 +163,11 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.itvsh.ozg.pluto</groupId>
<artifactId>pluto-utils</artifactId>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-utils</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${pluto.version}</version>
<version>${vorgang-manager.version}</version>
</dependency>
<dependency>
......
alfa-service/src/main/java/de/ozgcloud/alfa/SecurityConfiguration.java
+ 0
− 13
View file @ 399c4276
......@@ -29,8 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
......@@ -38,8 +36,6 @@ import org.springframework.security.config.annotation.web.configurers.oauth2.ser
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.security.web.authentication.session.NullAuthenticatedSessionStrategy;
import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
import org.springframework.security.web.header.writers.frameoptions.XFrameOptionsHeaderWriter;
import org.springframework.security.web.header.writers.frameoptions.XFrameOptionsHeaderWriter.XFrameOptionsMode;
......@@ -90,13 +86,4 @@ public class SecurityConfiguration {
Optional.ofNullable(springJwtProperties.getJwkSetUri()).ifPresent(jwkSetUri -> configurer.jwt().jwkSetUri(jwkSetUri));
}
@Bean
protected SessionAuthenticationStrategy sessionAuthenticationStrategy() {
return new NullAuthenticatedSessionStrategy();
}
@Bean
AuthenticationManager authenticationManager(HttpSecurity http) throws Exception {
return http.getSharedObject(AuthenticationManagerBuilder.class).build();
}
}
alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapper.java
+ 2
− 2
View file @ 399c4276
......@@ -2,8 +2,8 @@ package de.ozgcloud.alfa.common.attacheditem;
import org.mapstruct.Mapper;
import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItem;
@Mapper(uses = GrpcObjectMapper.class)
interface VorgangAttachedItemMapper {
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java
+ 4
− 4
View file @ 399c4276
......@@ -5,12 +5,12 @@ import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
import de.itvsh.ozg.pluto.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
import de.ozgcloud.alfa.common.GrpcUtil;
import de.ozgcloud.alfa.common.errorhandling.ResourceNotFoundException;
import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
import io.grpc.Status.Code;
import io.grpc.StatusRuntimeException;
import net.devh.boot.grpc.client.inject.GrpcClient;
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java
+ 1
− 1
View file @ 399c4276
......@@ -28,7 +28,7 @@ import java.io.OutputStream;
import java.util.concurrent.CompletableFuture;
import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
import io.grpc.stub.StreamObserver;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java
+ 10
− 9
View file @ 399c4276
......@@ -37,17 +37,17 @@ import org.springframework.stereotype.Service;
import com.google.protobuf.ByteString;
import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcBinaryFilesRequest;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataRequest;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileMetaData;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
import de.ozgcloud.alfa.common.callcontext.ContextService;
import de.ozgcloud.alfa.common.file.OzgFile;
import de.ozgcloud.alfa.common.file.OzgFileMapper;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcBinaryFilesRequest;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcGetBinaryFileDataRequest;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileMetaData;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
......@@ -93,7 +93,8 @@ class BinaryFileRemoteService {
return fileIdFuture;
}
BinaryFileUploadStreamObserver createUploadBinaryFileObserver(CompletableFuture<FileId> fileIdFuture, UploadBinaryFileRequest uploadBinaryFileRequest) {
BinaryFileUploadStreamObserver createUploadBinaryFileObserver(CompletableFuture<FileId> fileIdFuture,
UploadBinaryFileRequest uploadBinaryFileRequest) {
var metadataRequest = buildMetaDataRequest(uploadBinaryFileRequest);
var streamer = new ChunkedFileSender<>(uploadBinaryFileRequest.getUploadStream(), CHUNK_SIZE, this::buildChunkRequest, metadataRequest);
return new BinaryFileUploadStreamObserver(fileIdFuture, streamer);
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserver.java
+ 3
− 2
View file @ 399c4276
......@@ -25,8 +25,8 @@ package de.ozgcloud.alfa.common.binaryfile;
import java.util.concurrent.CompletableFuture;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileResponse;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileResponse;
import io.grpc.stub.ClientCallStreamObserver;
import io.grpc.stub.ClientResponseObserver;
import lombok.AccessLevel;
......@@ -49,6 +49,7 @@ class BinaryFileUploadStreamObserver implements ClientResponseObserver<GrpcUploa
this.requestObserver = requestStream;
requestObserver.setOnReadyHandler(() -> fileStreamer.sendChunkTo(requestObserver));
}
@Override
public void onNext(GrpcUploadBinaryFileResponse response) {
fileId = response.getFileId();
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextMapper.java
+ 1
− 1
View file @ 399c4276
......@@ -26,7 +26,7 @@ package de.ozgcloud.alfa.common.callcontext;
import org.mapstruct.Mapper;
import org.springframework.beans.factory.annotation.Autowired;
import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
@Mapper
public abstract class CallContextMapper {
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java
+ 2
− 2
View file @ 399c4276
......@@ -32,11 +32,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
import de.itvsh.ozg.pluto.grpc.command.GrpcUser;
import de.ozgcloud.alfa.RequestAttributes;
import de.ozgcloud.alfa.common.user.CurrentUserService;
import de.ozgcloud.alfa.common.user.UserRole;
import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
import de.ozgcloud.vorgang.grpc.command.GrpcUser;
import io.grpc.Metadata;
import lombok.extern.log4j.Log4j2;
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java
+ 2
− 2
View file @ 399c4276
......@@ -25,9 +25,9 @@ package de.ozgcloud.alfa.common.clientattribute;
import org.springframework.stereotype.Service;
import de.itvsh.ozg.pluto.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
import de.ozgcloud.alfa.common.GrpcUtil;
import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java
+ 4
− 4
View file @ 399c4276
......@@ -26,9 +26,9 @@ package de.ozgcloud.alfa.common.clientattribute;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
@Service
public class ClientAttributeService {
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBodyMapper.java
+ 2
− 2
View file @ 399c4276
......@@ -37,8 +37,8 @@ import org.apache.commons.beanutils.BeanMap;
import org.apache.commons.lang3.StringUtils;
import org.mapstruct.Mapper;
import de.itvsh.ozg.pluto.grpc.command.GrpcCommandBody;
import de.itvsh.ozg.pluto.grpc.command.GrpcCommandBodyField;
import de.ozgcloud.vorgang.grpc.command.GrpcCommandBody;
import de.ozgcloud.vorgang.grpc.command.GrpcCommandBodyField;
@Mapper
public interface CommandBodyMapper {
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandMapper.java
+ 3
− 3
View file @ 399c4276
......@@ -33,13 +33,13 @@ import org.mapstruct.MappingConstants;
import org.mapstruct.ValueMapping;
import org.springframework.beans.factory.annotation.Autowired;
import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
import de.itvsh.ozg.pluto.grpc.command.GrpcRedirectRequest;
import de.ozgcloud.alfa.common.TimeMapper;
import de.ozgcloud.alfa.common.callcontext.CallContextMapper;
import de.ozgcloud.alfa.common.user.UserIdMapper;
import de.ozgcloud.alfa.vorgang.forwarding.RedirectRequest;
import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
import de.ozgcloud.vorgang.grpc.command.GrpcRedirectRequest;
@Mapper(uses = { CallContextMapper.class, TimeMapper.class, CommandBodyMapper.class, GrpcObjectMapper.class, UserIdMapper.class })
public abstract class CommandMapper {
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandRemoteService.java
+ 11
− 11
View file @ 399c4276
......@@ -30,19 +30,19 @@ import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
import de.itvsh.ozg.pluto.grpc.command.GrpcExistsPendingCommandsRequest;
import de.itvsh.ozg.pluto.grpc.command.GrpcFindCommandsRequest;
import de.itvsh.ozg.pluto.grpc.command.GrpcGetCommandRequest;
import de.itvsh.ozg.pluto.grpc.command.GrpcGetPendingCommandsRequest;
import de.itvsh.ozg.pluto.grpc.command.GrpcOrder;
import de.itvsh.ozg.pluto.grpc.command.GrpcRedirectRequest;
import de.itvsh.ozg.pluto.grpc.command.GrpcRevokeCommandRequest;
import de.itvsh.ozg.pluto.grpc.command.GrpcSetCommandExecutedRequest;
import de.ozgcloud.alfa.common.callcontext.ContextService;
import de.ozgcloud.alfa.vorgang.forwarding.RedirectRequest;
import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcExistsPendingCommandsRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcFindCommandsRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetCommandRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
import de.ozgcloud.vorgang.grpc.command.GrpcRedirectRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcRevokeCommandRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcSetCommandExecutedRequest;
import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
......
alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileMapper.java
+ 1
− 1
View file @ 399c4276
......@@ -25,8 +25,8 @@ package de.ozgcloud.alfa.common.file;
import org.mapstruct.Mapper;
import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
import de.ozgcloud.alfa.common.binaryfile.FileId;
import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
@Mapper
public interface OzgFileMapper {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit