public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenAPI: Fix alerting DeleteMuteTiming errors (#91109)

Browse Source 
The `GenericPublicError` is not what is actually returned by the API. Using `PublicError` describes the API correctly
This commit is contained in:
Julien Duchesne
2024-08-26 10:04:36 -04:00
committed by GitHub
parent 0075abe383
commit 087df1d8e5
8 changed files with 66 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/api/tooling/api.json
+12 -21
View File
@@ -1315,14 +1315,6 @@
"title": "Frames is a slice of Frame pointers.",
"type": "array"
},
"GenericPublicError": {
"properties": {
"body": {
"$ref": "#/definitions/PublicError"
}
},
"type": "object"
},
"GettableAlertmanagers": {
"properties": {
"data": {
@@ -4583,7 +4575,6 @@
"type": "object"
},
"alertGroups": {
"description": "AlertGroups alert groups",
"items": {
"$ref": "#/definitions/alertGroup",
"type": "object"
@@ -5919,9 +5910,9 @@
"description": " The mute timing was deleted successfully."
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
@@ -5997,9 +5988,9 @@
}
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
@@ -6211,9 +6202,9 @@
"description": " The template was deleted successfully."
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
@@ -6241,9 +6232,9 @@
}
},
"404": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
@@ -6286,15 +6277,15 @@
}
},
"400": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go
+2 -2
View File
@@ -70,7 +70,7 @@ import (
// Responses:
// 202: MuteTimeInterval
// 400: ValidationError
// 409: GenericPublicError
// 409: PublicError
// swagger:route DELETE /v1/provisioning/mute-timings/{name} provisioning stable RouteDeleteMuteTiming
//
@@ -78,7 +78,7 @@ import (
//
// Responses:
// 204: description: The mute timing was deleted successfully.
// 409: GenericPublicError
// 409: PublicError
// swagger:route
pkg/services/ngalert/api/tooling/definitions/provisioning_templates.go
+4 -4
View File
@@ -13,7 +13,7 @@ package definitions
//
// Responses:
// 200: NotificationTemplate
// 404: GenericPublicError
// 404: PublicError
// swagger:route PUT /v1/provisioning/templates/{name} provisioning stable RoutePutTemplate
//
@@ -24,8 +24,8 @@ package definitions
//
// Responses:
// 202: NotificationTemplate
// 400: GenericPublicError
// 409: GenericPublicError
// 400: PublicError
// 409: PublicError
// swagger:route DELETE /v1/provisioning/templates/{name} provisioning stable RouteDeleteTemplate
//
@@ -33,7 +33,7 @@ package definitions
//
// Responses:
// 204: description: The template was deleted successfully.
// 409: GenericPublicError
// 409: PublicError
// swagger:parameters RouteGetTemplate RoutePutTemplate RouteDeleteTemplate
type RouteGetTemplateParam struct {
pkg/services/ngalert/api/tooling/definitions/shared.go
-7
View File
@@ -20,10 +20,3 @@ type ForbiddenError struct {
// in: body
Body errutil.PublicError `json:"body"`
}
// swagger:model
type GenericPublicError struct {
// The response message
// in: body
Body errutil.PublicError `json:"body"`
}
pkg/services/ngalert/api/tooling/post.json
+12 -20
View File
@@ -1315,14 +1315,6 @@
"title": "Frames is a slice of Frame pointers.",
"type": "array"
},
"GenericPublicError": {
"properties": {
"body": {
"$ref": "#/definitions/PublicError"
}
},
"type": "object"
},
"GettableAlertmanagers": {
"properties": {
"data": {
@@ -8130,9 +8122,9 @@
"description": " The mute timing was deleted successfully."
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
@@ -8208,9 +8200,9 @@
}
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
@@ -8422,9 +8414,9 @@
"description": " The template was deleted successfully."
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
@@ -8452,9 +8444,9 @@
}
},
"404": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
@@ -8497,15 +8489,15 @@
}
},
"400": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
},
pkg/services/ngalert/api/tooling/spec.json
+12 -20
View File
@@ -3086,9 +3086,9 @@
}
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
}
@@ -3125,9 +3125,9 @@
"description": " The mute timing was deleted successfully."
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
}
@@ -3343,9 +3343,9 @@
}
},
"404": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
}
@@ -3389,15 +3389,15 @@
}
},
"400": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
}
@@ -3429,9 +3429,9 @@
"description": " The template was deleted successfully."
},
"409": {
"description": "GenericPublicError",
"description": "PublicError",
"schema": {
"$ref": "#/definitions/GenericPublicError"
"$ref": "#/definitions/PublicError"
}
}
}
@@ -4947,14 +4947,6 @@
"$ref": "#/definitions/Frame"
}
},
"GenericPublicError": {
"type": "object",
"properties": {
"body": {
"$ref": "#/definitions/PublicError"
}
}
},
"GettableAlertmanagers": {
"type": "object",
"properties": {