Merge pull request #129 from everettraven/bugfix/marker-regex

(bugfix): analysis: markers: handle backticks for attribute values

Author: k8s-ci-robot

pkg/analysis/helpers/markers/analyzer.go

@@ -230,7 +230,7 @@ func extractKnownMarkerIDAndExpressions(id string, marker string) (string, map[s
 	return id, extractExpressions(strings.TrimPrefix(marker, id))
 }
 
-var expressionRegex = regexp.MustCompile(`\w*=(?:'[^']*'|"(\\"|[^"])*"|[\w;\-"]+)`)
+var expressionRegex = regexp.MustCompile("\\w*=(?:'[^']*'|\"(\\\\\"|[^\"])*\"|[\\w;\\-\"]+|`[^`]*`)")
 
 func extractExpressions(expressionStr string) map[string]string {
 	expressionsMap := map[string]string{}

pkg/analysis/helpers/markers/analyzer_test.go

@@ -121,6 +121,15 @@ func TestExtractMarkerIdAndExpressions(t *testing.T) {
 				"": "-10",
 			},
 		},
+		{
+			name:       "registered marker with named expression using backtick ('`') for strings",
+			marker:     "kubebuilder:validation:XValidation:rule=`has(self.field)`,message=`must have field!`",
+			expectedID: "kubebuilder:validation:XValidation",
+			expectedExpressions: map[string]string{
+				"rule":    "`has(self.field)`",
+				"message": "`must have field!`",
+			},
+		},
 	}
 
 	for _, tc := range testcases {