From 1fa1872ae5bb463567cfcc4cb0c0eaef2f7284fe Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 23 Jul 2024 13:28:10 +0200
Subject: [PATCH] OZG-5156 use xta application.yml instead of profiles
---
fim-adapter/src/main/resources/application-fim.yml | 3 +--
xta-adapter/src/main/helm/templates/_helpers.tpl | 2 +-
xta-adapter/src/main/resources/application.yml | 4 ++++
xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fim-adapter/src/main/resources/application-fim.yml b/fim-adapter/src/main/resources/application-fim.yml
index 148c1af75..1300ecebf 100644
--- a/fim-adapter/src/main/resources/application-fim.yml
+++ b/fim-adapter/src/main/resources/application-fim.yml
@@ -1,4 +1,3 @@
fim:
schemeLocations:
- - fim-s17000652_1.4/S17000652V1.4_xfall.xsd
- - test2/test2.xsd
\ No newline at end of file
+ - fim-s17000652_1.4/S17000652V1.4_xfall.xsd
\ No newline at end of file
diff --git a/xta-adapter/src/main/helm/templates/_helpers.tpl b/xta-adapter/src/main/helm/templates/_helpers.tpl
index 086b7fd7a..5f233e14c 100644
--- a/xta-adapter/src/main/helm/templates/_helpers.tpl
+++ b/xta-adapter/src/main/helm/templates/_helpers.tpl
@@ -40,7 +40,7 @@ helm.sh/chart: {{ include "app.chart" . }}
{{- if (.Values.env).overrideSpringProfiles -}}
{{ printf "%s" (.Values.env).overrideSpringProfiles }}
{{- else -}}
-{{ printf "oc, fim, %s" (include "app.kopEnvironment" . ) }}
+{{ printf "oc, %s" (include "app.kopEnvironment" . ) }}
{{- end -}}
{{- end -}}
diff --git a/xta-adapter/src/main/resources/application.yml b/xta-adapter/src/main/resources/application.yml
index 53387ac65..5344c49ba 100644
--- a/xta-adapter/src/main/resources/application.yml
+++ b/xta-adapter/src/main/resources/application.yml
@@ -13,3 +13,7 @@ ozgcloud:
status-list: "http://www.osci.eu/ws/2008/05/transport/urn/messageTypes/MsgBoxStatusListRequest"
fetch-request: "http://www.osci.eu/ws/2008/05/transport/urn/messageTypes/MsgBoxFetchRequest"
close-request: "http://www.osci.eu/ws/2008/05/transport/urn/messageTypes/MsgBoxCloseRequest"
+
+fim:
+ schemeLocations:
+ - fim-s17000652_1.4/S17000652V1.4_xfall.xsd
\ No newline at end of file
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
index 3dd122f77..77547800e 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
@@ -48,7 +48,7 @@ tests:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
name: spring_profiles_active
- value: "oc, fim, test"
+ value: "oc, test"
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
--
GitLab