[client] Linting

Samuel Hassine · Samuel Hassine · commit 64cdb46102e2 · 2020-05-01T20:31:10.000+02:00
diff --git a/pycti/entities/opencti_attack_pattern.py b/pycti/entities/opencti_attack_pattern.py
@@ -473,9 +473,7 @@ def import_from_stix2(self, **kwargs):
                 markingDefinitions=extras["marking_definitions_ids"]
                 if "marking_definitions_ids" in extras
                 else [],
-                tags=extras["tags_ids"]
-                if "tags_ids" in extras
-                else [],
+                tags=extras["tags_ids"] if "tags_ids" in extras else [],
                 killChainPhases=extras["kill_chain_phases_ids"]
                 if "kill_chain_phases_ids" in extras
                 else [],
diff --git a/pycti/entities/opencti_campaign.py b/pycti/entities/opencti_campaign.py
@@ -249,7 +249,7 @@ def create_raw(self, **kwargs):
                         "modified": modified,
                         "createdByRef": created_by_ref,
                         "markingDefinitions": marking_definitions,
-                        "tags": tags
+                        "tags": tags,
                     }
                 },
             )
@@ -358,7 +358,7 @@ def create(self, **kwargs):
                 modified=modified,
                 createdByRef=created_by_ref,
                 markingDefinitions=marking_definitions,
-                tags=tags
+                tags=tags,
             )
 
     """
diff --git a/pycti/entities/opencti_course_of_action.py b/pycti/entities/opencti_course_of_action.py
@@ -243,7 +243,7 @@ def create_raw(self, **kwargs):
                         "modified": modified,
                         "createdByRef": created_by_ref,
                         "markingDefinitions": marking_definitions,
-                        "tags": tags
+                        "tags": tags,
                     }
                 },
             )
@@ -326,7 +326,7 @@ def create(self, **kwargs):
                 modified=modified,
                 createdByRef=created_by_ref,
                 markingDefinitions=marking_definitions,
-                tags=tags
+                tags=tags,
             )
 
     """
diff --git a/pycti/entities/opencti_identity.py b/pycti/entities/opencti_identity.py
@@ -247,7 +247,7 @@ def create_raw(self, **kwargs):
                         "modified": modified,
                         "createdByRef": created_by_ref,
                         "markingDefinitions": marking_definitions,
-                        "tags": tags
+                        "tags": tags,
                     }
                 },
             )
@@ -327,7 +327,7 @@ def create(self, **kwargs):
                 modified=modified,
                 createdByRef=created_by_ref,
                 markingDefinitions=marking_definitions,
-                tags=tags
+                tags=tags,
             )
 
     """
diff --git a/pycti/entities/opencti_incident.py b/pycti/entities/opencti_incident.py
@@ -259,7 +259,7 @@ def create_raw(self, **kwargs):
                         "modified": modified,
                         "createdByRef": created_by_ref,
                         "markingDefinitions": marking_definitions,
-                        "tags": tags
+                        "tags": tags,
                     }
                 },
             )
@@ -366,7 +366,7 @@ def create(self, **kwargs):
                 modified=modified,
                 createdByRef=created_by_ref,
                 markingDefinitions=marking_definitions,
-                tags=tags
+                tags=tags,
             )
 
     """
diff --git a/pycti/entities/opencti_indicator.py b/pycti/entities/opencti_indicator.py
@@ -431,7 +431,7 @@ def create(self, **kwargs):
                 createdByRef=created_by_ref,
                 markingDefinitions=marking_definitions,
                 tags=tags,
-                killChainPhases=kill_chain_phases
+                killChainPhases=kill_chain_phases,
             )
 
     """
diff --git a/pycti/entities/opencti_intrusion_set.py b/pycti/entities/opencti_intrusion_set.py
@@ -262,7 +262,7 @@ def create_raw(self, **kwargs):
                         "modified": modified,
                         "createdByRef": created_by_ref,
                         "markingDefinitions": marking_definitions,
-                        "tags": tags
+                        "tags": tags,
                     }
                 },
             )
@@ -430,7 +430,7 @@ def create(self, **kwargs):
                 modified=modified,
                 createdByRef=created_by_ref,
                 markingDefinitions=marking_definitions,
-                tags=tags
+                tags=tags,
             )
 
     """
diff --git a/pycti/entities/opencti_malware.py b/pycti/entities/opencti_malware.py
@@ -257,7 +257,7 @@ def create_raw(self, **kwargs):
                         "modified": modified,
                         "createdByRef": created_by_ref,
                         "markingDefinitions": marking_definitions,
-                        "tags": tags
+                        "tags": tags,
                     }
                 },
             )
@@ -337,7 +337,7 @@ def create(self, **kwargs):
                 modified=modified,
                 createdByRef=created_by_ref,
                 markingDefinitions=marking_definitions,
-                tags=tags
+                tags=tags,
             )
 
     """
diff --git a/pycti/entities/opencti_report.py b/pycti/entities/opencti_report.py
@@ -377,7 +377,7 @@ def create_raw(self, **kwargs):
                         "modified": modified,
                         "createdByRef": created_by_ref,
                         "markingDefinitions": marking_definitions,
-                        "tags": tags
+                        "tags": tags,
                     }
                 },
             )
@@ -485,7 +485,7 @@ def create(self, **kwargs):
                 modified=modified,
                 createdByRef=created_by_ref,
                 markingDefinitions=marking_definitions,
-                tags=tags
+                tags=tags,
             )
             if external_reference_id is not None:
                 self.opencti.stix_entity.add_external_reference(
@@ -652,9 +652,7 @@ def import_from_stix2(self, **kwargs):
                 markingDefinitions=extras["marking_definitions_ids"]
                 if "marking_definitions_ids" in extras
                 else [],
-                tags=extras["tags_ids"]
-                if "tags_ids" in extras
-                else [],
+                tags=extras["tags_ids"] if "tags_ids" in extras else [],
                 update=update,
             )
         else:
diff --git a/pycti/entities/opencti_tool.py b/pycti/entities/opencti_tool.py
@@ -240,7 +240,7 @@ def create_raw(self, **kwargs):
                         "modified": modified,
                         "createdByRef": created_by_ref,
                         "markingDefinitions": marking_definitions,
-                        "tags": tags
+                        "tags": tags,
                     }
                 },
             )
diff --git a/pycti/entities/opencti_vulnerability.py b/pycti/entities/opencti_vulnerability.py
@@ -423,7 +423,7 @@ def create(self, **kwargs):
                 modified=modified,
                 createdByRef=created_by_ref,
                 markingDefinitions=marking_definitions,
-                tags=tags
+                tags=tags,
             )
 
     """
diff --git a/pycti/utils/opencti_stix2.py b/pycti/utils/opencti_stix2.py
@@ -1226,9 +1226,10 @@ def prepare_export(
                         "definition_type"
                     ].lower(),
                     "definition": {
-                        entity_marking_definition[
-                            "definition_type"
-                        ].lower(): entity_marking_definition["definition"].lower().replace('tlp:')
+                        entity_marking_definition["definition_type"]
+                        .lower(): entity_marking_definition["definition"]
+                        .lower()
+                        .replace("tlp:")
                     },
                     "created": entity_marking_definition["created"],
                     CustomProperties.MODIFIED: entity_marking_definition["modified"],
@@ -1472,7 +1473,9 @@ def create_marking_definition(self, stix_object, extras, update=False):
         definition = stix_object["definition"][stix_object["definition_type"]]
         if stix_object["definition_type"] == "tlp":
             definition_type = definition_type.upper()
-            definition = (definition_type + ":" + stix_object["definition"]['tlp'].upper())
+            definition = (
+                definition_type + ":" + stix_object["definition"]["tlp"].upper()
+            )
         return self.opencti.marking_definition.create(
             definition_type=definition_type,
             definition=definition,
@@ -1529,9 +1532,7 @@ def create_identity(self, stix_object, extras, update=False):
             markingDefinitions=extras["marking_definitions_ids"]
             if "marking_definitions_ids" in extras
             else [],
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             update=update,
         )
 
@@ -1571,9 +1572,7 @@ def create_threat_actor(self, stix_object, extras, update=False):
             markingDefinitions=extras["marking_definitions_ids"]
             if "marking_definitions_ids" in extras
             else [],
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             update=update,
         )
 
@@ -1616,9 +1615,7 @@ def create_intrusion_set(self, stix_object, extras, update=False):
             markingDefinitions=extras["marking_definitions_ids"]
             if "marking_definitions_ids" in extras
             else [],
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             update=update,
         )
 
@@ -1649,9 +1646,7 @@ def create_campaign(self, stix_object, extras, update=False):
             markingDefinitions=extras["marking_definitions_ids"]
             if "marking_definitions_ids" in extras
             else [],
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             uodate=update,
         )
 
@@ -1680,9 +1675,7 @@ def create_incident(self, stix_object, extras, update=False):
             markingDefinitions=extras["marking_definitions_ids"]
             if "marking_definitions_ids" in extras
             else [],
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             update=update,
         )
 
@@ -1709,9 +1702,7 @@ def create_malware(self, stix_object, extras, update=False):
             killChainPhases=extras["kill_chain_phases_ids"]
             if "kill_chain_phases_ids" in extras
             else [],
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             update=update,
         )
 
@@ -1738,9 +1729,7 @@ def create_tool(self, stix_object, extras, update=False):
             killChainPhases=extras["kill_chain_phases_ids"]
             if "kill_chain_phases_ids" in extras
             else [],
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             update=update,
         )
 
@@ -1779,9 +1768,7 @@ def create_vulnerability(self, stix_object, extras, update=False):
             markingDefinitions=extras["marking_definitions_ids"]
             if "marking_definitions_ids" in extras
             else [],
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             update=update,
         )
 
@@ -1810,9 +1797,7 @@ def create_course_of_action(self, stix_object, extras, update=False):
             markingDefinitions=extras["marking_definitions_ids"]
             if "marking_definitions_ids" in extras
             else [],
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             update=update,
         )
 
@@ -1864,9 +1849,7 @@ def create_indicator(self, stix_object, extras, update=False):
             markingDefinitions=extras["marking_definitions_ids"]
             if "marking_definitions_ids" in extras
             else None,
-            tags=extras["tags_ids"]
-            if "tags_ids" in extras
-            else [],
+            tags=extras["tags_ids"] if "tags_ids" in extras else [],
             update=update,
         )
 

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ def create_raw(self, **kwargs):`
`249`	`249`	`"modified": modified,`
`250`	`250`	`"createdByRef": created_by_ref,`
`251`	`251`	`"markingDefinitions": marking_definitions,`
`252`		`- "tags": tags`
	`252`	`+ "tags": tags,`
`253`	`253`	`}`
`254`	`254`	`},`
`255`	`255`	`)`
`@@ -358,7 +358,7 @@ def create(self, **kwargs):`
`358`	`358`	`modified=modified,`
`359`	`359`	`createdByRef=created_by_ref,`
`360`	`360`	`markingDefinitions=marking_definitions,`
`361`		`- tags=tags`
	`361`	`+ tags=tags,`
`362`	`362`	`)`
`363`	`363`
`364`	`364`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ def create_raw(self, **kwargs):`
`243`	`243`	`"modified": modified,`
`244`	`244`	`"createdByRef": created_by_ref,`
`245`	`245`	`"markingDefinitions": marking_definitions,`
`246`		`- "tags": tags`
	`246`	`+ "tags": tags,`
`247`	`247`	`}`
`248`	`248`	`},`
`249`	`249`	`)`
`@@ -326,7 +326,7 @@ def create(self, **kwargs):`
`326`	`326`	`modified=modified,`
`327`	`327`	`createdByRef=created_by_ref,`
`328`	`328`	`markingDefinitions=marking_definitions,`
`329`		`- tags=tags`
	`329`	`+ tags=tags,`
`330`	`330`	`)`
`331`	`331`
`332`	`332`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ def create_raw(self, **kwargs):`
`247`	`247`	`"modified": modified,`
`248`	`248`	`"createdByRef": created_by_ref,`
`249`	`249`	`"markingDefinitions": marking_definitions,`
`250`		`- "tags": tags`
	`250`	`+ "tags": tags,`
`251`	`251`	`}`
`252`	`252`	`},`
`253`	`253`	`)`
`@@ -327,7 +327,7 @@ def create(self, **kwargs):`
`327`	`327`	`modified=modified,`
`328`	`328`	`createdByRef=created_by_ref,`
`329`	`329`	`markingDefinitions=marking_definitions,`
`330`		`- tags=tags`
	`330`	`+ tags=tags,`
`331`	`331`	`)`
`332`	`332`
`333`	`333`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ def create_raw(self, **kwargs):`
`259`	`259`	`"modified": modified,`
`260`	`260`	`"createdByRef": created_by_ref,`
`261`	`261`	`"markingDefinitions": marking_definitions,`
`262`		`- "tags": tags`
	`262`	`+ "tags": tags,`
`263`	`263`	`}`
`264`	`264`	`},`
`265`	`265`	`)`
`@@ -366,7 +366,7 @@ def create(self, **kwargs):`
`366`	`366`	`modified=modified,`
`367`	`367`	`createdByRef=created_by_ref,`
`368`	`368`	`markingDefinitions=marking_definitions,`
`369`		`- tags=tags`
	`369`	`+ tags=tags,`
`370`	`370`	`)`
`371`	`371`
`372`	`372`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ def create(self, **kwargs):`
`431`	`431`	`createdByRef=created_by_ref,`
`432`	`432`	`markingDefinitions=marking_definitions,`
`433`	`433`	`tags=tags,`
`434`		`- killChainPhases=kill_chain_phases`
	`434`	`+ killChainPhases=kill_chain_phases,`
`435`	`435`	`)`
`436`	`436`
`437`	`437`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ def create_raw(self, **kwargs):`
`262`	`262`	`"modified": modified,`
`263`	`263`	`"createdByRef": created_by_ref,`
`264`	`264`	`"markingDefinitions": marking_definitions,`
`265`		`- "tags": tags`
	`265`	`+ "tags": tags,`
`266`	`266`	`}`
`267`	`267`	`},`
`268`	`268`	`)`
`@@ -430,7 +430,7 @@ def create(self, **kwargs):`
`430`	`430`	`modified=modified,`
`431`	`431`	`createdByRef=created_by_ref,`
`432`	`432`	`markingDefinitions=marking_definitions,`
`433`		`- tags=tags`
	`433`	`+ tags=tags,`
`434`	`434`	`)`
`435`	`435`
`436`	`436`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ def create_raw(self, **kwargs):`
`257`	`257`	`"modified": modified,`
`258`	`258`	`"createdByRef": created_by_ref,`
`259`	`259`	`"markingDefinitions": marking_definitions,`
`260`		`- "tags": tags`
	`260`	`+ "tags": tags,`
`261`	`261`	`}`
`262`	`262`	`},`
`263`	`263`	`)`
`@@ -337,7 +337,7 @@ def create(self, **kwargs):`
`337`	`337`	`modified=modified,`
`338`	`338`	`createdByRef=created_by_ref,`
`339`	`339`	`markingDefinitions=marking_definitions,`
`340`		`- tags=tags`
	`340`	`+ tags=tags,`
`341`	`341`	`)`
`342`	`342`
`343`	`343`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ def create_raw(self, **kwargs):`
`240`	`240`	`"modified": modified,`
`241`	`241`	`"createdByRef": created_by_ref,`
`242`	`242`	`"markingDefinitions": marking_definitions,`
`243`		`- "tags": tags`
	`243`	`+ "tags": tags,`
`244`	`244`	`}`
`245`	`245`	`},`
`246`	`246`	`)`