docstring changes made from PR feedback, renamed file to technique_mappings_to_csv.py

Author: emmanvg

scripts/README.md

@@ -7,4 +7,4 @@ This folder contains one-off scripts for working with ATT&CK content. These scri
 | [techniques_from_data_source.py](techniques_from_data_source.py) | Fetches the current ATT&CK STIX 2.0 objects from the ATT&CK TAXII server, prints all of the data sources listed in Enterprise ATT&CK, and then lists all the Enterprise techniques containing a given data source. Run `python3 techniques_from_data_source.py -h` for usage instructions. |
 | [techniques_data_sources_vis.py](techniques_data_sources_vis.py) | Generate the csv data used to create the "Techniques Mapped to Data Sources" visualization in the ATT&CK roadmap. Run `python3 techniques_data_sources_vis.py -h` for usage instructions. | 
 | [diff_stix.py](diff_stix.py) | Create markdown and/or ATT&CK Navigator layers reporting on the changes between two versions of the STIX2 bundles representing the ATT&CK content. For default operation, put [enterprise-attack.json](https://github.com/mitre/cti/blob/master/enterprise-attack/enterprise-attack.json), [mobile-attack.json](https://github.com/mitre/cti/blob/master/mobile-attack/mobile-attack.json), and [pre-attack.json](https://github.com/mitre/cti/blob/master/pre-attack/pre-attack.json) bundles in 'old' and 'new' folders for the script to compare. Run `python3 diff_stix.py -h` for full usage instructions. |
-| [filter_techniques_by_category.py](filter_techniques_by_category.py) | Fetches the current ATT&CK content expressed as STIX2 and creates spreadsheet matching Techniques with Mitigations or Groups. Run `python3 filter_techniques_by_category.py -h` for usage instructions. |
+| [technique_mappings_to_csv.py](technique_mappings_to_csv.py) | Fetches the current ATT&CK content expressed as STIX2 and creates spreadsheet mapping Techniques with Mitigations, Groups or Software. Run `python3 technique_mappings_to_csv.py -h` for usage instructions. |

scripts/filter_techniques_by_category.py scripts/technique_mappings_to_csv.pyscripts/filter_techniques_by_category.py renamed to scripts/technique_mappings_to_csv.py

@@ -7,7 +7,7 @@
 
 
 def build_taxii_source(collection_name):
-    """Downloads latest Enterprise ATT&CK content from GitHub."""
+    """Downloads latest Enterprise or Mobile ATT&CK content from MITRE TAXII Server."""
     # Establish TAXII2 Collection instance for Enterprise ATT&CK collection
     collection_map = {
         "enterprise_attack": "95ecc380-afe9-11e4-9b6c-751b66dd541e",
@@ -32,7 +32,7 @@ def get_all_techniques(src, source_name):
 
 
 def filter_for_term_relationships(src, relationship_type, object_id, target=True):
-    """Filters data source by relationship that matches type and source or target"""
+    """Filters data source by type, relationship_type and source or target"""
     filters = [
         stix2.Filter("type", "=", "relationship"),
         stix2.Filter("relationship_type", "=", relationship_type),
@@ -85,9 +85,9 @@ def escape_chars(a_string):
 
 def arg_parse():
     """Function to handle script arguments."""
-    parser = argparse.ArgumentParser(description="Fetches the current ATT&CK content expressed as STIX2 and creates spreadsheet matching Techniques with Mitigations or Groups.")
-    parser.add_argument("-c", "--collection", type=str, required=True, choices=["enterprise_attack", "mobile_attack"], help="Which collection to use (Enterprise, Mobile).")
-    parser.add_argument("-o", "--operation", type=str, required=True, choices=["groups", "mitigations", "software"], help="Operation to perform on ATT&CK content.")
+    parser = argparse.ArgumentParser(description="Fetches the current ATT&CK content expressed as STIX2 and creates spreadsheet mapping Techniques with Mitigations, Groups or Software.")
+    parser.add_argument("-d", "--domain", type=str, required=True, choices=["enterprise_attack", "mobile_attack"], help="Which ATT&CK domain to use (Enterprise, Mobile).")
+    parser.add_argument("-m", "--mapping-type", type=str, required=True, choices=["groups", "mitigations", "software"], help="Which type of object to output mappings for using ATT&CK content.")
     parser.add_argument("-s", "--save", type=str, required=False, help="Save the CSV file with a different filename.")
     return parser