Use escaped ampersand for multiple arrays.

dell · Dec 9, 2024 · e7735dc · e7735dc
1 parent 9eca8c2
commit e7735dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/service/preinit.go b/service/preinit.go
@@ -91,7 +91,7 @@ func (s *service) PreInit() error {
 		for _, connectionData := range arrayConfig {
 			if connectionData.Mdm != "" {
 				if sb.Len() > 0 {
-					sb.WriteString("&")
+					sb.WriteString("\\&")
 				}
 				sb.WriteString(connectionData.Mdm)
 			}
@@ -140,7 +140,7 @@ func getMdmList(connectionData []*ArrayConnectionData, key, zone string) (string
 	for _, connectionData := range connectionData {
 		if connectionData.Mdm != "" && connectionData.Zone.LabelKey == key && connectionData.Zone.Name == zone {
 			if sb.Len() > 0 {
-				sb.WriteString("&")
+				sb.WriteString("\\&")
 			}
 			sb.WriteString(connectionData.Mdm)
 		}

diff --git a/service/preinit_test.go b/service/preinit_test.go
@@ -112,7 +112,7 @@ func TestPreInit(t *testing.T) {
 				},
 			},
 			errorExpected:  false,
-			expectedResult: "192.168.1.1,192.168.1.2&192.168.2.1,192.168.2.2",
+			expectedResult: "192.168.1.1,192.168.1.2\\&192.168.2.1,192.168.2.2",
 		},
 		{
 			name: "should fail if zones configured but unable to fetch node labels",
@@ -353,7 +353,7 @@ func TestGetMdmList(t *testing.T) {
 			key:            "testKey",
 			zone:           "testZone",
 			errorExpected:  false,
-			expectedResult: "192.168.0.10,192.168.0.20&192.168.1.10,192.168.1.20",
+			expectedResult: "192.168.0.10,192.168.0.20\\&192.168.1.10,192.168.1.20",
 		},
 		{
 			name: "two arrays with one MDM each",
@@ -372,7 +372,7 @@ func TestGetMdmList(t *testing.T) {
 			key:            "testKey",
 			zone:           "testZone",
 			errorExpected:  false,
-			expectedResult: "192.168.0.10&192.168.1.10",
+			expectedResult: "192.168.0.10\\&192.168.1.10",
 		},
 		{
 			name: "two arrays with multiple zones 1",