small cleanup to use CsvLookup class.

Also move warning message to end
of error printout.

Author: pyth0n1c

contentctl/actions/detection_testing/GitService.py

@@ -10,11 +10,10 @@
 if TYPE_CHECKING:
     from contentctl.input.director import DirectorOutputDto
 
-
 from contentctl.objects.config import All, Changes, Selected, test_common
 from contentctl.objects.data_source import DataSource
 from contentctl.objects.detection import Detection
-from contentctl.objects.lookup import Lookup, Lookup_Type
+from contentctl.objects.lookup import CSVLookup, Lookup
 from contentctl.objects.macro import Macro
 from contentctl.objects.security_content_object import SecurityContentObject
 
@@ -150,8 +149,7 @@ def getChanges(self, target_branch: str) -> List[Detection]:
                             # Filter to find the Lookup Object the references this CSV
                             matched = list(
                                 filter(
-                                    lambda x: x.lookup_type == Lookup_Type.csv
-                                    and x.filename is not None
+                                    lambda x: isinstance(x, CSVLookup)
                                     and x.filename == decoded_path,
                                     self.director.lookups,
                                 )
@@ -162,7 +160,7 @@ def getChanges(self, target_branch: str) -> List[Detection]:
                                 )
                             elif len(matched) > 1:
                                 raise Exception(
-                                    f"More than 1 Lookup reference the modified CSV file '{decoded_path}': {[l.file_path for l in matched]}"
+                                    f"More than 1 Lookup reference the modified CSV file '{decoded_path}': {[match.file_path for match in matched]}"
                                 )
                             else:
                                 updatedLookup = matched[0]
@@ -195,7 +193,7 @@ def getChanges(self, target_branch: str) -> List[Detection]:
         # If a detection has at least one dependency on changed content,
         # then we must test it again
 
-        changed_macros_and_lookups_and_datasources: set[SecurityContentObject] = (
+        changed_macros_and_lookups_and_datasources: set[Macro | Lookup | DataSource] = (
             updated_macros.union(updated_lookups, updated_datasources)
         )
 

contentctl/contentctl.py

@@ -246,8 +246,6 @@ def main():
         print(e)
         sys.exit(1)
     except Exception as e:
-        print(CONTENTCTL_5_WARNING)
-
         if config is None:
             print(
                 "There was a serious issue where the config file could not be created.\n"
@@ -265,8 +263,9 @@ def main():
                 "Verbose error logging is DISABLED.\n"
                 "Please use the --verbose command line argument if you need more context for your error or file a bug report."
             )
-            print(e)
 
+        print(e)
+        print(CONTENTCTL_5_WARNING)
         sys.exit(1)