Remove redundant code

Author: pyth0n1c

contentctl/objects/detection_tags.py

@@ -134,14 +134,6 @@ def addAttackEnrichment(self, info: ValidationInfo):
 
         if len(missing_tactics) > 0:
             raise ValueError(f"Missing Mitre Attack IDs. {missing_tactics} not found.")
-        else:
-            try:
-                MitreAttackEnrichment.checkParentTypeNotDefinedWhenSubtypeDefined(
-                    mitre_enrichments
-                )
-            except Exception as e:
-                raise ValueError(e)
-            self.mitre_attack_enrichments = mitre_enrichments
 
         return self
 
@@ -193,7 +185,8 @@ def sameTypeAndSubtypeNotPresent(
                 str(e) for e in subtype_and_parent_exist_exceptions
             )
             raise ValueError(
-                f"Overlapping MITRE Attack ID Tactics and Subtactics may not be defined:\n{error_string}"
+                "Overlapping MITRE Attack ID Tactics and Subtactics may not be defined. "
+                f"Remove the tactic and keep the subtactic:\n{error_string}"
             )
 
         return mitre_ids

contentctl/objects/mitre_attack_enrichment.py

@@ -115,40 +115,3 @@ def getUniqueGroups(
         for enrichment in enrichments:
             group_set.update(set(enrichment.mitre_attack_group_objects))
         return sorted(group_set)
-
-    @staticmethod
-    def checkParentTypeNotDefinedWhenSubtypeDefined(
-        enrichments: list[MitreAttackEnrichment],
-    ) -> None:
-        # Get all the mitre_attack_ids
-        mitre_attack_ids = [enrichment.mitre_attack_id for enrichment in enrichments]
-        # Split these into two groups - one that just has parents and one which has subtypes as well
-        mitre_attack_id_parents = [
-            mitre_attack_id
-            for mitre_attack_id in mitre_attack_ids
-            if "." not in mitre_attack_id
-        ]
-        mitre_attack_id_subtypes = [
-            mitre_attack_id
-            for mitre_attack_id in mitre_attack_ids
-            if "." in mitre_attack_id
-        ]
-
-        subtype_and_parent_exist_exceptions: list[Exception] = []
-
-        for mitre_attack_id in mitre_attack_id_subtypes:
-            parent_id = mitre_attack_id.split(".")[0]
-            if parent_id in mitre_attack_id_parents:
-                subtype_and_parent_exist_exceptions.append(
-                    Exception(
-                        f"Overlapping parent and subtype tactic: [Parent:  '{parent_id}', Subtype: '{mitre_attack_id}']"
-                    )
-                )
-        if len(subtype_and_parent_exist_exceptions):
-            raise ExceptionGroup(
-                "Error: both MITRE Attack ID Subtype and Parent are defined. "
-                "A parent tactic OR a subtype tactic may be defined, but not both",
-                subtype_and_parent_exist_exceptions,
-            )
-
-        return None