Improved code of alert rule update request in test

airbus-cyber · Jun 7, 2024 · 187e172 · 187e172
1 parent 8e6f277
commit 187e172
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/validation/graylog.py b/validation/graylog.py
@@ -88,17 +88,17 @@ def create_alert_rule_and(self, *args, **kwargs):
     def create_alert_rule_or(self, title, time, description=''):
         return self._api.create_alert_rule_or(title, time, description)
 
-    def update_alert_rule(self, rule, new_description):
+    def update_alert_rule(self, previousTitle, rule):
         updated_rule = {
             'title': rule['title'],
             'severity': rule['severity'],
-            'description': new_description,
+            'description': rule['description'],
             'condition_type': rule['condition_type'],
             'condition_parameters': rule['condition_parameters'],
             'stream': rule['stream'],
             'second_stream': rule['second_stream']
         }
-        return self._api.update_alert_rule(updated_rule)
+        return self._api.update_alert_rule(previousTitle, updated_rule)
 
     def create_list(self, *args):
         self._api.create_list(*args)

diff --git a/validation/graylog_rest_api.py b/validation/graylog_rest_api.py
@@ -112,9 +112,8 @@ def _create_alert_rule(self, title, stream, condition_type, time,
         response = self._post('plugins/com.airbus_cyber_security.graylog.wizard/alerts', alert_rule)
         return response.json()
 
-    def update_alert_rule(self, rule):
-        title = rule['title']
-        response = self._put(f'plugins/com.airbus_cyber_security.graylog.wizard/alerts/{title}', rule)
+    def update_alert_rule(self, previousTitle, rule):
+        response = self._put(f'plugins/com.airbus_cyber_security.graylog.wizard/alerts/{previousTitle}', rule)
         return response.json()
 
     # TODO have a default value for rule

diff --git a/validation/test.py b/validation/test.py
@@ -199,7 +199,7 @@ def test_get_alert_should_return_the_description_of_the_event_definition__issue1
     def test_update_alert_should_change_the_alert_description__issue102(self):
         title = 'aaa'
         rule = self._graylog.create_alert_rule_count(title, _PERIOD)
-        self._graylog.update_alert_rule(rule, 'new_description')
+        self._graylog.update_alert_rule(title, {**rule, 'description': 'new_description'})
         alert_rule = self._graylog.get_alert_rule(title)
         self.assertEqual('new_description', alert_rule['description'])
 
@@ -217,7 +217,7 @@ def test_create_alert_rule_or_should_set_second_event_definition_description__is
     def test_update_alert_rule_or_should_update_second_event_definition_description__issue102(self):
         title = 'aaa'
         alert_rule = self._graylog.create_alert_rule_or(title, _PERIOD, description='description')
-        self._graylog.update_alert_rule(alert_rule, 'new description')
+        self._graylog.update_alert_rule(title, {**alert_rule, 'description': 'new description'})
         second_event_definition_identifier = alert_rule['second_event_definition']
         second_event_definition = self._graylog.get_event_definition(second_event_definition_identifier)
         self.assertEqual('new description', second_event_definition['description'])
@@ -241,7 +241,7 @@ def test_update_alert_rule_count_to_or_should_update_second_event_definition_des
             ],
             'matching_type': 'AND'
         }
-        alert_rule = self._graylog.update_alert_rule(alert_rule, 'new description')
+        alert_rule = self._graylog.update_alert_rule(title, {**alert_rule, 'description': 'new description'})
         second_event_definition_identifier = alert_rule['second_event_definition']
         second_event_definition = self._graylog.get_event_definition(second_event_definition_identifier)
         self.assertEqual('new description', second_event_definition['description'])