chore: improve validateClusterStatName

Signed-off-by: zirain <[email protected]>

Author: zirain

api/v1alpha1/validation/envoyproxy_validate.go

@@ -294,19 +294,22 @@ func validateFilterOrder(filterOrder []egv1a1.FilterPosition) error {
 	return nil
 }
 
-func validateClusterStatName(clusterStatName string) []error {
-	supportedOperators := map[string]bool{
-		egv1a1.StatFormatterRouteName:       true,
-		egv1a1.StatFormatterRouteNamespace:  true,
-		egv1a1.StatFormatterRouteKind:       true,
-		egv1a1.StatFormatterRouteRuleName:   true,
-		egv1a1.StatFormatterRouteRuleNumber: true,
-		egv1a1.StatFormatterBackendRefs:     true,
-	}
+var supportedOperators = map[string]bool{
+	egv1a1.StatFormatterRouteName:       true,
+	egv1a1.StatFormatterRouteNamespace:  true,
+	egv1a1.StatFormatterRouteKind:       true,
+	egv1a1.StatFormatterRouteRuleName:   true,
+	egv1a1.StatFormatterRouteRuleNumber: true,
+	egv1a1.StatFormatterBackendRefs:     true,
+}
 
+func validateClusterStatName(clusterStatName string) []error {
 	var errs []error
 	re := regexp.MustCompile("%[^%]*%")
 	matches := re.FindAllString(clusterStatName, -1)
+	if len(matches) == 0 {
+		errs = append(errs, fmt.Errorf("unable to configure Cluster Stat Name without any operator"))
+	}
 	for _, operator := range matches {
 		if _, ok := supportedOperators[operator]; !ok {
 			err := fmt.Errorf("unable to configure Cluster Stat Name with unsupported operator: %s", operator)

api/v1alpha1/validation/envoyproxy_validate_test.go

@@ -832,7 +832,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
 	for i := range testCases {
 		tc := testCases[i]
 		t.Run(tc.name, func(t *testing.T) {
-			err := ValidateEnvoyProxy(tc.proxy)
+			err := ValidateEnvoyProxy(tc.proxy, false)
 			if tc.expected {
 				require.NoError(t, err)
 			} else {
@@ -964,3 +964,39 @@ func TestGetEnvoyProxyComponentLevelArgs(t *testing.T) {
 		})
 	}
 }
+
+func TestValidateClusterStatName(t *testing.T) {
+	testCases := []struct {
+		name     string
+		statName string
+		expected bool
+	}{
+		{
+			name:     "valid cluster stat name with supported operators",
+			statName: "%ROUTE_NAME%/%ROUTE_NAMESPACE%/%BACKEND_REFS%",
+			expected: true,
+		},
+		{
+			name:     "invalid cluster stat name with unsupported operators",
+			statName: "%ROUTE_NAME%/%FOO%/%BAR%",
+			expected: false,
+		},
+		{
+			name:     "invalid cluster stat name",
+			statName: "%ROUTE_NAME",
+			expected: false,
+		},
+	}
+
+	for i := range testCases {
+		tc := testCases[i]
+		t.Run(tc.name, func(t *testing.T) {
+			errs := validateClusterStatName(tc.statName)
+			if tc.expected {
+				require.Empty(t, errs)
+			} else {
+				require.NotEmpty(t, len(errs))
+			}
+		})
+	}
+}