Bulk generator: Specify 'language' in the config file.

Author: MathiasVP

cpp/misc/bulk_generation_targets.json

@@ -1,5 +1,6 @@
 {
   "strategy": "dca",
+  "language": "cpp",
   "with_summaries": true,
   "targets": [
       { "name": "openssl" },

misc/scripts/models-as-data/bulk_generate_mad.py

@@ -185,7 +185,7 @@ def build_database(
     return database_dir
 
 
-def generate_models(language: str, config, project: Project, database_dir: str) -> None:
+def generate_models(config, project: Project, database_dir: str) -> None:
     """
     Generate models for a project.
 
@@ -195,9 +195,10 @@ def generate_models(language: str, config, project: Project, database_dir: str)
         database_dir: Path to the CodeQL database.
     """
     name = project["name"]
+    language = config["language"]
 
     generator = mad.Generator(language)
-     # Note: The argument parser converts with-sinks to with_sinks, etc.
+    # Note: The argument parser converts with-sinks to with_sinks, etc.
     generator.generateSinks = config.get("with_sinks", False)
     generator.generateSources = config.get("with_sources", False)
     generator.generateSummaries = config.get("with_summaries", False)
@@ -390,7 +391,10 @@ def main(config, args) -> None:
     """
 
     projects = config["targets"]
-    language = args.lang
+    if not "language" in config:
+        print("ERROR: 'language' key is missing in the configuration file.")
+        sys.exit(1)
+    language = config["language"]
 
     # Create build directory if it doesn't exist
     if not os.path.exists(build_dir):
@@ -452,7 +456,7 @@ def main(config, args) -> None:
 
     for project, database_dir in database_results:
         if database_dir is not None:
-            generate_models(language, config, project, database_dir)
+            generate_models(config, project, database_dir)
 
 
 if __name__ == "__main__":
@@ -472,9 +476,6 @@ def main(config, args) -> None:
         help="PAT token to grab DCA databases (the same as the one you use for DCA)",
         required=False,
     )
-    parser.add_argument(
-        "--lang", type=str, help="The language to generate models for", required=True
-    )
     args = parser.parse_args()
 
     # Load config file

rust/misc/bulk_generation_targets.json

@@ -1,5 +1,6 @@
 {
     "strategy": "repo",
+    "language": "rust",
     "with-sources": true,
     "with-sinks": true,
     "with-summaries": true,