Skip to content

Commit 0bfdcf5

Browse files
committed
Implements code review suggestions
1 parent 6c10555 commit 0bfdcf5

4 files changed

Lines changed: 15 additions & 8 deletions

File tree

src/fabric_cli/client/fab_api_utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ def delete_resource(
2121
) -> bool:
2222
if not bypass_confirmation:
2323
if hasattr(args, 'purge') and args.purge:
24-
confirm_message = "Your item will be deleted forever. Are you sure you want to proceed?"
24+
resource_name = getattr(args, 'name', 'resource')
25+
confirm_message = f"'{resource_name}' will be deleted forever. Are you sure you want to proceed?"
2526
else:
2627
confirm_message = "Are you sure?"
2728

src/fabric_cli/commands/fs/rm/fab_fs_rm_item.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ def exec(item: Item, args: Namespace, force_delete: bool) -> None:
1414
args.name = item.name
1515
args.item_type = item.type.value
1616

17-
if hasattr(args, 'purge') and args.purge:
18-
args.request_params = {"hardDelete": "true"}
17+
request_params = getattr(args, "request_params", {})
18+
if getattr(args, "purge", False):
19+
merged_params = dict(request_params)
20+
merged_params["hardDelete"] = "true"
21+
args.request_params = merged_params
1922
else:
20-
args.request_params = {}
23+
args.request_params = request_params
2124

2225
if item_api.delete_item(args, force_delete):
2326
# Remove from mem_store

src/fabric_cli/commands/fs/rm/fab_fs_rm_workspace.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,13 @@ def single(workspace: Workspace, args: Namespace, force_delete: bool) -> None:
118118
args.name = item.name
119119
args.item_type = str(item.item_type)
120120

121-
if hasattr(args, 'purge') and args.purge:
122-
args.request_params = {"hardDelete": "true"}
121+
request_params = getattr(args, "request_params", {})
122+
if getattr(args, "purge", False):
123+
merged_params = dict(request_params)
124+
merged_params["hardDelete"] = "true"
125+
args.request_params = merged_params
123126
else:
124-
args.request_params = {}
127+
args.request_params = request_params
125128

126129
# Reset args for subsequent calls
127130
args.uri = None

src/fabric_cli/parsers/fab_fs_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def register_rm_parser(subparsers: _SubParsersAction) -> None:
127127
"# remove a table",
128128
"$ rm lh1.Lakehouse/Tables/fabtbl",
129129
"# permanently remove an item (purge)",
130-
"$ rm nb1.Notebook --purge --force",
130+
"$ rm ws1.Workspace/nb1.Notebook --purge --force",
131131
]
132132

133133
rm_parser = subparsers.add_parser(

0 commit comments

Comments
 (0)