rename supplementary_gids to gids

Author: fregataa

src/ai/backend/client/cli/admin/user.py

@@ -246,8 +246,8 @@ def list(ctx: CLIContext, status, group, filter_, order, offset, limit) -> None:
 )
 @click.option(
     "--cgids",
-    "--container-supplementary-gids",
-    "container_supplementary_gids",
+    "--container-gids",
+    "container_gids",
     type=CommaSeparatedListType(int),
     default=None,
     help=(
@@ -279,7 +279,7 @@ def add(
     sudo_session_enabled: bool,
     container_uid: int | None,
     container_main_gid: int | None,
-    container_supplementary_gids: Iterable[int] | None,
+    container_gids: Iterable[int] | None,
     groups: Iterable[str],
 ):
     """
@@ -325,7 +325,7 @@ def add(
                 sudo_session_enabled=sudo_session_enabled,
                 container_uid=container_uid,
                 container_main_gid=container_main_gid,
-                container_supplementary_gids=container_supplementary_gids,
+                container_gids=container_gids,
                 fields=(
                     user_fields["domain_name"],
                     user_fields["email"],
@@ -477,8 +477,8 @@ def add(
 )
 @click.option(
     "--cgids",
-    "--container-supplementary-gids",
-    "container_supplementary_gids",
+    "--container-gids",
+    "container_gids",
     type=OptionalType(CommaSeparatedListType(int)),
     default=undefined,
     help=(
@@ -488,8 +488,8 @@ def add(
 )
 @click.option(
     "--unset-cgids",
-    "--unset-container-supplementary-gids",
-    "unset_container_supplementary_gids",
+    "--unset-container-gids",
+    "unset_container_gids",
     is_flag=True,
     default=False,
     help="Unset the user's container supplementary group IDs.",
@@ -512,8 +512,8 @@ def update(
     unset_container_uid: bool,
     container_main_gid: int | Undefined,
     unset_container_main_gid: bool,
-    container_supplementary_gids: Iterable[int] | Undefined,
-    unset_container_supplementary_gids: bool,
+    container_gids: Iterable[int] | Undefined,
+    unset_container_gids: bool,
 ):
     """
     Update an existing user.
@@ -536,9 +536,7 @@ def validate_input[T_Input](value: T_Input, null_flag: bool, field_name: str) ->
 
     cuid = validate_input(container_uid, unset_container_uid, "cuid")
     cgid = validate_input(container_main_gid, unset_container_main_gid, "cgid")
-    cgids = validate_input(
-        container_supplementary_gids, unset_container_supplementary_gids, "cgids"
-    )
+    cgids = validate_input(container_gids, unset_container_gids, "cgids")
 
     with Session() as session:
         try:
@@ -557,7 +555,7 @@ def validate_input[T_Input](value: T_Input, null_flag: bool, field_name: str) ->
                 main_access_key=main_access_key,
                 container_uid=cuid,
                 container_main_gid=cgid,
-                container_supplementary_gids=cgids,
+                container_gids=cgids,
             )
         except Exception as e:
             ctx.output.print_mutation_error(

src/ai/backend/client/func/user.py

@@ -267,7 +267,7 @@ async def create(
         sudo_session_enabled: bool = False,
         container_uid: int | Undefined = undefined,
         container_main_gid: int | Undefined = undefined,
-        container_supplementary_gids: Iterable[int] | Undefined = undefined,
+        container_gids: Iterable[int] | Undefined = undefined,
         fields: Iterable[FieldSpec | str] | None = None,
     ) -> dict:
         """
@@ -305,7 +305,7 @@ async def create(
         set_if_set(inputs, "group_ids", group_ids)
         set_if_set(inputs, "container_uid", container_uid)
         set_if_set(inputs, "container_main_gid", container_main_gid)
-        set_if_set(inputs, "container_supplementary_gids", container_supplementary_gids)
+        set_if_set(inputs, "container_gids", container_gids)
         variables = {
             "email": email,
             "input": inputs,
@@ -334,7 +334,7 @@ async def update(
         main_access_key: str | Undefined = undefined,
         container_uid: int | None | Undefined = undefined,
         container_main_gid: int | None | Undefined = undefined,
-        container_supplementary_gids: Iterable[int] | None | Undefined = undefined,
+        container_gids: Iterable[int] | None | Undefined = undefined,
         fields: Iterable[FieldSpec | str] | None = None,
     ) -> dict:
         """
@@ -364,7 +364,7 @@ async def update(
         set_if_set(inputs, "main_access_key", main_access_key)
         set_if_set(inputs, "container_uid", container_uid)
         set_if_set(inputs, "container_main_gid", container_main_gid)
-        set_if_set(inputs, "container_supplementary_gids", container_supplementary_gids)
+        set_if_set(inputs, "container_gids", container_gids)
         variables = {
             "email": email,
             "input": inputs,