bt-cli 0.4.21__py3-none-any.whl → 0.4.22__py3-none-any.whl

bt_cli/epmw/commands/quick.py

@@ -10,6 +10,7 @@ from rich.console import Console
 from rich.table import Table
 
 from ...core.output import print_api_error, print_error, print_warning, print_success
+from ...core.prompts import prompt_from_list
 
 app = typer.Typer(no_args_is_help=True, help="Quick commands - common multi-step operations in one command")
 console = Console()
@@ -346,3 +347,180 @@ def group_status(
     except Exception as e:
         print_api_error(e, "quick status")
         raise typer.Exit(1)
+
+
+@app.command("move-computer")
+def move_computer(
+    computer: Optional[str] = typer.Option(None, "--computer", "-c", help="Computer name or ID (partial match for name)"),
+    group: Optional[str] = typer.Option(None, "--group", "-g", help="Target group name or ID"),
+    force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation"),
+    output: str = typer.Option("table", "--output", "-o", help="Output format: table or json"),
+) -> None:
+    """Move a computer to a different group.
+
+    Interactive workflow to change a computer's group membership.
+    Lists computers (optionally filtered), then lists available groups,
+    and moves the selected computer to the selected group.
+
+    Examples:
+        bt epmw quick move-computer                           # Interactive selection
+        bt epmw quick move-computer -c "CorpWS01"             # Filter by computer name
+        bt epmw quick move-computer -c "CorpWS01" -g "Servers"  # Specify both
+        bt epmw quick move-computer -c "CorpWS01" -g "Servers" -f  # Skip confirmation
+    """
+    from ..client import get_client
+
+    try:
+        client = get_client()
+
+        # Step 1: Get and filter computers
+        console.print("[dim]Fetching computers...[/dim]")
+        computers = client.list_computers()
+
+        if not computers:
+            print_error("No computers found")
+            raise typer.Exit(1)
+
+        # Filter by computer name/ID if provided
+        if computer:
+            computer_lower = computer.lower()
+            filtered = [
+                c for c in computers
+                if computer_lower in (c.get("host") or "").lower()
+                or computer_lower in (c.get("id") or "").lower()
+            ]
+            if not filtered:
+                print_error(f"No computers matching '{computer}'")
+                raise typer.Exit(1)
+            computers = filtered
+
+        # Show computers and select one
+        if len(computers) == 1:
+            selected_computer = computers[0]
+            console.print(f"[dim]Found computer: {selected_computer.get('host')}[/dim]")
+        else:
+            # Show list and prompt for selection
+            table = Table(title="Available Computers")
+            table.add_column("#", style="dim", justify="right")
+            table.add_column("Host", style="cyan")
+            table.add_column("Domain", style="yellow")
+            table.add_column("Current Group", style="green")
+            table.add_column("Status", style="magenta")
+
+            for idx, comp in enumerate(computers, 1):
+                table.add_row(
+                    str(idx),
+                    comp.get("host", ""),
+                    comp.get("domain", "") or "-",
+                    comp.get("groupName", "") or "-",
+                    comp.get("connectionStatus", ""),
+                )
+            console.print(table)
+
+            selection = typer.prompt("Select computer number", type=int)
+            if selection < 1 or selection > len(computers):
+                print_error(f"Invalid selection. Choose 1-{len(computers)}")
+                raise typer.Exit(1)
+            selected_computer = computers[selection - 1]
+
+        computer_id = selected_computer.get("id")
+        computer_host = selected_computer.get("host")
+        current_group = selected_computer.get("groupName") or "(No Group)"
+
+        # Step 2: Get and filter groups
+        console.print("[dim]Fetching groups...[/dim]")
+        groups = client.list_groups()
+
+        if not groups:
+            print_error("No groups found")
+            raise typer.Exit(1)
+
+        # Filter by group name/ID if provided
+        if group:
+            group_lower = group.lower()
+            filtered = [
+                g for g in groups
+                if group_lower in (g.get("name") or "").lower()
+                or group_lower in (g.get("id") or "").lower()
+            ]
+            if not filtered:
+                print_error(f"No groups matching '{group}'")
+                raise typer.Exit(1)
+            groups = filtered
+
+        # Show groups and select one
+        if len(groups) == 1:
+            selected_group = groups[0]
+            console.print(f"[dim]Target group: {selected_group.get('name')}[/dim]")
+        else:
+            # Show list and prompt for selection
+            table = Table(title="Available Groups")
+            table.add_column("#", style="dim", justify="right")
+            table.add_column("Name", style="cyan")
+            table.add_column("Computers", style="green", justify="right")
+            table.add_column("Policy", style="yellow")
+
+            for idx, grp in enumerate(groups, 1):
+                table.add_row(
+                    str(idx),
+                    grp.get("name", ""),
+                    str(grp.get("computerCount", 0)),
+                    grp.get("policyName", "") or "-",
+                )
+            console.print(table)
+
+            selection = typer.prompt("Select target group number", type=int)
+            if selection < 1 or selection > len(groups):
+                print_error(f"Invalid selection. Choose 1-{len(groups)}")
+                raise typer.Exit(1)
+            selected_group = groups[selection - 1]
+
+        group_id = selected_group.get("id")
+        group_name = selected_group.get("name")
+
+        # Check if already in target group
+        if current_group == group_name:
+            console.print(f"[yellow]Computer '{computer_host}' is already in group '{group_name}'[/yellow]")
+            raise typer.Exit(0)
+
+        # Step 3: Confirm and move
+        if not force:
+            console.print()
+            console.print(f"[bold]Move computer:[/bold] {computer_host}")
+            console.print(f"[bold]From group:[/bold] {current_group}")
+            console.print(f"[bold]To group:[/bold] {group_name}")
+            console.print()
+            confirm = typer.confirm("Proceed with move?")
+            if not confirm:
+                console.print("[yellow]Cancelled.[/yellow]")
+                raise typer.Exit(0)
+
+        # Perform the move
+        console.print("[dim]Moving computer to group...[/dim]")
+        client.assign_computers_to_group(group_id, [computer_id])
+
+        if output == "json":
+            result = {
+                "computer": {
+                    "id": computer_id,
+                    "host": computer_host,
+                },
+                "previousGroup": current_group,
+                "newGroup": group_name,
+                "success": True,
+            }
+            console.print_json(json.dumps(result, default=str))
+        else:
+            print_success(f"Moved '{computer_host}' from '{current_group}' to '{group_name}'")
+
+    except httpx.HTTPStatusError as e:
+        print_api_error(e, "quick move-computer")
+        raise typer.Exit(1)
+    except httpx.RequestError as e:
+        print_api_error(e, "quick move-computer")
+        raise typer.Exit(1)
+    except typer.Exit:
+        raise
+    except Exception as e:
+        print_api_error(e, "quick move-computer")
+        raise typer.Exit(1)

bt_cli/pra/commands/vault.py

@@ -137,13 +137,16 @@ def create_vault_account(
     name: str = typer.Option(..., "--name", "-n", help="Account name"),
     account_type: str = typer.Option(
         ..., "--type", "-t",
-        help="Account type: username_password, ssh, or ssh_ca"
+        help="Account type: username_password, ssh, ssh_ca, or token"
     ),
     username: Optional[str] = typer.Option(None, "--username", "-u", help="Username (for username_password)"),
     password: Optional[str] = typer.Option(None, "--password", "-p", help="Password (for username_password)"),
+    token: Optional[str] = typer.Option(None, "--token", help="Token value (for token type)"),
+    token_file: Optional[str] = typer.Option(None, "--token-file", help="Path to file containing token"),
     private_key: Optional[str] = typer.Option(None, "--private-key", help="SSH private key (for ssh type)"),
     private_key_file: Optional[str] = typer.Option(None, "--private-key-file", help="Path to SSH private key file"),
     description: Optional[str] = typer.Option(None, "--description", "-d", help="Account description"),
+    account_group_id: Optional[int] = typer.Option(None, "--group-id", "-g", help="Vault Account Group ID"),
     personal: bool = typer.Option(False, "--personal", help="Mark as personal account"),
     output: OutputFormat = typer.Option(OutputFormat.JSON, "--output", "-o"),
 ):
@@ -158,20 +161,29 @@ def create_vault_account(
 
         # Create SSH CA account (for certificate-based auth)
         bt pra vault accounts create -n "ssh-ca" -t ssh_ca --private-key-file /path/to/ca_key
+
+        # Create token account (API keys, bearer tokens, etc.)
+        bt pra vault accounts create -n "api-key" -t token --token "sk-abc123..."
+
+        # Create token account from file
+        bt pra vault accounts create -n "service-token" -t token --token-file /path/to/token.txt
     """
     from bt_cli.pra.client import get_client
     from pathlib import Path
 
-    # Validate account type
-    valid_types = ["username_password", "ssh", "ssh_ca"]
+    # Validate account type (token maps to opaque_token in API)
+    valid_types = ["username_password", "ssh", "ssh_ca", "token"]
     if account_type not in valid_types:
         print_error(f"Invalid account type '{account_type}'. Must be one of: {', '.join(valid_types)}")
         raise typer.Exit(1)
 
+    # Map 'token' to API type 'opaque_token'
+    api_type = "opaque_token" if account_type == "token" else account_type
+
     # Build account data
     data = {
         "name": name,
-        "type": account_type,
+        "type": api_type,
     }
 
     if username:
@@ -180,9 +192,21 @@ def create_vault_account(
         data["password"] = password
     if description:
         data["description"] = description
+    if account_group_id:
+        data["account_group_id"] = account_group_id
     if personal:
         data["personal"] = True
 
+    # Handle token (from file or direct)
+    if token_file:
+        token_path = Path(token_file).expanduser()
+        if not token_path.exists():
+            print_error(f"Token file not found: {token_file}")
+            raise typer.Exit(1)
+        data["token"] = token_path.read_text().strip()
+    elif token:
+        data["token"] = token
+
     # Handle private key (from file or direct)
     if private_key_file:
         key_path = Path(private_key_file).expanduser()
@@ -202,6 +226,10 @@ def create_vault_account(
         if not data.get("private_key"):
             print_error(f"Private key is required for {account_type} type (use --private-key or --private-key-file)")
             raise typer.Exit(1)
+    elif account_type == "token":
+        if not data.get("token"):
+            print_error("Token is required for token type (use --token or --token-file)")
+            raise typer.Exit(1)
 
     try:
         client = get_client()

{bt_cli-0.4.21.dist-info → bt_cli-0.4.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bt-cli
-Version: 0.4.21
+Version: 0.4.22
 Summary: BeyondTrust Platform CLI (unofficial) - Password Safe, Entitle, PRA, EPM
 Author-email: Dave Grendysz <dgrendysz@beyondtrust.com>
 License: MIT

{bt_cli-0.4.21.dist-info → bt_cli-0.4.22.dist-info}/RECORD

@@ -56,7 +56,7 @@ bt_cli/epmw/commands/computers.py,sha256=K0eBd8HOaVCe8hhHPlUuqCrZduhPuvwlkxdYt6Y
 bt_cli/epmw/commands/events.py,sha256=not-9_poxQWRBB4sqZSzJo6031A3IZTdg6uAl2Agk2g,7707
 bt_cli/epmw/commands/groups.py,sha256=PaMcjqfr2b3xS3W3V2A9CFTlMOAs38UmJbi5LKXbbg0,6759
 bt_cli/epmw/commands/policies.py,sha256=0jFQ-ZLzTAC6rPbMWL3DfWm0jdgvE2iwR_dHUHI-QG4,24600
-bt_cli/epmw/commands/quick.py,sha256=X2iTwnDgAvatW8wVY4nqQztLmIEoGmbn1YeCVwHyvzY,13876
+bt_cli/epmw/commands/quick.py,sha256=3jE1Q2tPFNhKZlLXA670Ay0BaZOxq32hhqxc4-5bnVA,20967
 bt_cli/epmw/commands/requests.py,sha256=qcx6MsPXVm2UkaBIkhpf3RZh6Lo-BBz2OPF4Tl3h4p8,8251
 bt_cli/epmw/commands/roles.py,sha256=WYAelLUwzJkBB7rlKoR4FqSxfdoDjV310KcNl6ixCCM,2396
 bt_cli/epmw/commands/tasks.py,sha256=5YFg5BsfEnN1L4KkPrIwbaUy4a2XJUgUpo1kQDji_EI,1033
@@ -76,7 +76,7 @@ bt_cli/pra/commands/policies.py,sha256=5ekjEGKaIEdjpuUYyuBUvNdJgH3GKQkajRep0_i8Q
 bt_cli/pra/commands/quick.py,sha256=W0JrS5XYMfl5Jl0PjroeAbFGWszPsu-NFH0_REy6Qkk,18892
 bt_cli/pra/commands/teams.py,sha256=tr_stOR6CkvcZ4jDFg6gUbPZ-d8dvnN_wEgdA_hTepc,2346
 bt_cli/pra/commands/users.py,sha256=Ui9ByM2CIaI8hN4N9zkTD3Rw2gIU0jlHVWKpZEnaR3c,2733
-bt_cli/pra/commands/vault.py,sha256=LfkmLZlDsig5ZfRU8UqOblgdtQme_HymKezThDNJpzc,20016
+bt_cli/pra/commands/vault.py,sha256=xH9HIer-X4lrTJblEvKB3z0QgvhGkqa_ANYgOjSHoNo,21391
 bt_cli/pra/models/__init__.py,sha256=5S6ogGJDZY1O8gCFbCCQ5vN61wocP5J-EO2s55ebV2Y,614
 bt_cli/pra/models/common.py,sha256=hnQOndbt38YiLuS2kZxbpK4QsX1ONyKtOgE6RcWFjVU,247
 bt_cli/pra/models/jump_client.py,sha256=M3-4U66rcPzrfjAUFzQ0xxgWTPuBg5DdLCwJrgP9O3k,684
@@ -115,7 +115,7 @@ bt_cli/pws/models/account.py,sha256=OSCMyULPOH1Yu2WOzK0ZQhSRrggGpb2JPHScwGLqUgI,
 bt_cli/pws/models/asset.py,sha256=Fl0AlR4_9Yyyu36FL1eKF29DNsxsB-r7FaOBRlfOg2Q,4081
 bt_cli/pws/models/common.py,sha256=D9Ah4ob5CIiFhTt_IR9nF2cBWRHS2z9OyBR2Sss5yzw,3487
 bt_cli/pws/models/system.py,sha256=D_J0x1A92H2n6BsaBEK9PSAAcs3BTifA5-M9SQqQFGA,5856
-bt_cli-0.4.21.dist-info/METADATA,sha256=0riXjVaI5llOe8bbYGWGF0bxg1YwznhX0DUadjOqLhs,11862
-bt_cli-0.4.21.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-bt_cli-0.4.21.dist-info/entry_points.txt,sha256=NCOEqTI-XKpJOux0JKKhbRElz0B7upayh_d99X5hoLs,38
-bt_cli-0.4.21.dist-info/RECORD,,
+bt_cli-0.4.22.dist-info/METADATA,sha256=vissSGp_CPrsPrqJ2WoTTTK-LsZNVRZq34hWCTlsXUk,11862
+bt_cli-0.4.22.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+bt_cli-0.4.22.dist-info/entry_points.txt,sha256=NCOEqTI-XKpJOux0JKKhbRElz0B7upayh_d99X5hoLs,38
+bt_cli-0.4.22.dist-info/RECORD,,