Skip to content

Commit c6481e4

Browse files
author
Alan Zhang
committed
Support parent folder name in create cmd
1 parent dddd972 commit c6481e4

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/amg/HISTORY.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Release History
148148

149149
2.8.0
150150
++++++
151-
* `az grafana folder create`: support parent folder uid argument for nested folder creation
151+
* `az grafana folder create`: support parent folder argument for nested folder creation
152152
* `az grafana folder list`: support nested folders
153153
* `az grafana folder show`: support nested folders
154154
* `az grafana backup`: include corresponding nested folders when individual folders are specified

src/amg/azext_amg/_params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def load_arguments(self, _):
102102

103103
with self.argument_context("grafana folder") as c:
104104
c.argument("title", help="title of the folder")
105-
c.argument("parent_folder_uid", options_list=["--parent-folder-uid"], help="uid of the parent folder, if any")
105+
c.argument("parent_folder", options_list=["--parent-folder"], help="Name or uid of the parent folder, if any")
106106

107107
with self.argument_context("grafana user") as c:
108108
c.argument("user", help="user login name or email")

src/amg/azext_amg/custom.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,13 +538,14 @@ def test_notification_channel(cmd, grafana_name, notification_channel, resource_
538538
return json.loads(response.content)
539539

540540

541-
def create_folder(cmd, grafana_name, title, parent_folder_uid=None, resource_group_name=None, api_key_or_token=None,
541+
def create_folder(cmd, grafana_name, title, parent_folder=None, resource_group_name=None, api_key_or_token=None,
542542
subscription=None):
543543
payload = {
544544
"title": title,
545545
}
546-
if parent_folder_uid:
547-
payload["parentUid"] = parent_folder_uid
546+
if parent_folder:
547+
data = _find_folder(cmd, resource_group_name, grafana_name, parent_folder, api_key_or_token=api_key_or_token)
548+
payload["parentUid"] = data["uid"]
548549

549550
response = _send_request(cmd, resource_group_name, grafana_name, "post", "/api/folders", payload,
550551
api_key_or_token=api_key_or_token, subscription=subscription)

0 commit comments

Comments
 (0)