Skip to content

Commit d3ba6cf

Browse files
authored
[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
1 parent 105274d commit d3ba6cf

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

src/dataprotection/HISTORY.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
33
Release History
44
===============
5+
6+
1.5.5
7+
+++++
8+
* `az dataprotection backup-vault initialize-restoreconfig:` Fixed a bug when initializing a restore object for Vaulted AKS Backups.
9+
* Added CRR support for southeastus, westus3 region.
10+
511
1.5.4
612
+++++
713
* Removed dependency on `msrestazure.tools`

src/dataprotection/azext_dataprotection/manual/custom.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,13 @@ def dataprotection_backup_instance_initialize_restoreconfig(datasource_type, exc
867867
if datasource_type != "AzureKubernetesService":
868868
raise InvalidArgumentValueError("This command is currently not supported for datasource types other than AzureKubernetesService")
869869

870-
object_type = "KubernetesClusterRestoreCriteria"
870+
if staging_resource_group_id is None and staging_storage_account_id is None:
871+
object_type = "KubernetesClusterRestoreCriteria"
872+
elif staging_storage_account_id is not None and staging_resource_group_id is not None:
873+
object_type = "KubernetesClusterVaultTierRestoreCriteria"
874+
else:
875+
raise InvalidArgumentValueError("Both --staging-resource-group-id and --staging-storage-account-id are manadatory for vaulted tier restore "
876+
"for AzureKubernetesService. Please either provide or remove both of them.")
871877

872878
if persistent_volume_restore_mode is None:
873879
persistent_volume_restore_mode = "RestoreWithVolumeData"

src/dataprotection/azext_dataprotection/manual/helpers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
"southafricawest": "southafricanorth",
105105
"southcentralus": "northcentralus",
106106
"southeastasia": "eastasia",
107+
"southeastus": "westus3",
107108
"southindia": "centralindia",
108109
"swedencentral": "swedensouth",
109110
"swedensouth": "swedencentral",

src/dataprotection/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from setuptools import setup, find_packages
1111

1212
# HISTORY.rst entry.
13-
VERSION = '1.5.4'
13+
VERSION = '1.5.5'
1414

1515
# The full list of classifiers is available at
1616
# https://pypi.python.org/pypi?%3Aaction=list_classifiers

0 commit comments

Comments
 (0)