fix(rule): trigger should not change rule string (#3867)

Signed-off-by: Jiyong Huang <huangjy@emqx.io>
Signed-off-by: Song Gao <disxiaofei@163.com>

Author: ngjaying

internal/processor/rule.go

@@ -96,25 +96,30 @@ func (p *RuleProcessor) ExecUpsert(id, ruleJson string) error {
 	return nil
 }
 
-func (p *RuleProcessor) ExecReplaceRuleState(name string, triggered bool) (*def.Rule, error) {
-	rule, err := p.GetRuleById(name)
+func (p *RuleProcessor) ExecReplaceRuleState(name string, triggered bool) error {
+	ruleStr, err := p.GetRuleJson(name)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	rule.Triggered = triggered
-	ruleJson, err := json.Marshal(rule)
+	ruleMap := map[string]interface{}{}
+	err = json.Unmarshal([]byte(ruleStr), &ruleMap)
+	if err != nil {
+		return fmt.Errorf("Unmarshal rule %s error : %s.", name, err)
+	}
+	ruleMap["triggered"] = triggered
+	ruleJson, err := json.Marshal(ruleMap)
 	if err != nil {
-		return nil, fmt.Errorf("Marshal rule %s error : %s.", name, err)
+		return fmt.Errorf("Marshal rule %s error : %s.", name, err)
 	}
 
 	err = p.db.Set(name, string(ruleJson))
 	if err != nil {
-		return nil, err
+		return err
 	} else {
 		log.Infof("Rule %s is replaced.", name)
 	}
-	return rule, err
+	return err
 }
 
 func (p *RuleProcessor) GetRuleJson(id string) (string, error) {

internal/server/rest_test.go

@@ -498,7 +498,7 @@ func (suite *RestTestSuite) Test_rulesManageHandler() {
 	w1 = httptest.NewRecorder()
 	suite.r.ServeHTTP(w1, req1)
 	returnVal, _ = io.ReadAll(w1.Result().Body)
-	expect = `{"triggered":true,"id":"rule321","sql":"select * from alert","actions":[{"nop":{}}],"options":{"debug":false,"isEventTime":false,"lateTolerance":"1s","concurrency":1,"bufferLength":1024,"sendMetaToSink":false,"sendNilField":false,"sendError":false,"checkpointInterval":"5m0s","restartStrategy":{"delay":"1s","multiplier":2,"maxDelay":"30s","jitterFactor":0.1}}}`
+	expect = "{\"actions\":[{\"nop\":{}}],\"id\":\"rule321\",\"sql\":\"select * from alert\",\"triggered\":true}"
 	assert.Equal(suite.T(), expect, string(returnVal))
 
 	// delete rule

internal/server/rule_manager.go

@@ -89,7 +89,7 @@ func (rr *RuleRegistry) upsert(id string, ruleJson string) error {
 func (rr *RuleRegistry) updateTrigger(id string, trigger bool) error {
 	rr.Lock()
 	defer rr.Unlock()
-	_, err := ruleProcessor.ExecReplaceRuleState(id, trigger)
+	err := ruleProcessor.ExecReplaceRuleState(id, trigger)
 	return err
 }