Format environment variables

Author: furtib

src/codechecker.bzl

@@ -100,17 +100,16 @@ def _codechecker_impl(ctx):
 
     # Use environment variables instead of expand_template
     environment_variables = {
-        "RULES_CODECHECKER_Mode": "Run",
-        "RULES_CODECHECKER_Verbosity": "DEBUG",
-        "RULES_CODECHECKER_PythonPath": python_path(ctx),  # "/usr/bin/env python3",
-        "RULES_CODECHECKER_codechecker_bin": CODECHECKER_BIN_PATH,
-        "RULES_CODECHECKER_compile_commands": ctx.outputs.codechecker_commands.path,
-        "RULES_CODECHECKER_codechecker_skipfile": ctx.outputs.codechecker_skipfile.path,
-        "RULES_CODECHECKER_codechecker_config": config_file.path,
-        "RULES_CODECHECKER_codechecker_analyze": " ".join(ctx.attr.analyze),
-        "RULES_CODECHECKER_codechecker_files": codechecker_files.path,
-        "RULES_CODECHECKER_codechecker_log": ctx.outputs.codechecker_log.path,
-        "RULES_CODECHECKER_codechecker_env": codechecker_env,
+        "RULES_CODECHECKER_MODE": "Run",
+        "RULES_CODECHECKER_VERBOSITY": "DEBUG",
+        "RULES_CODECHECKER_CODECHECKER_BIN": CODECHECKER_BIN_PATH,
+        "RULES_CODECHECKER_COMPILE_COMMANDS": ctx.outputs.codechecker_commands.path,
+        "RULES_CODECHECKER_CODECHECKER_SKIPFILE": ctx.outputs.codechecker_skipfile.path,
+        "RULES_CODECHECKER_CODECHECKER_CONFIG": config_file.path,
+        "RULES_CODECHECKER_CODECHECKER_ANALYZE": " ".join(ctx.attr.analyze),
+        "RULES_CODECHECKER_CODECHECKER_FILES": codechecker_files.path,
+        "RULES_CODECHECKER_CODECHECKER_LOG": ctx.outputs.codechecker_log.path,
+        "RULES_CODECHECKER_CODECHECKER_ENV": codechecker_env,
     }
     codechecker_script = ctx.actions.declare_file(ctx.label.name + "/codechecker_script")
     ctx.actions.symlink(
@@ -230,12 +229,12 @@ def _codechecker_test_impl(ctx):
 
     # Use environment variables instead of expand_template
     environment_variables = {
-        "RULES_CODECHECKER_Mode": "Test",
-        "RULES_CODECHECKER_Verbosity": "INFO",
-        "RULES_CODECHECKER_PythonPath": python_path(ctx),  # "/usr/bin/env python3",
-        "RULES_CODECHECKER_codechecker_bin": CODECHECKER_BIN_PATH,
-        "RULES_CODECHECKER_codechecker_files": codechecker_files.short_path,
-        "RULES_CODECHECKER_Severities": " ".join(ctx.attr.severities),
+        "RULES_CODECHECKER_MODE": "Test",
+        "RULES_CODECHECKER_VERBOSITY": "INFO",
+        "RULES_CODECHECKER_PYTHONPATH": python_path(ctx),  # "/usr/bin/env python3",
+        "RULES_CODECHECKER_CODECHECKER_BIN": CODECHECKER_BIN_PATH,
+        "RULES_CODECHECKER_CODECHECKER_FILES": codechecker_files.short_path,
+        "RULES_CODECHECKER_SEVERITIES": " ".join(ctx.attr.severities),
     }
 
     # Create test script

src/codechecker_script.py

@@ -26,34 +26,34 @@
 import sys
 
 
-EXECUTION_MODE = os.environ.get("RULES_CODECHECKER_Mode", "{Mode}")
-VERBOSITY = os.environ.get("RULES_CODECHECKER_Verbosity", "{Verbosity}")
+EXECUTION_MODE = os.environ.get("RULES_CODECHECKER_MODE", "{Mode}")
+VERBOSITY = os.environ.get("RULES_CODECHECKER_VERBOSITY", "{Verbosity}")
 CODECHECKER_PATH = os.environ.get(
-    "RULES_CODECHECKER_codechecker_bin", "{codechecker_bin}"
+    "RULES_CODECHECKER_CODECHECKER_BIN", "{codechecker_bin}"
 )
 CODECHECKER_SKIPFILE = os.environ.get(
-    "RULES_CODECHECKER_codechecker_skipfile", "{codechecker_skipfile}"
+    "RULES_CODECHECKER_CODECHECKER_SKIPFILE", "{codechecker_skipfile}"
 )
 CODECHECKER_CONFIG = os.environ.get(
-    "RULES_CODECHECKER_codechecker_config", "{codechecker_config}"
+    "RULES_CODECHECKER_CODECHECKER_CONFIG", "{codechecker_config}"
 )
 CODECHECKER_ANALYZE = os.environ.get(
-    "RULES_CODECHECKER_codechecker_analyze", "{codechecker_analyze}"
+    "RULES_CODECHECKER_CODECHECKER_ANALYZE", "{codechecker_analyze}"
 )
 CODECHECKER_FILES = os.environ.get(
-    "RULES_CODECHECKER_codechecker_files", "{codechecker_files}"
+    "RULES_CODECHECKER_CODECHECKER_FILES", "{codechecker_files}"
 )
 CODECHECKER_LOG = os.environ.get(
-    "RULES_CODECHECKER_codechecker_log", "{codechecker_log}"
+    "RULES_CODECHECKER_CODECHECKER_LOG", "{codechecker_log}"
 )
 CODECHECKER_SEVERITIES = os.environ.get(
-    "RULES_CODECHECKER_Severities", "{Severities}"
+    "RULES_CODECHECKER_SEVERITIES", "{Severities}"
 )
 CODECHECKER_ENV = os.environ.get(
-    "RULES_CODECHECKER_codechecker_env", "{codechecker_env}"
+    "RULES_CODECHECKER_CODECHECKER_ENV", "{codechecker_env}"
 )
 COMPILE_COMMANDS = os.environ.get(
-    "RULES_CODECHECKER_compile_commands", "{compile_commands}"
+    "RULES_CODECHECKER_COMPILE_COMMANDS", "{compile_commands}"
 )
 
 START_PATH = r"\/(?:(?!\.\s+)\S)+"