Remove acr help command from acr query extension (#8526)

Author: CarolineNB

src/acrquery/HISTORY.rst

@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.0.1b2
+++++++
+* Bug fix: Removed help command that overrode default `acr -h` command.
+
 1.0.1
 ++++++
 * Add: New mock files to validate query request.

src/acrquery/azext_acrquery/__init__.py

@@ -5,7 +5,7 @@
 
 from azure.cli.core import AzCommandsLoader
 from azure.cli.core.profiles import ResourceType
-from azext_acrquery._help import helps
+from azext_acrquery._help import helps  # pylint: disable=unused-import
 
 
 class AcrqueryCommandsLoader(AzCommandsLoader):
@@ -16,7 +16,8 @@ def __init__(self, cli_ctx=None):
         acrquery_custom = CliCommandType(
             operations_tmpl='azext_acrquery.custom#{}',
             client_factory=cf_metadata)
-        super().__init__(cli_ctx=cli_ctx, resource_type=ResourceType.MGMT_CONTAINERREGISTRY, operation_group='registries', custom_command_type=acrquery_custom)
+        super().__init__(cli_ctx=cli_ctx, resource_type=ResourceType.MGMT_CONTAINERREGISTRY,
+                         operation_group='registries', custom_command_type=acrquery_custom)
 
     def load_command_table(self, args):
         from azext_acrquery.commands import load_command_table

src/acrquery/azext_acrquery/_help.py

@@ -5,12 +5,6 @@
 
 from knack.help_files import helps
 
-
-helps['acr'] = """
-    type: group
-    short-summary: KQL querying against ACR content.
-"""
-
 helps['acr query'] = """
     type: command
     short-summary: Query the content in an ACR using Kusto Query Language.

src/acrquery/azext_acrquery/_params.py

@@ -9,8 +9,12 @@
 def load_arguments(self, _):
 
     with self.argument_context('acr query') as c:
-        c.argument('registry_name', options_list=['--name', '-n'], validator=validate_registry_name, help='The name of the container registry that the query is run against.')
-        c.argument('repository', help='The repository that the query is run against. If no repository is provided, the query is run at the registry level.')
+        c.argument('registry_name', options_list=['--name', '-n'],
+                   validator=validate_registry_name,
+                   help='The name of the container registry that the query is run against.')
+        c.argument('repository',
+                   help='The repository that the query is run against. If no repository is provided, '
+                   'the query is run at the registry level.')
         c.argument('kql_query', options_list=['--kql-query', '-q'], help='The KQL query to execute.')
         c.argument('skip_token', help='Skip token to get the next page of the query if applicable.')
         c.argument('username', help='Registry username')

src/acrquery/azext_acrquery/custom.py

@@ -3,4 +3,4 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from .query import create_query
+from .query import create_query  # pylint: disable=unused-import

src/acrquery/azext_acrquery/query.py

@@ -4,7 +4,12 @@
 # --------------------------------------------------------------------------------------------
 
 from knack.log import get_logger
-from azure.cli.command_modules.acr._docker_utils import get_access_credentials, request_data_from_registry, RegistryAccessTokenPermission, RepoAccessTokenPermission
+from azure.cli.command_modules.acr._docker_utils import (
+    get_access_credentials,
+    request_data_from_registry,
+    RegistryAccessTokenPermission,
+    RepoAccessTokenPermission
+)
 
 logger = get_logger(__name__)
 

src/acrquery/setup.py

@@ -14,7 +14,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
 
 # HISTORY.rst entry.
-VERSION = '1.0.1'
+VERSION = '1.0.1b2'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers