stackgen-sdk 0.4.0rc45__tar.gz → 0.5.0rc2__tar.gz

{stackgen_sdk-0.4.0rc45 → stackgen_sdk-0.5.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: stackgen-sdk
-Version: 0.4.0rc45
+Version: 0.5.0rc2
 Summary: StackGen SDK — Aiden, SRE, and Vault from one client
 Project-URL: Homepage, https://appcd-dev.github.io/stackgen-sdk/
 Project-URL: Documentation, https://appcd-dev.github.io/stackgen-sdk/

{stackgen_sdk-0.4.0rc45 → stackgen_sdk-0.5.0rc2}/src/stackgen/__init__.py

@@ -31,11 +31,15 @@ from stackgen.aiden.workflow_builder import (
     create_workflow,
 )
 from stackgen.aiden.workflow_publish import PublishWorkflowResult
+from stackgen.orgs.namespace import MeOrg, MeResponse, OrgUserAssignment, WORKSPACE_ADMIN_ROLE_ID
 
 __all__ = [
     "AgentDefinition",
     "HttpError",
+    "MeOrg",
+    "MeResponse",
     "NotAllowlistedError",
+    "OrgUserAssignment",
     "PolicyConflictRule",
     "PublishWorkflowResult",
     "StackgenClient",
@@ -43,6 +47,7 @@ __all__ = [
     "StackgenError",
     "StageDefinition",
     "TimeoutError",
+    "WORKSPACE_ADMIN_ROLE_ID",
     "WorkflowBuilder",
     "WorkflowDefinition",
     "configure_logging",

{stackgen_sdk-0.4.0rc45 → stackgen_sdk-0.5.0rc2}/src/stackgen/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.4.0rc45'
-__version_tuple__ = version_tuple = (0, 4, 0, 'rc45')
+__version__ = version = '0.5.0rc2'
+__version_tuple__ = version_tuple = (0, 5, 0, 'rc2')
 
 __commit_id__ = commit_id = None

stackgen_sdk-0.5.0rc2/src/stackgen/orgs/__init__.py

@@ -0,0 +1,19 @@
+"""Organization (project) management on the mothership."""
+
+from stackgen.orgs.namespace import (
+    WORKSPACE_ADMIN_ROLE_ID,
+    AssignUsersByRole,
+    MeOrg,
+    MeResponse,
+    OrgUserAssignment,
+    OrgsNamespace,
+)
+
+__all__ = [
+    "WORKSPACE_ADMIN_ROLE_ID",
+    "AssignUsersByRole",
+    "MeOrg",
+    "MeResponse",
+    "OrgUserAssignment",
+    "OrgsNamespace",
+]

{stackgen_sdk-0.4.0rc45 → stackgen_sdk-0.5.0rc2}/src/stackgen/orgs/namespace.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 
 import json
 import urllib.parse
-from typing import Any
+from typing import Any, TypedDict, Union
 
 from stackgen import _http
 from stackgen.config import StackgenConfig
@@ -21,6 +21,75 @@ _log = get_logger("orgs")
 
 # Reserved AppCD system role (see rbacutil.RoleNameWorkspaceAdmin).
 _WORKSPACE_ADMIN_ROLE_ID = "00000000-0000-0000-0000-000000000006"
+WORKSPACE_ADMIN_ROLE_ID = _WORKSPACE_ADMIN_ROLE_ID
+
+
+class MeOrg(TypedDict, total=False):
+    id: str
+    name: str
+    roleUuid: str
+    scopes: list[str]
+    tenantId: str
+
+
+class MeResponse(TypedDict, total=False):
+    userId: str
+    name: str
+    scopes: list[str]
+    email: str
+    avatar: str
+    company: str
+    orgs: list[MeOrg]
+
+
+class OrgUserAssignment(TypedDict):
+    userId: str
+    roleId: str
+
+
+class AssignUsersByRole(TypedDict, total=False):
+    roleId: str
+    userId: list[str]
+    userIds: list[str]
+
+
+def _assign_users_body(
+    users: Union[AssignUsersByRole, list[OrgUserAssignment], dict[str, Any]],
+) -> dict[str, Any]:
+    if isinstance(users, list):
+        if not users:
+            raise StackgenError("assign_users: at least one user assignment is required")
+        assignments: list[dict[str, str]] = []
+        for row in users:
+            if not isinstance(row, dict):
+                raise StackgenError(
+                    f"assign_users: each assignment needs userId and roleId: {row!r}"
+                )
+            user_id = str(row.get("userId") or "").strip()
+            role_id = str(row.get("roleId") or "").strip()
+            if not user_id or not role_id:
+                raise StackgenError(
+                    f"assign_users: each assignment needs userId and roleId: {row!r}"
+                )
+            assignments.append({"userId": user_id, "roleId": role_id})
+        return {"userAssignments": assignments}
+
+    if not isinstance(users, dict):
+        raise StackgenError("assign_users: users must be a role batch or assignment list")
+    role_id = str(users.get("roleId") or "").strip()
+    raw_ids = users.get("userIds")
+    if raw_ids is None:
+        raw_ids = users.get("userId") or []
+    if not isinstance(raw_ids, list):
+        raise StackgenError("assign_users: userId/userIds must be a list")
+    ids = [str(item).strip() for item in raw_ids if str(item or "").strip()]
+    if not role_id:
+        raise StackgenError("assign_users: roleId is required")
+    if not ids:
+        raise StackgenError("assign_users: at least one userId is required")
+    return {
+        "userAssignments": [{"userId": user_id, "roleId": role_id} for user_id in ids]
+    }
 
 # A create with no cloud provider fails IaC generation. Default the omitted
 # provider to aws so callers can send {"name": ..., "components": []}.
@@ -55,7 +124,7 @@ class OrgsNamespace:
     def _url(self, path: str = "") -> str:
         return f"{self._config.appcd_url()}/v1/orgs{path}"
 
-    def me(self) -> dict[str, Any]:
+    def me(self) -> MeResponse:
         """GET /appcd/api/v1/auth/me for the token's calling user."""
         data = _http.request(
             f"{self._config.appcd_url()}/v1/auth/me",
@@ -63,7 +132,65 @@ class OrgsNamespace:
         )
         if not isinstance(data, dict):
             raise StackgenError(f"unexpected getMe response: {data!r}")
-        return data
+        return data  # type: ignore[return-value]
+
+    def assign_users(
+        self,
+        org_id: str,
+        users: Union[AssignUsersByRole, list[OrgUserAssignment], dict[str, Any]],
+    ) -> None:
+        """POST /v1/orgs/{org_id}/users — add members with roles.
+
+        Pass either one role for many users (``{"roleId", "userId"}`` /
+        ``{"roleId", "userIds"}``) or a list of ``{"userId", "roleId"}``
+        assignments. Sent as the recommended ``userAssignments`` body.
+        """
+        if not org_id or not org_id.strip():
+            raise StackgenError("assign_users: org_id is required")
+        body = _assign_users_body(users)
+        _http.request(
+            self._url(f"/{org_id.strip()}/users"),
+            self._config.api_token,
+            method="POST",
+            body=json.dumps(body).encode("utf-8"),
+            content_type="application/json",
+            expect_json=False,
+        )
+
+    def remove_user(self, org_id: str, user_id: str | list[str]) -> None:
+        """DELETE /v1/orgs/{org_id}/users — remove one or more members.
+
+        Wire body uses AppCD's ``user_id`` array. Non-2xx responses raise
+        ``HttpError`` with ``status_code`` (for negative-status checks).
+        """
+        if not org_id or not org_id.strip():
+            raise StackgenError("remove_user: org_id is required")
+        raw = user_id if isinstance(user_id, list) else [user_id]
+        ids = [str(item).strip() for item in raw if str(item or "").strip()]
+        if not ids:
+            raise StackgenError("remove_user: at least one user_id is required")
+        _http.request(
+            self._url(f"/{org_id.strip()}/users"),
+            self._config.api_token,
+            method="DELETE",
+            body=json.dumps({"user_id": ids}).encode("utf-8"),
+            content_type="application/json",
+            expect_json=False,
+        )
+
+    def list_roles(self) -> dict[str, list[dict[str, Any]]]:
+        """GET /v1/roles — list system and custom roles."""
+        data = _http.request(
+            f"{self._config.appcd_url()}/v1/roles",
+            self._config.api_token,
+        )
+        if isinstance(data, dict):
+            roles = data.get("roles")
+            if isinstance(roles, list):
+                return {"roles": [item for item in roles if isinstance(item, dict)]}
+        if isinstance(data, list):
+            return {"roles": [item for item in data if isinstance(item, dict)]}
+        raise StackgenError(f"unexpected list_roles response: {data!r}")
 
     def create(
         self,

stackgen_sdk-0.4.0rc45/src/stackgen/orgs/__init__.py

@@ -1,5 +0,0 @@
-"""Organization (project) management on the mothership."""
-
-from stackgen.orgs.namespace import OrgsNamespace
-
-__all__ = ["OrgsNamespace"]