Merge pull request diffblue#604 from diffblue/jd/feature/pipeline_stop_on_exception

[SEC-677] Turning DI off by default and making errors fail pipeline

Author: JohnDumbell

driver/mkbench.py

@@ -82,9 +82,12 @@ def run_di_model_generation(configuration, cmdline):
     will drive generation.
     """
 
+    if not cmdline.di_generation:
+        print("DI generation disabled. Skipping.", file=sys.stderr)
+        return None
+
     # If we don't have anything vaguely looking like a spring library being used, just skip generation.
-    if not next((lib for lib in cmdline.libraries if re.search("spring-[a-zA-Z]*-[0-9]*\.[0-9]*", lib)), None) \
-            or cmdline.skip_di_generation:
+    if not any((re.search("spring-[a-zA-Z]*-[0-9]*\.[0-9]*", lib) for lib in cmdline.libraries)):
         print("No Spring Framework libraries passed in, cannot generate any DI-related code.", file=sys.stderr)
         return None
 
@@ -114,9 +117,7 @@ def run_di_model_generation(configuration, cmdline):
     if additional_spring_files:
         di_generation_commandline.extend(["--input-file"] + additional_spring_files)
 
-    di_generation_result = utility.call(di_generation_commandline, "DI model generator", cmdline.verbosity, stderr=subprocess.STDOUT)
-    if di_generation_result != 0:
-        return None
+    utility.check_call(di_generation_commandline, "DI model generator", cmdline.verbosity, stderr=subprocess.STDOUT)
 
     # Quick check to see if we have any output files.
     if not next((file for root, dirs, files in os.walk(generated_source_file_path) for file in files), None):
@@ -159,10 +160,7 @@ def run_di_model_generation(configuration, cmdline):
     with open(ant_build_path, 'x') as ant_xml_file:
         ant_xml_file.write(ant_build_statement)
 
-    javac_result = utility.call(["ant", "-file", ant_build_path], "Java Compiler for DI model overlays", cmdline.verbosity, stderr=subprocess.STDOUT)
-    if javac_result != 0:
-        print("Java compilation of DI-generated source failed.")
-        return None
+    utility.check_call(["ant", "-file", ant_build_path], "Java Compiler for DI model overlays", cmdline.verbosity, stderr=subprocess.STDOUT)
 
     return generated_jar_path
 

driver/run.py

@@ -197,8 +197,8 @@ def create_parser():
     parser.add_argument("--run-scan", type=str, const='', nargs="?",
                         help="Flag for whether a security scan should be run. If left empty, will run on all folders in results-dir."
                              "If passed a path to a command_line.json file, it will only run on that folder.")
-    parser.add_argument("--skip-di-generation", action='store_true',
-                        help="Turns off DI overlay generation. This overrides the automatic detection of DI usage.")
+    parser.add_argument("--di-generation", action="store_true",
+                        help="Turns on DI overlay generation. This overrides the automatic detection of DI usage.")
 
     return parser