pkg/command: allow semicolon in map values in GetStringMapString

This is needed to parse entries like:

    cluster-pool-map: \
        "mars=ipv4-cidrs:172.16.0.0/16,172.17.0.0/16;ipv4-mask-size:24
         jupiter=ipv4-cidrs:192.168.0.0/19;ipv4-mask-size:26"

which will be used for IPAM pools in cilium-operator.

Signed-off-by: Tobias Klauser <tobias@cilium.io>

pkg/command/map_string.go

@@ -20,7 +20,7 @@ const (
 	equal = '='
 )
 
-var keyValueRegex = regexp.MustCompile(`([\w-:./@]+=([\w-:,./@][\w-:,./@ ]*[\w-:,./@])?[\w-:,./@]*,)*([\w-:./@]+=([\w-:,./@][\w-:,./@ ]*)?[\w-:./@]+)$`)
+var keyValueRegex = regexp.MustCompile(`([\w-:;./@]+=([\w-:;,./@][\w-:;,./@ ]*[\w-:;,./@])?[\w-:;,./@]*,)*([\w-:;./@]+=([\w-:;,./@][\w-:;,./@ ]*)?[\w-:;./@]+)$`)
 
 // GetStringMapString contains one enhancement to support k1=v2,k2=v2 compared to original
 // implementation of GetStringMapString function

pkg/command/map_string_test.go

@@ -179,6 +179,18 @@ func TestGetStringMapString(t *testing.T) {
 			},
 			wantErr: assert.NoError,
 		},
+		{
+			name: "valid kv format for cluster-pool-map",
+			args: args{
+				key:   "CLUSTER_POOL_MAP",
+				value: "mars=ipv4-cidrs:172.16.0.0/16,172.17.0.0/16;ipv4-mask-size:24,jupiter=ipv4-cidrs:192.168.0.0/19;ipv4-mask-size:26",
+			},
+			want: map[string]string{
+				"mars":    "ipv4-cidrs:172.16.0.0/16,172.17.0.0/16;ipv4-mask-size:24",
+				"jupiter": "ipv4-cidrs:192.168.0.0/19;ipv4-mask-size:26",
+			},
+			wantErr: assert.NoError,
+		},
 		{
 			name: "invalid kv format with extra comma",
 			args: args{