Skip to content
Snippets Groups Projects
Commit 560831de authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6162 Rename file-manager to archive-manager

parent b7791003
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ grpc: ...@@ -16,7 +16,7 @@ grpc:
negotiationType: PLAINTEXT negotiationType: PLAINTEXT
zufi-manager: zufi-manager:
negotiationType: PLAINTEXT negotiationType: PLAINTEXT
file-manager: archive-manager:
negotiationType: PLAINTEXT negotiationType: PLAINTEXT
ozgcloud: ozgcloud:
......
...@@ -66,7 +66,7 @@ grpc: ...@@ -66,7 +66,7 @@ grpc:
zufi-manager: zufi-manager:
address: static://127.0.0.1:9190 address: static://127.0.0.1:9190
negotiationType: TLS negotiationType: TLS
file-manager: archive-manager:
address: static://127.0.0.1:9090 address: static://127.0.0.1:9090
negotiationType: TLS negotiationType: TLS
......
...@@ -40,7 +40,7 @@ public class GrpcUtil { ...@@ -40,7 +40,7 @@ public class GrpcUtil {
public static final String ZUFI_MANAGER_GRPC_CLIENT = "zufi-manager"; 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"; public static final String SERVICE_KEY = "GRPC_SERVICE";
......
...@@ -10,7 +10,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient; ...@@ -10,7 +10,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@Service @Service
class ExportRemoteService { class ExportRemoteService {
@GrpcClient(GrpcUtil.FILE_MANAGER_GRPC_CLIENT) @GrpcClient(GrpcUtil.ARCHIVE_MANAGER_GRPC_CLIENT)
private ExportServiceBlockingStub exportServiceStub; private ExportServiceBlockingStub exportServiceStub;
public ExportedVorgangFile exportVorgang(String vorgangId) { public ExportedVorgangFile exportVorgang(String vorgangId) {
......
...@@ -53,7 +53,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} ...@@ -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 "-" }} {{ printf "dns:///%s.%s:9090" ( coalesce .Values.vorgangManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end -}} {{- 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 "-" }} {{ printf "dns:///%s.%s:9090" ( coalesce .Values.fileManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end -}} {{- end -}}
......
...@@ -78,9 +78,9 @@ spec: ...@@ -78,9 +78,9 @@ spec:
value: {{ include "app.grpc_client_user-manager_address" . }} value: {{ include "app.grpc_client_user-manager_address" . }}
- name: grpc_client_user-manager_negotiationType - name: grpc_client_user-manager_negotiationType
value: {{ (.Values.userManager).grpcClientNegotiationType | default "TLS" }} value: {{ (.Values.userManager).grpcClientNegotiationType | default "TLS" }}
- name: grpc_client_file-manager_address - name: grpc_client_archive-manager_address
value: {{ include "app.grpc_client_file_manager_address" . }} value: {{ include "app.grpc_client_archive_manager_address" . }}
- name: grpc_client_file-manager_negotiationType - name: grpc_client_archive-manager_negotiationType
value: {{ (.Values.fileManager).grpcClientNegotiationType | default "TLS" }} value: {{ (.Values.fileManager).grpcClientNegotiationType | default "TLS" }}
- name: spring_profiles_active - name: spring_profiles_active
value: {{ include "app.envSpringProfiles" . }} value: {{ include "app.envSpringProfiles" . }}
......
...@@ -57,7 +57,7 @@ tests: ...@@ -57,7 +57,7 @@ tests:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: grpc_client_file-manager_address name: grpc_client_archive-manager_address
value: dns:///vorgang-manager.sh-helm-test:9090 value: dns:///vorgang-manager.sh-helm-test:9090
- it: should have service binding root - it: should have service binding root
...@@ -156,20 +156,20 @@ tests: ...@@ -156,20 +156,20 @@ tests:
name: grpc_client_vorgang-manager_negotiationType name: grpc_client_vorgang-manager_negotiationType
value: TLS value: TLS
- it: should set file-manager negotiationType plaintext - it: should set archive-manager negotiationType plaintext
set: set:
fileManager.grpcClientNegotiationType: PLAINTEXT fileManager.grpcClientNegotiationType: PLAINTEXT
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: grpc_client_file-manager_negotiationType name: grpc_client_archive-manager_negotiationType
value: PLAINTEXT value: PLAINTEXT
- it: should contain default file-manager negotiationType tls - it: should contain default archive-manager negotiationType tls
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: grpc_client_file-manager_negotiationType name: grpc_client_archive-manager_negotiationType
value: TLS value: TLS
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# unter der Lizenz sind dem Lizenztext zu entnehmen. # unter der Lizenz sind dem Lizenztext zu entnehmen.
# #
suite: test deployment file-manager address suite: test deployment archive-manager address
release: release:
name: alfa name: alfa
namespace: sh-helm-test namespace: sh-helm-test
...@@ -38,12 +38,12 @@ set: ...@@ -38,12 +38,12 @@ set:
serverUrl: https://sso.company.local serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret imagePullSecret: image-pull-secret
tests: tests:
- it: should set the file-manager name - it: should set the archive-manager name
set: set:
fileManagerName: my-test-file-manager-name fileManagerName: my-test-archive-manager-name
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: grpc_client_file-manager_address name: grpc_client_archive-manager_address
value: dns:///my-test-file-manager-name.sh-helm-test:9090 value: dns:///my-test-archive-manager-name.sh-helm-test:9090
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment