feat: Adjust the deletion of alerting silences

Author: ZPascal

grafana_api/alerting.py

@@ -161,7 +161,11 @@ def delete_alertmanager_silence_by_id(
                 RequestsMethods.DELETE,
             )
 
-            if api_call != dict():
+            if (
+                    api_call == dict()
+                    or api_call.get("message")
+                    != "silence deleted"
+            ):
                 logging.error(f"Please, check the error: {api_call}.")
                 raise Exception
             else:
@@ -272,7 +276,7 @@ def create_or_update_alertmanager_silence(
                 json.dumps(silence_json_dict),
             )
 
-            if api_call == dict() or api_call.get("id") is None:
+            if api_call == dict() or (api_call.get("id") is None and api_call.get("silenceID") is None):
                 logging.error(f"Check the error: {api_call}.")
                 raise Exception
             else:

tests/unittests/test_alerting.py

@@ -107,7 +107,7 @@ def test_delete_alertmanager_silence_by_id(self, call_the_api_mock):
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
         alerting: Alerting = Alerting(grafana_api_model=model)
 
-        call_the_api_mock.return_value = dict()
+        call_the_api_mock.return_value = dict({"message": "silence deleted"})
 
         self.assertEqual(None, alerting.delete_alertmanager_silence_by_id("test"))
 
@@ -202,6 +202,21 @@ def test_create_or_update_alertmanager_silence(self, call_the_api_mock):
             alerting.create_or_update_alertmanager_silence(silence),
         )
 
+    @patch("grafana_api.api.Api.call_the_api")
+    def test_create_or_update_alertmanager_silence_return_silence_id(self, call_the_api_mock):
+        model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
+        alerting: Alerting = Alerting(grafana_api_model=model)
+        silence: Silence = Silence(
+            "test", "test", "test", "test", "test", {"test": "test"}
+        )
+
+        call_the_api_mock.return_value = dict({"silenceID": "test"})
+
+        self.assertEqual(
+            dict({"silenceID": "test"}),
+            alerting.create_or_update_alertmanager_silence(silence),
+        )
+
     def test_create_or_update_alertmanager_silences_no_recipient(self):
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
         alerting: Alerting = Alerting(grafana_api_model=model)