fix: Fix Invalid iproute2 JSON output in arm64

Author: mateoflorido

src/k8s/pkg/utils/netlink.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net"
 	"os/exec"
+	"regexp"
 )
 
 type VXLANInterface struct {
@@ -30,6 +31,11 @@ func ListVXLANInterfaces() ([]VXLANInterface, error) {
 		return vxlanDevices, fmt.Errorf("running ip command failed: %s", string(out))
 	}
 
+	out, err = fixInvalidIproute2JSON(out)
+	if err != nil {
+		return vxlanDevices, fmt.Errorf("failed to fix invalid VXLAN VNI: %w", err)
+	}
+
 	if err := json.Unmarshal(out, &ipLinks); err != nil {
 		return vxlanDevices, fmt.Errorf("unmarshaling ip command output failed: %w", err)
 	}
@@ -63,3 +69,21 @@ func RemoveLink(name string) error {
 
 	return nil
 }
+
+// fixInvalidIproute2JSON cleans up invalid JSON output produced by the
+// iproute2 command in arm64. Currently, the Ubuntu package combines the VXLAN
+// VNI value with the fan-map extension, resulting in invalid JSON.
+func fixInvalidIproute2JSON(input []byte) ([]byte, error) {
+	output := string(input)
+
+	// Target the specific case where numeric VXLAN VNI values are concatenated
+	// with text (like "0fan-map") without proper JSON quoting
+	re, err := regexp.Compile(`"id":\s*([0-9]+[a-zA-Z][a-zA-Z0-9_-]*)`)
+	if err != nil {
+		return nil, fmt.Errorf("failed to compile invalid VXLAN VNI regexp: %w", err)
+	}
+
+	// Enclose the entire VNI value in double quotes
+	output = re.ReplaceAllString(output, `"id":"$1"`)
+	return []byte(output), nil
+}

src/k8s/pkg/utils/netlink_test.go

@@ -0,0 +1,49 @@
+package utils
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestFixInvalidIproute2JSON(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    []byte
+		expected []byte
+		wantErr  bool
+	}{
+		{
+			name: "Valid JSON with no changes needed",
+			input: []byte(`[
+				{"ifindex":4,"info_data":{"id":0,"fan-map":"example"}}
+			]`),
+			expected: []byte(`[
+				{"ifindex":4,"info_data":{"id":0,"fan-map":"example"}}
+			]`),
+			wantErr: false,
+		},
+		{
+			name: "Invalid JSON with VXLAN VNI combined with fan-map",
+			input: []byte(`[
+				{"ifindex":4,"info_data":{"id":0fan-map,"fan-map":"example"}}
+			]`),
+			expected: []byte(`[
+				{"ifindex":4,"info_data":{"id":"0fan-map","fan-map":"example"}}
+			]`),
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			output, err := fixInvalidIproute2JSON(tt.input)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("fixInvalidIproute2JSON() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !bytes.Equal(output, tt.expected) {
+				t.Errorf("fixInvalidIproute2JSON() = %s, expected %s", output, tt.expected)
+			}
+		})
+	}
+}