Added support for per-workspace environment variables.

Author: destogl

rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py

@@ -133,6 +133,7 @@ class CreateVerbArgs:
     env_file: str = ""
     proxy_server: str = ""
     proxy_ca_cert: str = ""
+    env_vars: dict = field(default_factory=dict)
 
     @property
     def ssh_abs_path_in_docker(self) -> str:
@@ -583,6 +584,12 @@ def add_arguments(self, parser: argparse.ArgumentParser, cli_name: str):
             help="Path to company CA certificate file for proxy (will be copied to container)",
             default=None,
         )
+        parser.add_argument(
+            "--env-vars",
+            nargs="*",
+            help="Additional environment variables to export in the workspace (format: KEY=VALUE)",
+            default=[],
+        )
 
     def generate_intermediate_dockerfile_content(self, create_args: CreateVerbArgs) -> str:
         if create_args.apt_packages:
@@ -962,6 +969,7 @@ def setup_rtw_in_intermediate_image(
                 distro=create_args.ros_distro,
                 ws_folder=create_args.ws_abs_path_in_docker,
                 base_ws=create_args.upstream_ws_name if create_args.has_upstream_ws else "",
+                env_vars=create_args.env_vars,
             ),
         )
 
@@ -1156,6 +1164,20 @@ def main(self, *, args):
         filtered_args = get_filtered_args(args, list(fields(CreateVerbArgs)))
         filtered_args["ws_abs_path"] = os.path.normpath(os.path.abspath(args.ws_folder))
         filtered_args["ws_name"] = ws_name
+
+        # Process env_vars
+        env_vars_dict = {}
+        if args.env_vars:
+            for env_var in args.env_vars:
+                if "=" not in env_var:
+                    logger.warning(
+                        f"Skipping invalid environment variable format: '{env_var}'. Expected format KEY=VALUE"
+                    )
+                    continue
+                key, value = env_var.split("=", 1)
+                env_vars_dict[key] = value
+        filtered_args["env_vars"] = env_vars_dict
+
         create_args = CreateVerbArgs(**filtered_args)
         logger.info("### CREATE ARGS ###")
         rich.print(create_args)
@@ -1292,6 +1314,7 @@ def main(self, *, args):
             base_ws=create_args.upstream_ws_name if create_args.has_upstream_ws else "",
             docker_container_name=create_args.container_name if create_args.docker else "",
             standalone=create_args.standalone,
+            env_vars=create_args.env_vars,
         )
         if not update_workspaces_config(WORKSPACES_PATH, local_main_ws):
             raise RuntimeError("Failed to update workspaces config with main workspace.")

rtwcli/rtwcli/rtwcli/workspace_utils.py

@@ -44,6 +44,7 @@ class Workspace:
     docker_container_name: Optional[str] = None
     base_ws: Optional[str] = None
     standalone: bool = False
+    env_vars: Dict[str, str] = dataclasses.field(default_factory=dict)
 
     def __post_init__(self):
         if self.ws_folder == "":
@@ -209,10 +210,19 @@ def create_bash_script_content_for_using_ws(
     bash_script_content = "#!/bin/bash\n"
 
     ws_data = workspace.to_dict()
+    # Extract env_vars to handle separately
+    env_vars = ws_data.pop("env_vars", {})
+
     for ws_var, ws_var_value in ws_data.items():
         env_var, env_var_value = workspace_var_to_env_var(ws_var, ws_var_value)
         bash_script_content += f"export {env_var}='{env_var_value}'\n"
 
+    # Export custom environment variables without prefix
+    if env_vars:
+        for key, value in env_vars.items():
+            if value is not None:
+                bash_script_content += f"export {key}='{value}'\n"
+
     bash_script_content += (
         f"source {use_workspace_script_path} {workspace.distro} {workspace.ws_folder}\n"
     )