Fix Excel output for datasources/components to display correctly

Author: jondricek

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.5.3 4/15/2022
+
+## Fixes
+
+- Fix Excel output for datasources/components to display correctly
+
 # v1.5.2 4/13/2022
 
 ## Fixes

mitreattack/attackToExcel/stixToDf.py

@@ -258,7 +258,7 @@ def sourcesToDf(src, domain):
             if "x_mitre_aliases" in data_object:
                 row["aliases"] = ", ".join(sorted(data_object["x_mitre_aliases"][1:]))
             if data_object["type"] == "x-mitre-data-component":
-                row["name"] = f"{data_object['name']}: {source_lookup[data_object['x_mitre_data_source_ref']]}"
+                row["name"] = f"{source_lookup[data_object['x_mitre_data_source_ref']]}: {data_object['name']}"
                 row["type"] = "datacomponent"
             else:
                 row["type"] = "datasource"

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="mitreattack-python",
-    version="1.5.2",
+    version="1.5.3",
     author="MITRE ATT&CK, MITRE Corporation",
     author_email="attack@mitre.org",
     description="MITRE ATT&CK python library",