Merge pull request #89 from digitalocean/nbouliane/skip_unknown_tokens

change default behavior of parseMatch to skip unknown tokens

Author: nicboul

ovs/flow.go

@@ -394,7 +394,11 @@ func (f *Flow) UnmarshalText(b []byte) error {
 		if err != nil {
 			return err
 		}
-		f.Matches = append(f.Matches, match)
+		// The keyword will be skipped if unknown,
+		// don't add a nil value
+		if match != nil {
+			f.Matches = append(f.Matches, match)
+		}
 	}
 
 	// Parse all actions from the flow.

ovs/matchparser.go

@@ -112,7 +112,7 @@ func parseMatch(key string, value string) (Match, error) {
 		return parseTunID(value)
 	}
 
-	return nil, fmt.Errorf("no match parser found for %s=%s", key, value)
+	return nil, nil
 }
 
 // parseClampInt calls strconv.Atoi on s, and then ensures that s is less than

ovs/matchparser_test.go

@@ -30,6 +30,10 @@ func Test_parseMatch(t *testing.T) {
 		invalid     bool
 		skipMarshal bool
 	}{
+		{
+			s:       "random_token=random_value",
+			invalid: true,
+		},
 		{
 			s:       "foo=bar",
 			invalid: true,

ovs/proto_trace.go

@@ -124,8 +124,11 @@ func (df *DataPathFlows) UnmarshalText(b []byte) error {
 		if err != nil {
 			return err
 		}
-
-		df.Matches = append(df.Matches, m)
+		// The keyword will be skipped if unknown,
+		// don't add a nil value
+		if m != nil {
+			df.Matches = append(df.Matches, m)
+		}
 	}
 
 	return nil