Skip to content

Commit 15075c6

Browse files
committed
Fix typos and improve error messages for AKS backup configuration handling
1 parent 2d1c87a commit 15075c6

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/dataprotection/azext_dataprotection/manual/_help.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
examples:
3232
- name: Update backed up containers for a vaulted blob backup instance
3333
text: az dataprotection backup-instance update --backup-instance-name MyDisk1 --vaulted-blob-container-list {backup_configuration} -g MyResourceGroup --vault-name MyVault
34-
- name: Update backuped namespaces for a aks backup instance
34+
- name: Update backed up namespaces for an aks backup instance
3535
text: az dataprotection backup-instance update --backup-instance-name MyAKSCluster1 --aks-backup-configuration {aks_backup_configuration} -g MyResourceGroup --vault-name MyVault
3636
"""
3737

src/dataprotection/azext_dataprotection/manual/custom.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,11 @@ def dataprotection_backup_instance_update(cmd, resource_group_name, vault_name,
275275
# If user provided any of the datasource parameter update inputs, handle according to datasource type
276276
if vaulted_blob_container_list is not None or aks_backup_configuration is not None:
277277
if datasource_type == "Microsoft.ContainerService/managedClusters":
278+
# AKS scenario (only --aks-backup-configuration is valid)
278279
if vaulted_blob_container_list is not None:
279-
raise InvalidArgumentValueError('Invalid argument --vaulted-blob-container-list for given datasource type.')
280+
raise InvalidArgumentValueError(f'Invalid argument --vaulted-blob-container-list for AKS datasource type: {datasource_type}. Use --aks-backup-configuration instead.')
280281
elif aks_backup_configuration is not None:
281-
# Allow passing JSON string or already-parsed object
282+
# Allow passing JSON string or already-parsed object for AKS backup configuration
282283
if isinstance(aks_backup_configuration, str):
283284
try:
284285
aks_backup_configuration = json.loads(aks_backup_configuration)
@@ -288,13 +289,14 @@ def dataprotection_backup_instance_update(cmd, resource_group_name, vault_name,
288289
raise InvalidArgumentValueError("Provided --aks-backup-configuration is not valid.")
289290
backup_instance['properties']['policyInfo']['policyParameters']['backupDatasourceParametersList'] = [aks_backup_configuration]
290291
elif datasource_type == "Microsoft.Storage/storageAccounts/blobServices":
292+
# Blob scenario (only --vaulted-blob-container-list is valid)
291293
if aks_backup_configuration is not None:
292-
raise InvalidArgumentValueError('Invalid argument --aks-backup-configuration for given datasource type.')
294+
raise InvalidArgumentValueError(f'Invalid argument --aks-backup-configuration for Blob datasource type: {datasource_type}. Use --vaulted-blob-container-list instead.')
293295
elif vaulted_blob_container_list is not None:
294296
backup_instance['properties']['policyInfo']['policyParameters']['backupDatasourceParametersList'] = [vaulted_blob_container_list]
295297
else:
296-
raise InvalidArgumentValueError("Setting backup datasource parameters is not supported for given DataSourceType.\n "
297-
"Supported datasource types are Microsoft.ContainerService/managedClusters and Microsoft.Storage/storageAccounts/blobServices.")
298+
raise InvalidArgumentValueError(f"Setting backup datasource parameters is not supported for datasource type: {datasource_type}.\n "
299+
"Supported datasource types are Microsoft.ContainerService/managedClusters (AKS) and Microsoft.Storage/storageAccounts/blobServices (Blob).")
298300

299301
backup_instance = helper.convert_backup_instance_show_to_input(backup_instance)
300302

0 commit comments

Comments
 (0)