From d5355ada6521456fbf198eedb2ee16425c29197d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 23 Nov 2023 15:29:06 +0100
Subject: [PATCH] OZG-3530 replace pluto
---
Jenkinsfile | 38 +++++++++----------
bescheid-manager/pom.xml | 10 ++---
release-startdev.sh | 12 +++---
src/main/helm/app-readme.md | 6 +--
.../de/ozgcloud/vorgang/callcontext/User.java | 2 +-
vorgang-manager-interface/pom.xml | 2 +-
.../vorgang/command/CommandResponse.java | 6 +--
.../src/main/resources/banner.txt | 10 +++--
.../attributes/ClientAttributeITCase.java | 2 +-
.../vorgang/GrpcVorgangServiceTest.java | 4 +-
10 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3093312c1..ac8de4220 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,7 +46,7 @@ pipeline {
}
}
- stage('Build Pluto / NachrichtenManagner') {
+ stage('Build VorgangManager / NachrichtenManagner') {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
@@ -99,7 +99,7 @@ pipeline {
}
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- dir('pluto-server') {
+ dir('vorgang-manager-server') {
sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3'
}
}
@@ -154,7 +154,7 @@ pipeline {
cloneGitopsRepo()
- setNewDevPlutoVersion()
+ setNewDevVorgangManagerVersion()
pushDevGitopsRepo()
}
@@ -171,7 +171,7 @@ pipeline {
cloneGitopsRepo()
- setNewTestPlutoVersion()
+ setNewTestVorgangManagerVersion()
pushTestGitopsRepo()
}
@@ -187,7 +187,7 @@ pipeline {
FAILED_STAGE=env.STAGE_NAME
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- dir('pluto-server') {
+ dir('vorgang-manager-server') {
try {
withSonarQubeEnv('sonarqube-ozg-sh'){
sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
@@ -197,7 +197,7 @@ pipeline {
}
}
- dir('pluto-utils') {
+ dir('vorgang-manager-utils') {
try {
withSonarQubeEnv('sonarqube-ozg-sh'){
sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
@@ -207,7 +207,7 @@ pipeline {
}
}
- dir('mail-service') {
+ dir('nachrichten-manager') {
try {
withSonarQubeEnv('sonarqube-ozg-sh'){
sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
@@ -280,8 +280,8 @@ Void tagAndPushDockerImage(String newTag){
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
- sh "docker tag docker.ozg-sh.de/pluto:build-latest docker.ozg-sh.de/pluto:${newTag}"
- sh "docker push docker.ozg-sh.de/pluto:${newTag}"
+ sh "docker tag docker.ozg-sh.de/vorgang-manager:build-latest docker.ozg-sh.de/vorgang-manager:${newTag}"
+ sh "docker push docker.ozg-sh.de/vorgang-manager:${newTag}"
}
}
@@ -319,15 +319,15 @@ Void cloneGitopsRepo() {
configureGit()
}
-Void setNewDevPlutoVersion() {
- setNewPlutoGitopsVersion("dev")
+Void setNewDevVorgangManagerVersion() {
+ setNewVorgangManagerGitopsVersion("dev")
}
-Void setNewTestPlutoVersion() {
- setNewPlutoGitopsVersion("test")
+Void setNewTestVorgangManagerVersion() {
+ setNewVorgangManagerGitopsVersion("test")
}
-Void setNewPlutoGitopsVersion(String environment) {
+Void setNewVorgangManagerGitopsVersion(String environment) {
dir("gitops") {
def envFile = "${environment}/application/values/pluto-values.yaml"
@@ -350,29 +350,29 @@ Void pushTestGitopsRepo() {
Void pushNewGitopsVersion(String environment) {
dir('gitops') {
- if (!hasPlutoValuesFileChanged(environment)) {
+ if (!hasVorgangManagerValuesFileChanged(environment)) {
return
}
withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
sh "git add ${environment}/application/values/pluto-values.yaml"
- sh "git commit -m 'jenkins rollout ${environment} pluto version ${IMAGE_TAG}'"
+ sh "git commit -m 'jenkins rollout ${environment} vorgang manager version ${IMAGE_TAG}'"
sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git'
}
}
}
-Boolean hasPlutoValuesFileChanged(String environment) {
+Boolean hasVorgangManagerValuesFileChanged(String environment) {
return sh (script: "git status | grep '${environment}/application/values/pluto-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
}
Void sendFailureMessage() {
def room = ''
def data = """{"msgtype":"m.text", \
- "body":"Pluto: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${BLUE_OCEAN_URL}", \
+ "body":"VorgangManager: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${BLUE_OCEAN_URL}", \
"format": "org.matrix.custom.html", \
- "formatted_body":"Pluto: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}"""
+ "formatted_body":"VorgangManager: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}"""
if (env.BRANCH_NAME == 'master') {
room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de"
diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml
index 237b5e719..26c000e10 100644
--- a/bescheid-manager/pom.xml
+++ b/bescheid-manager/pom.xml
@@ -15,24 +15,24 @@
<version>1.4.0-SNAPSHOT</version>
<properties>
- <pluto.version>2.0.0-SNAPSHOT</pluto.version>
+ <vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version>
</properties>
<dependencies>
<dependency>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-interface</artifactId>
- <version>${pluto.version}</version>
+ <version>${vorgang-manager.version}</version>
</dependency>
<dependency>
<groupId>de.ozgcloud.command</groupId>
<artifactId>command-manager</artifactId>
- <version>${pluto.version}</version>
+ <version>${vorgang-manager.version}</version>
</dependency>
<dependency>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-utils</artifactId>
- <version>${pluto.version}</version>
+ <version>${vorgang-manager.version}</version>
</dependency>
<dependency>
@@ -74,7 +74,7 @@
<dependency>
<groupId>de.ozgcloud.command</groupId>
<artifactId>command-manager</artifactId>
- <version>${pluto.version}</version>
+ <version>${vorgang-manager.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/release-startdev.sh b/release-startdev.sh
index b29ce1a9f..6b7907365 100755
--- a/release-startdev.sh
+++ b/release-startdev.sh
@@ -16,13 +16,13 @@ echo
# projectname/pom.xml:parent,main -> project.parent.version und project.version setzen
#
PROJECTS="pom.xml:main
- pluto-server/pom.xml:main
- pluto-interface/pom.xml:main
- pluto-utils/pom.xml:main
- mail-service/pom.xml:main
+ vorgang-manager-server/pom.xml:main
+ vorgang-manager-interface/pom.xml:main
+ vorgang-manager-utils/pom.xml:main
+ nachrichten-manager/pom.xml:main
notification-manager/pom.xml:main
- pluto-command/pom.xml:main
- pluto-common/pom.xml:main
+ vorgang-manager-command/pom.xml:main
+ vorgang-manager-base/pom.xml:main
bescheid-manger/pom.xml:main
"
diff --git a/src/main/helm/app-readme.md b/src/main/helm/app-readme.md
index 6d5b669dd..5bb01403f 100644
--- a/src/main/helm/app-readme.md
+++ b/src/main/helm/app-readme.md
@@ -1,6 +1,6 @@
-# Pluto
+# Vorgang Manager
-Das helm chart zur Installation des Vorgangsmanagers - pluto.
+Das helm chart zur Installation des Vorgangsmanagers.
## FAQ
@@ -28,7 +28,7 @@ env:
### Nutzen einer externen MongoDB
-Möchte man Pluto mit einer externen MongoDB verbinden, so muss unter `Datenbank` die `Nutze externe Datenbank` Checkbox gesetzt sein und im Namespace muss sich ein Opaque Secret mit Namen `pluto-database-spring` befinden.
+Möchte man Vorgang Manager mit einer externen MongoDB verbinden, so muss unter `Datenbank` die `Nutze externe Datenbank` Checkbox gesetzt sein und im Namespace muss sich ein Opaque Secret mit Namen `pluto-database-spring` befinden.
In dem Secret müssen folgende Felder vorhanden sein.
diff --git a/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/User.java b/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/User.java
index d0dfd8f61..232f372c1 100644
--- a/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/User.java
+++ b/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/User.java
@@ -31,7 +31,7 @@ import lombok.ToString;
/**
*
- * @deprecated Use {@link de.itvsh.ozg.pluto.callcontext.CallContextUser} instead
+ * @deprecated Use {@link de.ozgcloud.vorgang.callcontext.CallContextUser} instead
*
*/
@Deprecated(since = "0.24.0", forRemoval = true)
diff --git a/vorgang-manager-interface/pom.xml b/vorgang-manager-interface/pom.xml
index 398984e99..48fcbc3ad 100644
--- a/vorgang-manager-interface/pom.xml
+++ b/vorgang-manager-interface/pom.xml
@@ -39,7 +39,7 @@
<version>2.0.0-SNAPSHOT</version>
<name>OZG-Cloud Vorgang Manager gRPC Interface</name>
- <description>Interface (gRPC) for Pluto Server</description>
+ <description>Interface (gRPC) for Vorgang Manager Server</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandResponse.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandResponse.java
index 083cf99e8..6a508bc81 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandResponse.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandResponse.java
@@ -34,9 +34,9 @@ import lombok.Singular;
@Getter
public class CommandResponse {
- public static final String MESSAGE_CODE_COMMAND_VORGANG_ID_NOT_FOUND = "de.itvsh.ozg.pluto.vorgang.command.error.invalid-vorgang-id";
- public static final String MESSAGE_CODE_COMMAND_VORGANG_DOCUMENT_VERSION_IS_OUTDATED = "de.itvsh.ozg.pluto.vorgang.command.error.documentversion-outdated";
- public static final String MESSAGE_CODE_COMMAND_VORGANG_INVALID_DOCUMENT_STATUS = "de.itvsh.ozg.pluto.vorgang.command.error.documentstatus-is-invalid";
+ public static final String MESSAGE_CODE_COMMAND_VORGANG_ID_NOT_FOUND = "de.ozgcloud.vorgang.vorgang.command.error.invalid-vorgang-id";
+ public static final String MESSAGE_CODE_COMMAND_VORGANG_DOCUMENT_VERSION_IS_OUTDATED = "de.ozgcloud.vorgang.vorgang.command.error.documentversion-outdated";
+ public static final String MESSAGE_CODE_COMMAND_VORGANG_INVALID_DOCUMENT_STATUS = "de.ozgcloud.vorgang.vorgang.command.error.documentstatus-is-invalid";
public enum ResponseCode {
OK, PENDING, ERROR, CONFLICT;
diff --git a/vorgang-manager-server/src/main/resources/banner.txt b/vorgang-manager-server/src/main/resources/banner.txt
index 1df2e8adf..8f04f0a4c 100644
--- a/vorgang-manager-server/src/main/resources/banner.txt
+++ b/vorgang-manager-server/src/main/resources/banner.txt
@@ -1,5 +1,7 @@
- ___ _ _ _ _____ ___
-| _ \| | | | | ||_ _| / _ \
-| _/| |__ | |_| | | | | (_) |
-|_| |____| \___/ |_| \___/
+ __ ______ _____ _____ _ _ _____ __ __ _ _ _____ ______ _____
+ \ \ / / __ \| __ \ / ____| /\ | \ | |/ ____| | \/ | /\ | \ | | /\ / ____| ____| __ \
+ \ \ / / | | | |__) | | __ / \ | \| | | __ ______| \ / | / \ | \| | / \ | | __| |__ | |__) |
+ \ \/ /| | | | _ /| | |_ | / /\ \ | . ` | | |_ |______| |\/| | / /\ \ | . ` | / /\ \| | |_ | __| | _ /
+ \ / | |__| | | \ \| |__| |/ ____ \| |\ | |__| | | | | |/ ____ \| |\ |/ ____ \ |__| | |____| | \ \
+ \/ \____/|_| \_\\_____/_/ \_\_| \_|\_____| |_| |_/_/ \_\_| \_/_/ \_\_____|______|_| \_\
${spring-boot.version} ${application.version}
\ No newline at end of file
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/attributes/ClientAttributeITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/attributes/ClientAttributeITCase.java
index f0fa99584..96b9358a0 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/attributes/ClientAttributeITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/attributes/ClientAttributeITCase.java
@@ -66,7 +66,7 @@ class ClientAttributeITCase {
@Autowired
private ServerTestCallContextHandleInterceptor serverTestInterceptor;
- // Um die Abhängigkeit zum Pluto-Code zu entfernen, kann man eine Server Dummy
+ // Um die Abhängigkeit zum VorgangManager-Code zu entfernen, kann man eine Server Dummy
// Implementierung machen
// siehe
// https://yidongnan.github.io/grpc-spring-boot-starter/en/client/testing.html#running-a-dummy-server
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangServiceTest.java
index efa3fec94..c47eaab97 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangServiceTest.java
@@ -205,7 +205,7 @@ class GrpcVorgangServiceTest {
@Captor
private ArgumentCaptor<FindVorgangRequest> findVorgangRequestCaptor;
- private final GrpcVorgangHeader plutoVorgangHeader = GrpcVorgangHeader.newBuilder().build();
+ private final GrpcVorgangHeader grpcVorgangHeader = GrpcVorgangHeader.newBuilder().build();
private final GrpcFindVorgangRequest request = GrpcFindVorgangRequest.newBuilder().setLimit(LIMIT).setOffset(OFFSET)
.build();
@@ -214,7 +214,7 @@ class GrpcVorgangServiceTest {
when(page.getContent()).thenReturn(Collections.singletonList(VorgangHeaderTestFactory.create()));
when(page.getTotalElements()).thenReturn(TOTAL);
when(headerService.findAll(any(FindVorgangRequest.class))).thenReturn(page);
- when(vorgangHeaderMapper.toGrpcVorgangHeader(any())).thenReturn(plutoVorgangHeader);
+ when(vorgangHeaderMapper.toGrpcVorgangHeader(any())).thenReturn(grpcVorgangHeader);
when(findVorgangRequestMapper.fromFindVorgangRequest(any(GrpcFindVorgangRequest.class)))
.thenReturn(FindVorgangRequestTestFactory.create());
}
--
GitLab