[dataprotection] Minor bugfix for AKS Vaulted Backups and support for…

… new paired region (#8237) * Fixed error in restore config generation * Added paired region for seus
Azure · Nov 11, 2024 · d3ba6cf · d3ba6cf
1 parent 105274d
commit d3ba6cf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/dataprotection/HISTORY.rst b/src/dataprotection/HISTORY.rst
@@ -2,6 +2,12 @@
 
 Release History
 ===============
+
+1.5.5
++++++
+* `az dataprotection backup-vault initialize-restoreconfig:` Fixed a bug when initializing a restore object for Vaulted AKS Backups.
+* Added CRR support for southeastus, westus3 region.
+
 1.5.4
 +++++
 * Removed dependency on `msrestazure.tools`

diff --git a/src/dataprotection/azext_dataprotection/manual/custom.py b/src/dataprotection/azext_dataprotection/manual/custom.py
@@ -867,7 +867,13 @@ def dataprotection_backup_instance_initialize_restoreconfig(datasource_type, exc
     if datasource_type != "AzureKubernetesService":
         raise InvalidArgumentValueError("This command is currently not supported for datasource types other than AzureKubernetesService")
 
-    object_type = "KubernetesClusterRestoreCriteria"
+    if staging_resource_group_id is None and staging_storage_account_id is None:
+        object_type = "KubernetesClusterRestoreCriteria"
+    elif staging_storage_account_id is not None and staging_resource_group_id is not None:
+        object_type = "KubernetesClusterVaultTierRestoreCriteria"
+    else:
+        raise InvalidArgumentValueError("Both --staging-resource-group-id and --staging-storage-account-id are manadatory for vaulted tier restore "
+                                        "for AzureKubernetesService. Please either provide or remove both of them.")
 
     if persistent_volume_restore_mode is None:
         persistent_volume_restore_mode = "RestoreWithVolumeData"

diff --git a/src/dataprotection/azext_dataprotection/manual/helpers.py b/src/dataprotection/azext_dataprotection/manual/helpers.py
@@ -104,6 +104,7 @@
     "southafricawest": "southafricanorth",
     "southcentralus": "northcentralus",
     "southeastasia": "eastasia",
+    "southeastus": "westus3",
     "southindia": "centralindia",
     "swedencentral": "swedensouth",
     "swedensouth": "swedencentral",

diff --git a/src/dataprotection/setup.py b/src/dataprotection/setup.py
@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages
 
 # HISTORY.rst entry.
-VERSION = '1.5.4'
+VERSION = '1.5.5'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers