diff --git a/CHANGELOG.md b/CHANGELOG.md index 3203a14226..f642f24c51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ * [ENHANCEMENT] Distributor/Ring: Allow disabling detailed ring metrics by ring member. #5931 * [ENHANCEMENT] KV: Etcd Added etcd.ping-without-stream-allowed parameter to disable/enable PermitWithoutStream #5933 * [CHANGE] Upgrade Dockerfile Node version from 14x to 18x. #5906 -* [CHANGE] Query Frontend/Ruler: Omit empty data field in API response. #5953 +* [CHANGE] Query Frontend/Ruler: Omit empty data field in API response. #5953 #5954 * [BUGFIX] Configsdb: Fix endline issue in db password. #5920 * [BUGFIX] Ingester: Fix `user` and `type` labels for the `cortex_ingester_tsdb_head_samples_appended_total` TSDB metric. #5952 diff --git a/pkg/ruler/api_test.go b/pkg/ruler/api_test.go index 22f4537ba0..132ecfcf64 100644 --- a/pkg/ruler/api_test.go +++ b/pkg/ruler/api_test.go @@ -337,7 +337,7 @@ func TestRuler_DeleteNamespace(t *testing.T) { router.ServeHTTP(w, req) require.Equal(t, http.StatusAccepted, w.Code) - require.Equal(t, "{\"status\":\"success\",\"errorType\":\"\",\"error\":\"\"}", w.Body.String()) + require.Equal(t, "{\"status\":\"success\"}", w.Body.String()) // On Partial failures req = requestFor(t, http.MethodDelete, "https://localhost:8080/api/v1/rules/namespace2", nil, "user1") @@ -430,7 +430,7 @@ rules: - record: up_rule expr: up{} `, - output: "{\"status\":\"success\",\"errorType\":\"\",\"error\":\"\"}", + output: "{\"status\":\"success\"}", }, { name: "when exceeding the rule group limit after sending the first group", @@ -490,7 +490,7 @@ rules: expr: |2+ up{} `, - output: "{\"status\":\"success\",\"errorType\":\"\",\"error\":\"\"}", + output: "{\"status\":\"success\"}", }, { name: "when pushing group that CANNOT be safely converted from RuleGroupDesc to RuleGroup yaml", diff --git a/pkg/util/api/response.go b/pkg/util/api/response.go index fd3be33ae1..7e7c7713a2 100644 --- a/pkg/util/api/response.go +++ b/pkg/util/api/response.go @@ -20,8 +20,8 @@ const ( type Response struct { Status string `json:"status"` Data interface{} `json:"data,omitempty"` - ErrorType v1.ErrorType `json:"errorType"` - Error string `json:"error"` + ErrorType v1.ErrorType `json:"errorType,omitempty"` + Error string `json:"error,omitempty"` Warnings []string `json:"warnings,omitempty"` }