fix style errors

src/ags/azext_ags/__init__.py

@@ -16,6 +16,7 @@ def __init__(self, cli_ctx=None):
         ags_custom = CliCommandType(
             operations_tmpl='azext_ags.custom#{}',
             client_factory=cf_ags)
+        # pylint: disable=super-with-arguments
         super(AgsCommandsLoader, self).__init__(cli_ctx=cli_ctx,
                                                 custom_command_type=ags_custom)
 

src/ags/azext_ags/_client_factory.py

@@ -4,9 +4,9 @@
 # --------------------------------------------------------------------------------------------
 
 def cf_ags(cli_ctx, *_):
-
-    from azure.cli.core.commands.client_factory import get_mgmt_service_client
+    # pylint: disable=unused-argument
+    # from azure.cli.core.commands.client_factory import get_mgmt_service_client
     # TODO: Replace CONTOSO with the appropriate label and uncomment
     # from azure.mgmt.CONTOSO import CONTOSOManagementClient
     # return get_mgmt_service_client(cli_ctx, CONTOSOManagementClient)
-    return None
+    pass

src/ags/azext_ags/_help.py

@@ -52,7 +52,7 @@
     type: command
     short-summary: Create a data source.
     examples:
-        - name: create a data source using Managed Service Identity 
+        - name: create a data source using Managed Service Identity
           text: |
             az grafana data-source create --definition '{
               "access": "proxy",
@@ -68,7 +68,7 @@
               "type": "geneva-datasource",
               "withCredentials": false
             }'
-        - name: create a data source using Service Principal 
+        - name: create a data source using Service Principal
           text: |
             az grafana data-source create --definition '{
               "access": "proxy",
@@ -87,14 +87,32 @@
               "name": "Geneva Datasource using Service principal",
               "type": "geneva-datasource"
             }'
+        - name: create a data source of Azure SQL
+          text: |
+            az grafana data-source create --definition '{
+              "access": "proxy",
+              "database": "mySqlDB",
+              "jsonData": {
+                "authenticationType": "SQL Server Authentication",
+                "encrypt": "false"
+              },
+              "secureJsonFields": {
+                "password": true
+              },
+              "name": "Microsoft SQL Server",
+              "password": "verySecretPasssword!",
+              "type": "mssql",
+              "url": "mySqlServer.database.windows.net",
+              "user": "testuser1"
+            }'
 """
 
 
 helps['grafana data-source update'] = """
     type: command
     short-summary: Update a data source.
     examples:
-        - name: update a data source's credentials (make sure either set "version" to the latest version to bump to a new version, or omit it to overwrite the existing version)
+        - name: update a data source's credentials (make sure either set "version" to the latest version, or omit it to overwrite the existing version)
           text: |
             az grafana data-source create --data-source "Geneva Datasource" --definition '{
               "access": "proxy",
@@ -146,7 +164,19 @@
     examples:
         - name: Create a dashboard with definition in a json file. For quick start, clone from the output of "az grafana dashboard show", remove "id" and "uid", and apply changes.
           text: |
-            az grafana dashboard create -g MyResourceGroup -n MyGrafana --dashboard-definition @c:\\temp\\dashboard.json
+            az grafana dashboard create -g MyResourceGroup -n MyGrafana --definition '{
+              "dashboard": {
+                "annotations": {
+                    ...
+                },
+                "panels": {
+                    ...
+                }
+                "title": "TestDashboard"
+              },
+              "folderId": <folder id or skip to default to "General">,
+              "message": "Create a new test dashboard"
+            }'
 """
 
 helps['grafana dashboard update'] = """
@@ -156,7 +186,7 @@
         - name: Update a dashboard with definition in a json file. For quick start, get existing configuration from "az grafana dashboard show", and apply changes.
                 "version" field need to be updated, and "overwrite" field should be true.
           text: |
-            az grafana dashboard update -g MyResourceGroup -n MyGrafana --dashboard-definition @c:\\temp\\dashboard.json
+            az grafana dashboard update -g MyResourceGroup -n MyGrafana --definition @c:\\temp\\dashboard.json
 """
 
 helps['grafana dashboard list'] = """
@@ -238,4 +268,3 @@
     type: command
     short-summary: show detail of a user.
 """
-

src/ags/azext_ags/_params.py

@@ -7,9 +7,9 @@
 def load_arguments(self, _):
 
     from knack.arguments import CLIArgumentType
-    from azure.cli.core.commands.parameters import tags_type, get_three_state_flag, resource_group_name_type
+    from azure.cli.core.commands.parameters import tags_type, get_three_state_flag
     from azure.cli.core.commands.validators import get_default_location_from_resource_group
-    from ._validators import process_missing_resource_group_parameter, process_leading_hyphen
+    from ._validators import process_missing_resource_group_parameter
 
     grafana_name_type = CLIArgumentType(options_list="--grafana-name",
                                         help="Name of the Azure Managed Dashboard for Grafana.",
@@ -19,12 +19,6 @@ def load_arguments(self, _):
         c.argument("tags", tags_type)
         c.argument("location", validator=get_default_location_from_resource_group)
         c.argument("grafana_name", grafana_name_type, options_list=["--name", "-n"], validator=process_missing_resource_group_parameter)
-        c.argument("uid", options_list=["--unique-identifier", "--uid"],
-                   help=("The unique identifier (uid) of a dashboard can be used for uniquely identifying a dashboard or data source "
-                         "between multiple Grafana installs. It’s automatically generated if not provided on creating. "
-                         "The uid allows having consistent URLs for accessing dashboards or data sources when syncing "
-                         "between multiple Grafana installs. For uid with leading hyphen, please prepend whitespace to workaround https://bugs.python.org/issue9334"),
-                   validator=process_leading_hyphen)
         c.argument("id", help=("The identifier (id) of a dashboard/data source is an auto-incrementing "
                                "numeric value and is only unique per Grafana install."))
 
@@ -36,6 +30,7 @@ def load_arguments(self, _):
         c.argument('yes', options_list=['--yes', '-y'], help='Do not prompt for confirmation.', action='store_true')
 
     with self.argument_context("grafana dashboard") as c:
+        c.argument("uid", options_list=["--dashboard"], help="dashboard uid")
         c.argument("definition", help="The complete dashboard model in json string, or a path to a file with such json string")
 
     with self.argument_context("grafana dashboard show") as c:

src/ags/azext_ags/_validators.py

@@ -29,9 +29,3 @@ def process_missing_resource_group_parameter(cmd, namespace):
             raise CLIError(("Not able to find the Grafana workspace: '{}'. Please "
                             "correct the name, or provide resource group name, or set CLI "
                             "subscription the workspace belongs to").format(namespace.grafana_name))
-
-
-def process_leading_hyphen(cmd, namespace):  # TODO: find a common solution
-    if namespace.uid:
-        namespace.uid=namespace.uid.lstrip()
-

src/ags/azext_ags/custom.py

@@ -195,7 +195,7 @@ def query_data_source(cmd, grafana_name, data_source, time_from=None, time_to=No
     else:
         time_from = right_now - datetime.timedelta(hours=1)
     time_from_epoch = time.mktime(time_from.timetuple()) * 1000
-    
+
     if time_to:
         time_to = parser.parse(time_to)
     else:
@@ -257,7 +257,7 @@ def _send_request(cmd, resource_group_name, grafana_name, http_method, path, bod
     profile = Profile(cli_ctx=cmd.cli_ctx)
     # this might be a cross tenant scenario, so pass subscription to get_raw_token
     subscription = get_subscription_id(cmd.cli_ctx)
-    ags_first_party_app = ("7f525cdc-1f08-4afa-af7c-84709d42f5d3" 
+    ags_first_party_app = ("7f525cdc-1f08-4afa-af7c-84709d42f5d3"
                            if "-ppe." in cmd.cli_ctx.cloud.endpoints.active_directory
                            else "ce34e7e5-485f-4d76-964f-b3d2b16d1e4f")
     creds, _, _ = profile.get_raw_token(subscription=subscription,
@@ -270,10 +270,10 @@ def _send_request(cmd, resource_group_name, grafana_name, http_method, path, bod
 
     # TODO: handle re-try on 429
     response = requests.request(http_method,
-                               url=endpoint + path,
-                               headers=headers,
-                               json=body,
-                               verify=(not should_disable_connection_verify()))
+                                url=endpoint + path,
+                                headers=headers,
+                                json=body,
+                                verify=(not should_disable_connection_verify()))
     if response.status_code >= 400:
         if raise_for_error_status:
             logger.warning(str(response.content))