{Eventhubs} az eventhubs namespace/eventhub authorization-rule: Migrate EventHub entity AuthRule and EventHub Namespace AuthRule cmdlets to AAZ

src/azure-cli/azure/cli/command_modules/eventhubs/_params.py

@@ -14,15 +14,12 @@ def load_arguments_eh(self, _):
     from azure.cli.core.commands.validators import get_default_location_from_resource_group
     from azure.cli.command_modules.eventhubs._completers import get_consumergroup_command_completion_list, \
         get_eventhubs_command_completion_list
-    from azure.cli.command_modules.eventhubs._validator import validate_storageaccount, validate_partner_namespace, validate_rights
+    from azure.cli.command_modules.eventhubs._validator import validate_storageaccount, validate_partner_namespace
     from knack.arguments import CLIArgumentType
     from azure.cli.core.profiles import ResourceType
-    (KeyType, AccessRights, SkuName, TlsVersion) = self.get_models('KeyType', 'AccessRights', 'SkuName', 'TlsVersion', resource_type=ResourceType.MGMT_EVENTHUB)
+    (SkuName, TlsVersion) = self.get_models('SkuName', 'TlsVersion', resource_type=ResourceType.MGMT_EVENTHUB)
     from azure.cli.command_modules.eventhubs.action import AlertAddEncryption, ConstructPolicy
 
-    rights_arg_type = CLIArgumentType(options_list=['--rights'], nargs='+', arg_type=get_enum_type(AccessRights), validator=validate_rights, help='Space-separated list of Authorization rule rights')
-    key_arg_type = CLIArgumentType(options_list=['--key'], arg_type=get_enum_type(KeyType), help='specifies Primary or Secondary key needs to be reset')
-    keyvalue_arg_type = CLIArgumentType(options_list=['--key-value'], help='Optional, if the key value provided, is set for KeyType or autogenerated Key value set for keyType.')
     event_hub_name_arg_type = CLIArgumentType(options_list=['--eventhub-name'], help='Name of EventHub')
     namespace_name_arg_type = CLIArgumentType(options_list=['--namespace-name'], help='Name of Namespace', id_part='name')
 
@@ -79,29 +76,6 @@ def load_arguments_eh(self, _):
             c.argument('tags', arg_type=tags_type)
             c.argument('capacity', type=int, help='Capacity for Sku, allowed value : 1')
 
-    # region Namespace Authorizationrule
-    with self.argument_context('eventhubs namespace authorization-rule list') as c:
-        c.argument('namespace_name', options_list=['--namespace-name'], id_part=None, help='Name of Namespace')
-
-    with self.argument_context('eventhubs namespace authorization-rule keys list') as c:
-        c.argument('authorization_rule_name', arg_type=name_type, id_part=None, help='Name of Namespace AuthorizationRule')
-        c.argument('namespace_name', options_list=['--namespace-name'], id_part=None, help='Name of Namespace')
-
-    for scope in ['eventhubs namespace authorization-rule', 'eventhubs namespace authorization-rule keys renew']:
-        with self.argument_context(scope) as c:
-            c.argument('authorization_rule_name', arg_type=name_type, id_part='child_name_1', help='Name of Namespace AuthorizationRule')
-            c.argument('namespace_name', arg_type=namespace_name_arg_type, help='Name of Namespace')
-
-    for scope in ['eventhubs namespace authorization-rule create', 'eventhubs namespace authorization-rule update', 'eventhubs eventhub authorization-rule create', 'eventhubs eventhub authorization-rule update']:
-        with self.argument_context(scope) as c:
-            c.argument('name', arg_type=name_type, help='Name of Authorization Rule')
-            c.argument('rights', arg_type=rights_arg_type)
-
-    with self.argument_context('eventhubs namespace authorization-rule keys renew') as c:
-        c.argument('name', arg_type=name_type, help='Name of Authorization Rule')
-        c.argument('key_type', arg_type=key_arg_type)
-        c.argument('key', arg_type=keyvalue_arg_type)
-
 # region - Eventhub Create
     with self.argument_context('eventhubs eventhub') as c:
         c.argument('event_hub_name', arg_type=name_type, id_part='child_name_1', completer=get_eventhubs_command_completion_list, help='Name of Eventhub')
@@ -122,28 +96,6 @@ def load_arguments_eh(self, _):
 
     with self.argument_context('eventhubs eventhub list') as c:
         c.argument('namespace_name', options_list=['--namespace-name'], id_part=None, help='Name of Namespace')
-
-    # region EventHub Authorizationrule
-    for scope in ['eventhubs eventhub authorization-rule']:
-        with self.argument_context(scope) as c:
-            c.argument('authorization_rule_name', arg_type=name_type, id_part='child_name_2', help='Name of EventHub AuthorizationRule')
-            c.argument('event_hub_name', id_part='child_name_1', arg_type=event_hub_name_arg_type, help='Name of EventHub')
-
-    with self.argument_context('eventhubs eventhub authorization-rule keys renew') as c:
-        c.argument('name', arg_type=name_type, help='Name of Authorization Rule')
-        c.argument('key_type', arg_type=key_arg_type)
-        c.argument('key', arg_type=keyvalue_arg_type)
-
-    with self.argument_context('eventhubs eventhub authorization-rule list') as c:
-        c.argument('namespace_name', options_list=['--namespace-name'], id_part=None, help='Name of Namespace')
-        c.argument('event_hub_name', id_part=None, arg_type=event_hub_name_arg_type)
-
-    with self.argument_context('eventhubs eventhub authorization-rule keys list') as c:
-        c.argument('namespace_name', options_list=['--namespace-name'], id_part=None, help='Name of Namespace')
-        c.argument('event_hub_name', id_part=None, arg_type=event_hub_name_arg_type)
-        c.argument('authorization_rule_name', arg_type=name_type, id_part=None, help='Name of EventHub AuthorizationRule')
-
-
 # - ConsumerGroup Region
     with self.argument_context('eventhubs eventhub consumer-group') as c:
         c.argument('event_hub_name', arg_type=event_hub_name_arg_type, help='Name of EventHub')

src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/__cmd_group.py

@@ -15,7 +15,7 @@
     "eventhubs",
 )
 class __CMDGroup(AAZCommandGroup):
-    """eventhubs
+    """eventhub
     """
     pass
 

src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/__cmd_group.py

@@ -0,0 +1,23 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from azure.cli.core.aaz import *
+
+
+@register_command_group(
+    "eventhubs eventhub",
+)
+class __CMDGroup(AAZCommandGroup):
+    """eventhub
+    """
+    pass
+
+
+__all__ = ["__CMDGroup"]

src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/__init__.py

@@ -0,0 +1,11 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from .__cmd_group import *

src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/__cmd_group.py

@@ -0,0 +1,23 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from azure.cli.core.aaz import *
+
+
+@register_command_group(
+    "eventhubs eventhub authorization-rule",
+)
+class __CMDGroup(AAZCommandGroup):
+    """eventhub authorization rule
+    """
+    pass
+
+
+__all__ = ["__CMDGroup"]

src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/__init__.py

@@ -0,0 +1,16 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from .__cmd_group import *
+from ._create import *
+from ._delete import *
+from ._list import *
+from ._show import *
+from ._update import *