[dataprotection] Added '-v' option for all --vault-name parameters (#…

…6897) * Added '-v' option for all --vault-name parameters * Added history and new version, removed incorrectly committed JSON --------- Co-authored-by: Zubair Abid <[email protected]>
Azure · Oct 26, 2023 · 42d12ff · 42d12ff
1 parent 37ef8d4
commit 42d12ff
Show file tree

Hide file tree

Showing 29 changed files with 63 additions and 57 deletions.
diff --git a/src/dataprotection/HISTORY.rst b/src/dataprotection/HISTORY.rst
@@ -2,6 +2,10 @@
 
 Release History
 ===============
+0.11.1
+++++++
+* Added '-v' option for all --vault-name parameters
+
 0.11.0
 ++++++
 * Add support for Multi-User Authentication for Backup vaults

diff --git a/...rotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_adhoc_backup.py b/...rotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_adhoc_backup.py
@@ -57,7 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_create.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_create.py
@@ -55,7 +55,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
         )
@@ -80,6 +80,7 @@ def _build_args_base_resource_properties_create(cls, _schema):
             options=["object-type"],
             help="Type of the specific object - used for deserializing",
             required=True,
+            enum={"DefaultResourceProperties": "DefaultResourceProperties"},
         )
 
         _schema.object_type = cls._args_base_resource_properties_create.object_type

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_delete.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_delete.py
@@ -57,7 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_list.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_list.py
@@ -50,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
         )

diff --git a/...tion/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_resume_protection.py b/...tion/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_resume_protection.py
@@ -56,7 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_show.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_show.py
@@ -55,7 +55,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/...ection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_stop_protection.py b/...ection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_stop_protection.py
@@ -56,7 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/...tection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_suspend_backup.py b/...tection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_suspend_backup.py
@@ -56,7 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_update.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_update.py
@@ -55,7 +55,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",
@@ -273,6 +273,7 @@ def _build_args_base_resource_properties_update(cls, _schema):
         base_resource_properties_update.object_type = AAZStrArg(
             options=["object-type"],
             help="Type of the specific object - used for deserializing",
+            enum={"DefaultResourceProperties": "DefaultResourceProperties"},
         )
 
         _schema.object_type = cls._args_base_resource_properties_update.object_type

diff --git a/...on/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_validate_for_backup.py b/...on/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_validate_for_backup.py
@@ -50,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",
@@ -353,6 +353,7 @@ def _build_args_base_resource_properties_create(cls, _schema):
             options=["object-type"],
             help="Type of the specific object - used for deserializing",
             required=True,
+            enum={"DefaultResourceProperties": "DefaultResourceProperties"},
         )
 
         _schema.object_type = cls._args_base_resource_properties_create.object_type

diff --git a/...n/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_validate_for_restore.py b/...n/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_validate_for_restore.py
@@ -56,7 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",
@@ -433,6 +433,7 @@ def _build_args_base_resource_properties_create(cls, _schema):
             options=["object-type"],
             help="Type of the specific object - used for deserializing",
             required=True,
+            enum={"DefaultResourceProperties": "DefaultResourceProperties"},
         )
 
         _schema.object_type = cls._args_base_resource_properties_create.object_type

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_wait.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/_wait.py
@@ -50,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/...dataprotection/aaz/latest/dataprotection/backup_instance/deleted_backup_instance/_list.py b/...dataprotection/aaz/latest/dataprotection/backup_instance/deleted_backup_instance/_list.py
@@ -47,7 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
         )

diff --git a/...dataprotection/aaz/latest/dataprotection/backup_instance/deleted_backup_instance/_show.py b/...dataprotection/aaz/latest/dataprotection/backup_instance/deleted_backup_instance/_show.py
@@ -52,7 +52,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/...protection/aaz/latest/dataprotection/backup_instance/deleted_backup_instance/_undelete.py b/...protection/aaz/latest/dataprotection/backup_instance/deleted_backup_instance/_undelete.py
@@ -53,7 +53,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/...ection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/restore/_trigger.py b/...ection/azext_dataprotection/aaz/latest/dataprotection/backup_instance/restore/_trigger.py
@@ -53,7 +53,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",
@@ -369,6 +369,7 @@ def _build_args_base_resource_properties_create(cls, _schema):
             options=["object-type"],
             help="Type of the specific object - used for deserializing",
             required=True,
+            enum={"DefaultResourceProperties": "DefaultResourceProperties"},
         )
 
         _schema.object_type = cls._args_base_resource_properties_create.object_type

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_create.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_create.py
@@ -54,7 +54,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
         )

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_delete.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_delete.py
@@ -56,7 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_list.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_list.py
@@ -50,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
         )

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_show.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_show.py
@@ -55,7 +55,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_update.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/backup_policy/_update.py
@@ -54,7 +54,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
             id_part="name",

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/job/_list.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/job/_list.py
@@ -50,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
         )

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/job/_show.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/job/_show.py
@@ -48,6 +48,12 @@ def _build_arguments_schema(cls, *args, **kwargs):
         _args_schema.resource_group = AAZResourceGroupNameArg(
             required=True,
         )
+        _args_schema.vault_name = AAZStrArg(
+            options=["-v", "--vault-name"],
+            help="The name of the backup vault.",
+            required=True,
+            id_part="name",
+        )
 
         # define Arg Group "Resource Id Arguments"
 
@@ -59,13 +65,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_1",
         )
-        _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
-            arg_group="Resource Id Arguments",
-            help="The name of the backup vault.",
-            required=True,
-            id_part="name",
-        )
         return cls._args_schema
 
     def _execute_operations(self):

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/recovery_point/_list.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/recovery_point/_list.py
@@ -55,7 +55,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
+            options=["-v", "--vault-name"],
             help="The name of the backup vault.",
             required=True,
         )

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/recovery_point/_show.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/recovery_point/_show.py
@@ -48,6 +48,12 @@ def _build_arguments_schema(cls, *args, **kwargs):
         _args_schema.resource_group = AAZResourceGroupNameArg(
             required=True,
         )
+        _args_schema.vault_name = AAZStrArg(
+            options=["-v", "--vault-name"],
+            help="The name of the backup vault.",
+            required=True,
+            id_part="name",
+        )
 
         # define Arg Group "Resource Id Arguments"
 
@@ -66,13 +72,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_2",
         )
-        _args_schema.vault_name = AAZStrArg(
-            options=["--vault-name"],
-            arg_group="Resource Id Arguments",
-            help="The name of the backup vault.",
-            required=True,
-            id_part="name",
-        )
         return cls._args_schema
 
     def _execute_operations(self):

diff --git a/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/resource_guard/_list.py b/src/dataprotection/azext_dataprotection/aaz/latest/dataprotection/resource_guard/_list.py
@@ -55,12 +55,12 @@ def _build_arguments_schema(cls, *args, **kwargs):
 
     def _execute_operations(self):
         self.pre_operations()
-        condition_0 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
-        condition_1 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
+        condition_0 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
+        condition_1 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
         if condition_0:
-            self.ResourceGuardsGetResourcesInSubscription(ctx=self.ctx)()
-        if condition_1:
             self.ResourceGuardsGetResourcesInResourceGroup(ctx=self.ctx)()
+        if condition_1:
+            self.ResourceGuardsGetResourcesInSubscription(ctx=self.ctx)()
         self.post_operations()
 
     @register_callback
@@ -76,7 +76,7 @@ def _output(self, *args, **kwargs):
         next_link = self.deserialize_output(self.ctx.vars.instance.next_link)
         return result, next_link
 
-    class ResourceGuardsGetResourcesInSubscription(AAZHttpOperation):
+    class ResourceGuardsGetResourcesInResourceGroup(AAZHttpOperation):
         CLIENT_TYPE = "MgmtClient"
 
         def __call__(self, *args, **kwargs):
@@ -90,7 +90,7 @@ def __call__(self, *args, **kwargs):
         @property
         def url(self):
             return self.client.format_url(
-                "/subscriptions/{subscriptionId}/providers/Microsoft.DataProtection/resourceGuards",
+                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataProtection/resourceGuards",
                 **self.url_parameters
             )
 
@@ -105,6 +105,10 @@ def error_format(self):
         @property
         def url_parameters(self):
             parameters = {
+                **self.serialize_url_param(
+                    "resourceGroupName", self.ctx.args.resource_group,
+                    required=True,
+                ),
                 **self.serialize_url_param(
                     "subscriptionId", self.ctx.subscription_id,
                     required=True,
@@ -239,7 +243,7 @@ def _build_schema_on_200(cls):
 
             return cls._schema_on_200
 
-    class ResourceGuardsGetResourcesInResourceGroup(AAZHttpOperation):
+    class ResourceGuardsGetResourcesInSubscription(AAZHttpOperation):
         CLIENT_TYPE = "MgmtClient"
 
         def __call__(self, *args, **kwargs):
@@ -253,7 +257,7 @@ def __call__(self, *args, **kwargs):
         @property
         def url(self):
             return self.client.format_url(
-                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataProtection/resourceGuards",
+                "/subscriptions/{subscriptionId}/providers/Microsoft.DataProtection/resourceGuards",
                 **self.url_parameters
             )
 
@@ -268,10 +272,6 @@ def error_format(self):
         @property
         def url_parameters(self):
             parameters = {
-                **self.serialize_url_param(
-                    "resourceGroupName", self.ctx.args.resource_group,
-                    required=True,
-                ),
                 **self.serialize_url_param(
                     "subscriptionId", self.ctx.subscription_id,
                     required=True,