1313from fabric_cli .core .hiearchy .fab_hiearchy import Item , Tenant , Workspace
1414from fabric_cli .utils import fab_mem_store as utils_mem_store
1515from fabric_cli .utils import fab_ui as utils_ui
16- from fabric_cli .utils import fab_util as utils
16+ from fabric_cli .utils import fab_cmd_rm_utils as rm_utils
1717from fabric_cli .utils import fab_item_util as item_utils
1818
1919
2020def bulk (tenant : Tenant , args : Namespace , force_delete : bool ) -> None :
2121 workspaces : list [Workspace ] = utils_mem_store .get_workspaces (tenant )
22- sorted_workspaces : list [Workspace ] = sorted (workspaces , key = lambda ws : ws .name )
22+ sorted_workspaces : list [Workspace ] = sorted (
23+ workspaces , key = lambda ws : ws .name )
2324
2425 names = [workspace .name for workspace in sorted_workspaces ]
25- selected_workspaces = utils_ui .prompt_select_items ("Select workspaces:" , names )
26+ selected_workspaces = utils_ui .prompt_select_items (
27+ "Select workspaces:" , names )
2628 if selected_workspaces :
2729 for workspace_str in selected_workspaces :
2830 utils_ui .print_grey (workspace_str )
@@ -51,7 +53,8 @@ def bulk(tenant: Tenant, args: Namespace, force_delete: bool) -> None:
5153 utils_mem_store .delete_workspace_from_cache (workspace )
5254
5355 utils_ui .print ("" )
54- utils_ui .print_output_format (args , message = f"{ deleted_workspaces } workspaces deleted successfully" )
56+ utils_ui .print_output_format (
57+ args , message = f"{ deleted_workspaces } workspaces deleted successfully" )
5558
5659
5760def single (workspace : Workspace , args : Namespace , force_delete : bool ) -> None :
@@ -77,7 +80,8 @@ def single(workspace: Workspace, args: Namespace, force_delete: bool) -> None:
7780 pass
7881
7982 if force_delete :
80- utils_ui .print_grey (f"This will delete { len (ws_items )} underlying items" )
83+ utils_ui .print_grey (
84+ f"This will delete { len (ws_items )} underlying items" )
8185
8286 if workspace_api .delete_workspace (args , force_delete ):
8387 # Remove from mem_store
@@ -94,7 +98,8 @@ def single(workspace: Workspace, args: Namespace, force_delete: bool) -> None:
9498 sorted_items = item_utils .sort_ws_elems_by_config (supported_items )
9599
96100 names = [item .name for item in sorted_items ]
97- selected_items = utils_ui .prompt_select_items ("Select items:" , names )
101+ selected_items = utils_ui .prompt_select_items (
102+ "Select items:" , names )
98103 if selected_items :
99104 for item_str in selected_items :
100105 utils_ui .print_grey (item_str )
@@ -113,18 +118,22 @@ def single(workspace: Workspace, args: Namespace, force_delete: bool) -> None:
113118 args .name = item .name
114119 args .item_type = str (item .item_type )
115120
121+ rm_utils .setup_delete_request_params (args )
122+
116123 # Reset args for subsequent calls
117124 args .uri = None
118125 args .method = None
119126
120127 if item_api .delete_item (
121128 args , bypass_confirmation = True , verbose = False
122129 ):
123- utils_ui .print_output_format (args , message = f"'{ args .name } ' deleted" )
130+ utils_ui .print_output_format (
131+ args , message = f"'{ args .name } ' deleted" )
124132 deleted_items = deleted_items + 1
125133
126134 # Remove from mem_store
127135 utils_mem_store .delete_item_from_cache (item )
128136
129137 utils_ui .print ("" )
130- utils_ui .print_output_format (args , message = f"{ deleted_items } items deleted successfully" )
138+ utils_ui .print_output_format (
139+ args , message = f"{ deleted_items } items deleted successfully" )
0 commit comments