diff --git a/pkg/services/ngalert/api/api_provisioning_test.go b/pkg/services/ngalert/api/api_provisioning_test.go index 44e695a38c6..bfa3b9d70cf 100644 --- a/pkg/services/ngalert/api/api_provisioning_test.go +++ b/pkg/services/ngalert/api/api_provisioning_test.go @@ -99,8 +99,10 @@ func TestProvisioningApi(t *testing.T) { response := sut.RoutePutPolicyTree(&rc, tree) require.Equal(t, 400, response.Status()) - expBody := `{"message":"invalid object specification: invalid policy tree"}` - require.Equal(t, expBody, string(response.Body())) + expBody := definitions.ValidationError{Message: "invalid object specification: invalid policy tree"} + expBodyJSON, marshalErr := json.Marshal(expBody) + require.NoError(t, marshalErr) + require.Equal(t, string(expBodyJSON), string(response.Body())) }) }) diff --git a/pkg/services/ngalert/api/tooling/api.json b/pkg/services/ngalert/api/tooling/api.json index 2b58b4734d5..6539d39c71e 100644 --- a/pkg/services/ngalert/api/tooling/api.json +++ b/pkg/services/ngalert/api/tooling/api.json @@ -4380,7 +4380,7 @@ }, "ValidationError": { "properties": { - "msg": { + "message": { "example": "error message", "type": "string" } diff --git a/pkg/services/ngalert/api/tooling/definitions/shared.go b/pkg/services/ngalert/api/tooling/definitions/shared.go index ebff1e78783..9948ed83168 100644 --- a/pkg/services/ngalert/api/tooling/definitions/shared.go +++ b/pkg/services/ngalert/api/tooling/definitions/shared.go @@ -11,7 +11,7 @@ type Ack struct{} // swagger:model type ValidationError struct { // example: error message - Msg string `json:"msg"` + Message string `json:"message"` } // swagger:model diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json index c44be2fd32e..4371f639744 100644 --- a/pkg/services/ngalert/api/tooling/post.json +++ b/pkg/services/ngalert/api/tooling/post.json @@ -4379,7 +4379,7 @@ }, "ValidationError": { "properties": { - "msg": { + "message": { "example": "error message", "type": "string" } diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json index c4128bbef76..61e5ec742aa 100644 --- a/pkg/services/ngalert/api/tooling/spec.json +++ b/pkg/services/ngalert/api/tooling/spec.json @@ -8013,7 +8013,7 @@ "ValidationError": { "type": "object", "properties": { - "msg": { + "message": { "type": "string", "example": "error message" } diff --git a/public/api-merged.json b/public/api-merged.json index 795a76a18df..50d08dee9ff 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -21969,7 +21969,7 @@ "ValidationError": { "type": "object", "properties": { - "msg": { + "message": { "type": "string", "example": "error message" } diff --git a/public/openapi3.json b/public/openapi3.json index ca56c598b19..3eccd8eda54 100644 --- a/public/openapi3.json +++ b/public/openapi3.json @@ -12027,7 +12027,7 @@ }, "ValidationError": { "properties": { - "msg": { + "message": { "example": "error message", "type": "string" }