bugfix

agent_test.go

@@ -1096,17 +1096,15 @@ func TestRuntimeHandler(t *testing.T) {
 }
 
 func TestClusterRefersFilterHandler(t *testing.T) {
-	completeConfig := cluster.RefersFilterConfigList{
-		{
-			Group:   "g1",
-			Service: "s1",
-			Mode:    cluster.FilterModeExclude,
-			Rule:    "127.0",
-		},
-	}
+	completeConfigBody := `[{"service":"com.weibo.api.test1","mode":"exclude","rule":"127.93.0.0/16"},{"service":"com.weibo.api.test2","mode":"exclude","rule":"127.93.0.0/16"}]`
+	var completeConfig cluster.RefersFilterConfigList
+	_ = json.Unmarshal([]byte(completeConfigBody), &completeConfig)
 	completeConfigExpect, _ := json.Marshal(completeConfig)
-	emptyConfig := cluster.RefersFilterConfigList{}
-	emptyConfigExpect, _ := json.Marshal(emptyConfig)
+	rewriteConfigBody := `[{"mode":"exclude","rule":"127.93.0.0/16"},{"service":"com.weibo.api.test2","mode":"exclude","rule":"127.93.0.0/16"}]`
+	var rewriteConfig cluster.RefersFilterConfigList
+	_ = json.Unmarshal([]byte(rewriteConfigBody), &rewriteConfig)
+	rewriteConfigExpect, _ := json.Marshal(rewriteConfig)
+	emptyConfigExpect := `[]`
 	cases := []struct {
 		desc       string
 		request    *http.Request
@@ -1164,7 +1162,7 @@ func TestClusterRefersFilterHandler(t *testing.T) {
 			request: func() *http.Request {
 				payload := &bytes.Buffer{}
 				writer := multipart.NewWriter(payload)
-				_ = writer.WriteField("config", string(completeConfigExpect))
+				_ = writer.WriteField("config", completeConfigBody)
 				_ = writer.Close()
 				req, _ := http.NewRequest("POST", "http://127.0.0.1:8002/refers/filter/set", payload)
 				req.Header.Set("Content-Type", writer.FormDataContentType())
@@ -1192,6 +1190,39 @@ func TestClusterRefersFilterHandler(t *testing.T) {
 				assert.Equal(t, fmt.Sprintf(`{"result":"ok","data":%s}`, completeConfigExpect), string(bodyBytes))
 			},
 		},
+		{
+			desc: "rewrite config",
+			request: func() *http.Request {
+				payload := &bytes.Buffer{}
+				writer := multipart.NewWriter(payload)
+				_ = writer.WriteField("config", string(rewriteConfigBody))
+				_ = writer.Close()
+				req, _ := http.NewRequest("POST", "http://127.0.0.1:8002/refers/filter/set", payload)
+				req.Header.Set("Content-Type", writer.FormDataContentType())
+				return req
+			}(),
+			assertFunc: func(t *testing.T, resp *http.Response, respErr error) {
+				assert.Nil(t, respErr)
+				assert.Equal(t, http.StatusOK, resp.StatusCode)
+				bodyBytes, err := ioutil.ReadAll(resp.Body)
+				assert.Nil(t, err)
+				assert.Equal(t, `{"result":"ok","data":"ok"}`, string(bodyBytes))
+			},
+		},
+		{
+			desc: "get rewrite config",
+			request: func() *http.Request {
+				req, _ := http.NewRequest("POST", "http://127.0.0.1:8002/refers/filter/get", nil)
+				return req
+			}(),
+			assertFunc: func(t *testing.T, resp *http.Response, respErr error) {
+				assert.Nil(t, respErr)
+				assert.Equal(t, http.StatusOK, resp.StatusCode)
+				bodyBytes, err := ioutil.ReadAll(resp.Body)
+				assert.Nil(t, err)
+				assert.Equal(t, fmt.Sprintf(`{"result":"ok","data":%s}`, rewriteConfigExpect), string(bodyBytes))
+			},
+		},
 	}
 
 	for _, c := range cases {

manageHandler.go

@@ -942,12 +942,14 @@ func (h *RefersFilterHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 			JSONError(w, "empty config")
 			return
 		}
-		err := json.Unmarshal([]byte(configContent), &h.config)
+		var newConfig cluster.RefersFilterConfigList
+		err := json.Unmarshal([]byte(configContent), &newConfig)
 		if err != nil {
 			vlog.Errorf("update refers filter fail, config: %s", configContent)
 			JSONError(w, "parse config failed")
 			return
 		}
+		h.config = newConfig
 		err = h.config.Verify()
 		if err != nil {
 			vlog.Errorf("update refers filter fail, config: %s", configContent)