From 560831de33b2e38b42e90280ae28ff5d36b67c5e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 6 Nov 2024 17:45:59 +0100
Subject: [PATCH] OZG-6162 Rename file-manager to archive-manager
---
alfa-server/src/main/resources/application-local.yml | 2 +-
alfa-server/src/main/resources/application.yml | 2 +-
.../main/java/de/ozgcloud/alfa/common/GrpcUtil.java | 2 +-
.../de/ozgcloud/alfa/export/ExportRemoteService.java | 2 +-
src/main/helm/templates/_helpers.tpl | 2 +-
src/main/helm/templates/deployment.yaml | 6 +++---
src/test/helm/deployment_defaults_env_test.yaml | 10 +++++-----
.../helm/deployment_file_manager_address_env_test.yaml | 10 +++++-----
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/alfa-server/src/main/resources/application-local.yml b/alfa-server/src/main/resources/application-local.yml
index cf81eb981e..55772b0d1f 100644
--- a/alfa-server/src/main/resources/application-local.yml
+++ b/alfa-server/src/main/resources/application-local.yml
@@ -16,7 +16,7 @@ grpc:
negotiationType: PLAINTEXT
zufi-manager:
negotiationType: PLAINTEXT
- file-manager:
+ archive-manager:
negotiationType: PLAINTEXT
ozgcloud:
diff --git a/alfa-server/src/main/resources/application.yml b/alfa-server/src/main/resources/application.yml
index 252bea338e..aaf3f0290c 100644
--- a/alfa-server/src/main/resources/application.yml
+++ b/alfa-server/src/main/resources/application.yml
@@ -66,7 +66,7 @@ grpc:
zufi-manager:
address: static://127.0.0.1:9190
negotiationType: TLS
- file-manager:
+ archive-manager:
address: static://127.0.0.1:9090
negotiationType: TLS
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
index 219022e4ff..610a0cc432 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
@@ -40,7 +40,7 @@ public class GrpcUtil {
public static final String ZUFI_MANAGER_GRPC_CLIENT = "zufi-manager";
- public static final String FILE_MANAGER_GRPC_CLIENT = "file-manager";
+ public static final String ARCHIVE_MANAGER_GRPC_CLIENT = "archive-manager";
public static final String SERVICE_KEY = "GRPC_SERVICE";
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/export/ExportRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/export/ExportRemoteService.java
index c650c035b1..a4c8220178 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/export/ExportRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/export/ExportRemoteService.java
@@ -10,7 +10,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
class ExportRemoteService {
- @GrpcClient(GrpcUtil.FILE_MANAGER_GRPC_CLIENT)
+ @GrpcClient(GrpcUtil.ARCHIVE_MANAGER_GRPC_CLIENT)
private ExportServiceBlockingStub exportServiceStub;
public ExportedVorgangFile exportVorgang(String vorgangId) {
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 52c43468ed..3880f1d496 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -53,7 +53,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{ printf "dns:///%s.%s:9090" ( coalesce .Values.vorgangManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end -}}
-{{- define "app.grpc_client_file_manager_address" -}}
+{{- define "app.grpc_client_archive_manager_address" -}}
{{ printf "dns:///%s.%s:9090" ( coalesce .Values.fileManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end -}}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 345ed3285d..1d023d6164 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -78,9 +78,9 @@ spec:
value: {{ include "app.grpc_client_user-manager_address" . }}
- name: grpc_client_user-manager_negotiationType
value: {{ (.Values.userManager).grpcClientNegotiationType | default "TLS" }}
- - name: grpc_client_file-manager_address
- value: {{ include "app.grpc_client_file_manager_address" . }}
- - name: grpc_client_file-manager_negotiationType
+ - name: grpc_client_archive-manager_address
+ value: {{ include "app.grpc_client_archive_manager_address" . }}
+ - name: grpc_client_archive-manager_negotiationType
value: {{ (.Values.fileManager).grpcClientNegotiationType | default "TLS" }}
- name: spring_profiles_active
value: {{ include "app.envSpringProfiles" . }}
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index fc77a2e11d..105decb4d2 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -57,7 +57,7 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: grpc_client_file-manager_address
+ name: grpc_client_archive-manager_address
value: dns:///vorgang-manager.sh-helm-test:9090
- it: should have service binding root
@@ -156,20 +156,20 @@ tests:
name: grpc_client_vorgang-manager_negotiationType
value: TLS
- - it: should set file-manager negotiationType plaintext
+ - it: should set archive-manager negotiationType plaintext
set:
fileManager.grpcClientNegotiationType: PLAINTEXT
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: grpc_client_file-manager_negotiationType
+ name: grpc_client_archive-manager_negotiationType
value: PLAINTEXT
- - it: should contain default file-manager negotiationType tls
+ - it: should contain default archive-manager negotiationType tls
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: grpc_client_file-manager_negotiationType
+ name: grpc_client_archive-manager_negotiationType
value: TLS
diff --git a/src/test/helm/deployment_file_manager_address_env_test.yaml b/src/test/helm/deployment_file_manager_address_env_test.yaml
index 727d639069..005a8ad788 100644
--- a/src/test/helm/deployment_file_manager_address_env_test.yaml
+++ b/src/test/helm/deployment_file_manager_address_env_test.yaml
@@ -22,7 +22,7 @@
# unter der Lizenz sind dem Lizenztext zu entnehmen.
#
-suite: test deployment file-manager address
+suite: test deployment archive-manager address
release:
name: alfa
namespace: sh-helm-test
@@ -38,12 +38,12 @@ set:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
tests:
- - it: should set the file-manager name
+ - it: should set the archive-manager name
set:
- fileManagerName: my-test-file-manager-name
+ fileManagerName: my-test-archive-manager-name
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: grpc_client_file-manager_address
- value: dns:///my-test-file-manager-name.sh-helm-test:9090
+ name: grpc_client_archive-manager_address
+ value: dns:///my-test-archive-manager-name.sh-helm-test:9090
--
GitLab