render user and group identity flags in previews

Author: marcofortina

src/automax/plugins/manual_preview.py

@@ -85,6 +85,37 @@ def _db_query(params: Dict[str, Any]) -> str:
     return str(query).replace("'", "'\\''")
 
 
+def _groupadd_flags(params: Dict[str, Any]) -> str:
+    flags: list[str] = []
+    if bool(params.get("system", False)):
+        flags.append("--system")
+    if params.get("gid") is not None:
+        flags.extend(["--gid", _q(params["gid"])])
+    return " ".join(flags)
+
+
+def _useradd_flags(params: Dict[str, Any]) -> str:
+    flags: list[str] = []
+    if bool(params.get("system", False)):
+        flags.append("--system")
+    if params.get("uid") is not None:
+        flags.extend(["--uid", _q(params["uid"])])
+    if params.get("group"):
+        flags.extend(["--gid", _q(params["group"])])
+    groups = _list(params.get("groups"))
+    if groups:
+        flags.extend(["--groups", _q(",".join(groups))])
+    if params.get("shell"):
+        flags.extend(["--shell", _q(params["shell"])])
+    if params.get("home"):
+        flags.extend(["--home-dir", _q(params["home"])])
+    if "create_home" in params:
+        flags.append("--create-home" if bool(params.get("create_home")) else "--no-create-home")
+    if params.get("comment"):
+        flags.extend(["--comment", _q(params["comment"])])
+    return " ".join(flags)
+
+
 def fallback_manual_commands(plugin_name: str, params: Dict[str, Any], context: ExecutionContext) -> list[str]:
     """Return deterministic manual commands for legacy plugins that do not override them."""
     sudo = _sudo(params)
@@ -190,7 +221,9 @@ def fallback_manual_commands(plugin_name: str, params: Dict[str, Any], context:
 
     if plugin_name.startswith("user."):
         if plugin_name == "user.create":
-            return [f"id -u {_q(name)} >/dev/null 2>&1 || {sudo}useradd {_q(name)}"]
+            flags = _useradd_flags(params)
+            flag_text = f" {flags}" if flags else ""
+            return [f"id -u {_q(name)} >/dev/null 2>&1 || {sudo}useradd{flag_text} {_q(name)}"]
         if plugin_name == "user.remove":
             return [f"{sudo}userdel {'-r ' if params.get('remove_home') else ''}{_q(name)}"]
         if plugin_name == "user.exists":
@@ -206,7 +239,9 @@ def fallback_manual_commands(plugin_name: str, params: Dict[str, Any], context:
 
     if plugin_name.startswith("group."):
         if plugin_name == "group.create":
-            return [f"getent group {_q(name)} >/dev/null || {sudo}groupadd {_q(name)}"]
+            flags = _groupadd_flags(params)
+            flag_text = f" {flags}" if flags else ""
+            return [f"getent group {_q(name)} >/dev/null || {sudo}groupadd{flag_text} {_q(name)}"]
         if plugin_name == "group.remove":
             return [f"{sudo}groupdel {_q(name)}"]
         if plugin_name == "group.exists":

tests/test_next_engine.py

@@ -3409,6 +3409,43 @@ def _sysops_preview_context() -> ExecutionContext:
     )
 
 
+def test_user_group_manual_commands_render_identity_flags():
+    from automax.plugins.manual_preview import fallback_manual_commands
+
+    context = ExecutionContext(run_id="run", dry_run=True, job={}, task={}, step={}, substep={}, target=Target(name="node1", host="node1"), vars={}, outputs={}, secrets={})
+
+    group_command = fallback_manual_commands(
+        "group.create",
+        {"name": "oinstall", "gid": 54321, "system": True, "sudo": True},
+        context,
+    )[0]
+    assert group_command == "getent group oinstall >/dev/null || sudo -n groupadd --system --gid 54321 oinstall"
+
+    user_command = fallback_manual_commands(
+        "user.create",
+        {
+            "name": "grid",
+            "uid": 54331,
+            "group": "oinstall",
+            "groups": ["asmadmin", "asmdba"],
+            "shell": "/bin/bash",
+            "home": "/home/grid",
+            "create_home": True,
+            "comment": "Oracle Grid Infrastructure owner",
+            "sudo": True,
+        },
+        context,
+    )[0]
+    assert "useradd" in user_command
+    assert "--uid 54331" in user_command
+    assert "--gid oinstall" in user_command
+    assert "--groups asmadmin,asmdba" in user_command
+    assert "--shell /bin/bash" in user_command
+    assert "--home-dir /home/grid" in user_command
+    assert "--create-home" in user_command
+    assert "--comment 'Oracle Grid Infrastructure owner'" in user_command
+
+
 def test_lvm_plugins_render_manual_commands_and_previews():
     from automax.plugins.lvm import (
         LvmLvExtendPlugin,