fix: [tests, doc] Fixed automated doc generation from tests by allowing multiple stix object types to be documented as result of a conversion

Author: chrisr3d

tests/_test_stix_export.py

@@ -832,13 +832,13 @@ def _populate_attributes_documentation(self, attribute, **kwargs):
         feature = attribute['type']
         if 'MISP' not in self._attributes_v21[feature]:
             self._attributes_v21[feature]['MISP'] = self._sanitize_documentation(attribute)
-        if 'observed_data' in kwargs:
-            documented = [json.loads(observable.serialize()) for observable in kwargs['observed_data']]
-            self._attributes_v21[feature]['STIX']['Observed Data'] = documented
-        else:
-            for object_type, stix_object in kwargs.items():
-                documented = json.loads(stix_object.serialize())
-                self._attributes_v21[feature]['STIX'][object_type.capitalize()] = documented
+        for object_type, stix_object in kwargs.items():
+            if object_type == 'observed_data':
+                documented = [json.loads(observable.serialize()) for observable in kwargs['observed_data']]
+                self._attributes_v21[feature]['STIX']['Observed Data'] = documented
+                continue
+            documented = json.loads(stix_object.serialize())
+            self._attributes_v21[feature]['STIX'][object_type.capitalize()] = documented
 
     def _populate_galaxies_documentation(self, galaxy, name=None, summary=None, **kwargs):
         if name is None:

tests/update_documentation.py

@@ -203,7 +203,8 @@ def _replace_data(self, attribute, name, stix_mapping):
 
     @staticmethod
     def _replace_export_file_data(mapping, data, short_data):
-        mapping['Indicator']['pattern'] = mapping['Indicator']['pattern'].replace(data, short_data)
+        if mapping.get('Indicator', {}).get('pattern') is not None:
+            mapping['Indicator']['pattern'] = mapping['Indicator']['pattern'].replace(data, short_data)
         if isinstance(mapping['Observed Data'], list):
             for observable in mapping['Observed Data'][1:]:
                 if observable['type'] == 'artifact':