fix(icm): fix error message about mutual exclusive databaseName/datab…

…aseLink configuration (#884)
intershop · Jan 9, 2025 · 8322e94 · 8322e94
1 parent 8e4e708
commit 8322e94
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/icm-as/templates/_environments.tpl b/charts/icm-as/templates/_environments.tpl
@@ -139,7 +139,7 @@ ICM-AS >= 13.0.0 requires new replication configuration
   {{- fail (printf "Error: The new replication configuration 'replication.source'/'replication.targets' can be only used with ICM-AS 12.2.0 and newer, currently used '%s'." $icmApplicationServerImageSemanticVersion) -}}
 {{- end -}}
 {{- if and ($hasNewReplicationConfiguration) (hasKey .Values.replication.source "databaseLink") (hasKey .Values.replication.source "databaseName") -}}
-  {{- fail "Error: Either mutual exclusive 'replication.source.databaseUser' or 'replication.source.databaseLink' have to be configured, but not both." -}}
+  {{- fail "Error: Either mutual exclusive 'replication.source.databaseName' or 'replication.source.databaseLink' have to be configured, but not both." -}}
 {{- end -}}
 {{- if and (or (not $hasIcmApplicationServerImageSemanticVersion) $hasNewReplicationConfigurationSupport) $hasNewReplicationConfiguration }}
 {{- $replicationSystemIDs := keys .Values.replication.targets | sortAlpha -}}

diff --git a/charts/icm-as/tests/replication_test.yaml b/charts/icm-as/tests/replication_test.yaml
@@ -798,7 +798,7 @@ tests:
     template: templates/as-deployment.yaml
     asserts:
       - failedTemplate:
-          errorMessage: "Error: Either mutual exclusive 'replication.source.databaseUser' or 'replication.source.databaseLink' have to be configured, but not both."
+          errorMessage: "Error: Either mutual exclusive 'replication.source.databaseName' or 'replication.source.databaseLink' have to be configured, but not both."
 
   - it: as-deployment fails with invalid replication target key
     release:

diff --git a/charts/icm-as/values.yaml b/charts/icm-as/values.yaml
@@ -530,7 +530,7 @@ replication:
   # source:
     # the external URL of the webServer/proxy/ingress e.g. https://icm-web-edit-wa:443
     # webserverUrl: <sourceExternalUrl>
-    # either mutual exclusive databaseUser or databaseLink have to be configured
+    # either mutual exclusive databaseName or databaseLink have to be configured
     # databaseLink: <sourceDatabaseLink>
     # databaseUser: <sourceDatabaseUser>
     # databaseName: <sourceDatabaseName>