fix:限流规则disable查询条件失效 (polarismesh#1060)

Author: chuntaojun

common/utils/funcs.go

@@ -44,6 +44,9 @@ func CollectMapKeys(filters map[string]string) []string {
 	fields := make([]string, 0, len(filters))
 	for k := range filters {
 		fields = append(fields, k)
+		if k != "" {
+			fields = append(fields, strings.ToUpper(string(k[:1]))+k[1:])
+		}
 	}
 
 	return fields

service/ratelimit_config.go

@@ -521,6 +521,7 @@ func rateLimit2Client(
 
 	rule := &apitraffic.Rule{}
 	rule.Id = utils.NewStringValue(rateLimit.ID)
+	rule.Name = utils.NewStringValue(rateLimit.Name)
 	rule.Service = utils.NewStringValue(service)
 	rule.Namespace = utils.NewStringValue(namespace)
 	rule.Priority = utils.NewUInt32Value(rateLimit.Priority)

store/boltdb/ratelimit.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"reflect"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -170,6 +171,10 @@ func (r *rateLimitStore) GetExtendRateLimits(
 					if !strings.Contains(m[k].(string), v) {
 						return false
 					}
+				} else if k == "disable" {
+					if v != strconv.FormatBool(m[RateLimitFieldDisable].(bool)) {
+						return false
+					}
 				} else {
 					qV := m[k]
 					if !reflect.DeepEqual(qV, v) {

store/boltdb/ratelimit_test.go

@@ -301,6 +301,62 @@ func Test_rateLimitStore_GetExtendRateLimits(t *testing.T) {
 
 }
 
+func Test_rateLimitStore_GetExtendRateLimitsDisable(t *testing.T) {
+	CreateTableDBHandlerAndRun(t, "test_ratelimit_disable", func(t *testing.T, handler BoltHandler) {
+		r := &rateLimitStore{
+			handler: handler,
+		}
+
+		svcS := &serviceStore{
+			handler: handler,
+		}
+
+		vals := make([]*model.RateLimit, 0)
+
+		for i := 0; i < 10; i++ {
+			testVal := createTestRateLimit(uuid.NewString(), false)
+			if i%2 == 0 {
+				testVal.Disable = true
+			} else {
+				testVal.Disable = false
+			}
+			//  create service
+			svcS.AddService(&model.Service{
+				ID:        testVal.ServiceID,
+				Name:      testVal.ServiceID,
+				Namespace: testVal.ServiceID,
+				Owner:     "Polaris",
+				Token:     testVal.Revision,
+			})
+
+			vals = append(vals, testVal)
+			if err := r.CreateRateLimit(testVal); err != nil {
+				t.Fatalf("rateLimitStore.CreateRateLimit() error = %v", err)
+			}
+		}
+
+		// Test 1
+		_, ret, err := r.GetExtendRateLimits(map[string]string{
+			"disable": "true",
+		}, 0, 100)
+		if err != nil {
+			t.Errorf("rateLimitStore.GetExtendRateLimits() error = %v", err)
+			return
+		}
+		assert.Equal(t, int32(5), int32(len(ret)))
+
+		// Test 1
+		_, ret, err = r.GetExtendRateLimits(map[string]string{
+			"disable": "false",
+		}, 0, 100)
+		if err != nil {
+			t.Errorf("rateLimitStore.GetExtendRateLimits() error = %v", err)
+			return
+		}
+		assert.Equal(t, int32(5), int32(len(ret)))
+	})
+}
+
 func Test_rateLimitStore_GetRateLimitWithID(t *testing.T) {
 	CreateTableDBHandlerAndRun(t, "test_ratelimit", func(t *testing.T, handler BoltHandler) {
 		r := &rateLimitStore{

version

@@ -1 +1 @@
-v1.14.0
+v1.16.0