api/v2: Delete silence respond with 404 when silence is not found (pr…

…ometheus#3352) Signed-off-by: Emmanuel Lodovice <[email protected]>
goldmansachs · Nov 6, 2023 · f8bb27e · f8bb27e
1 parent 5dd926a
commit f8bb27e
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 1 deletion.
diff --git a/api/v2/api.go b/api/v2/api.go
@@ -634,6 +634,9 @@ func (api *API) deleteSilenceHandler(params silence_ops.DeleteSilenceParams) mid
 	sid := params.SilenceID.String()
 	if err := api.silences.Expire(sid); err != nil {
 		level.Error(logger).Log("msg", "Failed to expire silence", "err", err)
+		if err == silence.ErrNotFound {
+			return silence_ops.NewDeleteSilenceNotFound()
+		}
 		return silence_ops.NewDeleteSilenceInternalServerError().WithPayload(err.Error())
 	}
 	return silence_ops.NewDeleteSilenceOK()

diff --git a/api/v2/api_test.go b/api/v2/api_test.go
@@ -178,7 +178,7 @@ func TestDeleteSilenceHandler(t *testing.T) {
 	}{
 		{
 			"unknownSid",
-			500,
+			404,
 		},
 		{
 			unexpiredSid,

diff --git a/api/v2/client/silence/delete_silence_responses.go b/api/v2/client/silence/delete_silence_responses.go
diff --git a/api/v2/openapi.yaml b/api/v2/openapi.yaml
@@ -127,6 +127,8 @@ paths:
       responses:
         '200':
           description: Delete silence response
+        '404':
+          description: A silence with the specified ID was not found
         '500':
           $ref: '#/responses/InternalServerError'
   /alerts:

diff --git a/api/v2/restapi/embedded_spec.go b/api/v2/restapi/embedded_spec.go
diff --git a/api/v2/restapi/operations/silence/delete_silence_responses.go b/api/v2/restapi/operations/silence/delete_silence_responses.go