AMG: fix issue with dashboard json validation (Azure#8373)

* Check if "isFolder" exists before validation

* update pe test recording

* Switch to folder overwrite

* Change link in string and regenerate relevant test recordings

---------

Co-authored-by: Alan Zhang <[email protected]>

Author: 2 people

src/amg/HISTORY.rst

@@ -122,3 +122,8 @@ Release History
 2.5.3
 ++++++
 * `az grafana service-account token create`: set token default expiration time to 1 day as stated in the documentation
+
+2.5.4
+++++++
+* `az grafana dashboard import`: fix issue with JSON file validation
+* `az grafana folder update`: fix issue with overwrite setting

src/amg/azext_amg/aaz/latest/grafana/__cmd_group.py

@@ -17,7 +17,7 @@
 class __CMDGroup(AAZCommandGroup):
     """Commands to manage Azure Managed Grafana resources.
 
-    For optimized experience, not all data plane APIs, documented at https://grafana.com/docs/grafana/latest/http_api/, are exposed. On coverage gap, please reach out to [email protected]
+    For optimized experience, not all data plane APIs, documented at `https://grafana.com/docs/grafana/latest/http_api/`, are exposed. On coverage gap, please reach out to [email protected]
     """
     pass
 

src/amg/azext_amg/custom.py

@@ -386,7 +386,7 @@ def import_dashboard(cmd, grafana_name, definition, folder=None, resource_group_
     import copy
     data = _try_load_dashboard_definition(cmd, resource_group_name, grafana_name, definition,
                                           api_key_or_token=api_key_or_token)
-    if data["meta"]["isFolder"]:
+    if data.get("meta", {}).get("isFolder", False):
         raise ArgumentUsageError("The provided definition is a folder, not a dashboard")
 
     if "dashboard" in data:
@@ -555,10 +555,9 @@ def list_folders(cmd, grafana_name, resource_group_name=None, api_key_or_token=N
 
 def update_folder(cmd, grafana_name, folder, title, resource_group_name=None, api_key_or_token=None):
     f = show_folder(cmd, grafana_name, folder, resource_group_name, api_key_or_token=api_key_or_token)
-    version = f['version']
     data = {
         "title": title,
-        "version": int(version)
+        "overwrite": True
     }
     response = _send_request(cmd, resource_group_name, grafana_name, "put", "/api/folders/" + f["uid"], data,
                              api_key_or_token=api_key_or_token)

src/amg/azext_amg/tests/latest/recordings/test_amg_migrate_override.yaml

@@ -16,7 +16,7 @@
 
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
-VERSION = '2.5.3'
+VERSION = '2.5.4'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers