Skip to content

Commit 2d1c87a

Browse files
committed
Modify AKS backup configuration parameter
1 parent 317b276 commit 2d1c87a

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

src/dataprotection/azext_dataprotection/manual/_help.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
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
35+
text: az dataprotection backup-instance update --backup-instance-name MyAKSCluster1 --aks-backup-configuration {aks_backup_configuration} -g MyResourceGroup --vault-name MyVault
3436
"""
3537

3638
helps['dataprotection backup-instance update-policy'] = """

src/dataprotection/azext_dataprotection/manual/_params.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ def load_arguments(self, _):
134134
c.argument('vaulted_blob_container_list', type=validate_file_or_dict, options_list=['--vaulted-blob-container-list', '--container-blob-list'],
135135
help="Enter the container list to modify a vaulted blob backup. The output for "
136136
"'az dataprotection backup-instance initialize-backupconfig' needs to be provided as input")
137-
c.argument('backup_configuration', type=validate_file_or_dict,
138-
help="Enter the backup configuration to modify AKS backup datasource parameters. "
139-
"The output for 'az dataprotection backup-instance initialize-backupconfig' needs to be provided as input.")
137+
c.argument('aks_backup_configuration', type=validate_file_or_dict,
138+
help="Enter the AKS backup configuration to modify AKS backup datasource parameters. "
139+
"The output for 'az dataprotection backup-instance initialize-backupconfig --datasource-type AzureKubernetesService' needs to be provided as input.")
140140
c.argument('use_system_assigned_identity', options_list=['--system-assigned', '--use-system-identity', '--use-system-assigned-identity'], arg_type=get_three_state_flag(), help="Use system assigned identity")
141141
c.argument('user_assigned_identity_arm_url', options_list=['--user-assigned', '--user-assigned-identity-arm-url', '--uami'], type=str, help="ARM ID of the User Assigned Managed Identity")
142142

src/dataprotection/azext_dataprotection/manual/custom.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ def dataprotection_backup_instance_validate_for_update(cmd, resource_group_name,
247247

248248

249249
def dataprotection_backup_instance_update(cmd, resource_group_name, vault_name, backup_instance_name,
250-
vaulted_blob_container_list=None, backup_configuration=None, no_wait=False,
250+
vaulted_blob_container_list=None, aks_backup_configuration=None, no_wait=False,
251251
use_system_assigned_identity=None, user_assigned_identity_arm_url=None):
252252
from azext_dataprotection.aaz.latest.dataprotection.backup_instance import Show as BackupInstanceShow
253253
backup_instance = BackupInstanceShow(cli_ctx=cmd.cli_ctx)(command_args={
@@ -273,23 +273,23 @@ def dataprotection_backup_instance_update(cmd, resource_group_name, vault_name,
273273
datasource_type = backup_instance["properties"]["dataSourceInfo"]["datasourceType"]
274274

275275
# If user provided any of the datasource parameter update inputs, handle according to datasource type
276-
if vaulted_blob_container_list is not None or backup_configuration is not None:
276+
if vaulted_blob_container_list is not None or aks_backup_configuration is not None:
277277
if datasource_type == "Microsoft.ContainerService/managedClusters":
278278
if vaulted_blob_container_list is not None:
279279
raise InvalidArgumentValueError('Invalid argument --vaulted-blob-container-list for given datasource type.')
280-
elif backup_configuration is not None:
280+
elif aks_backup_configuration is not None:
281281
# Allow passing JSON string or already-parsed object
282-
if isinstance(backup_configuration, str):
282+
if isinstance(aks_backup_configuration, str):
283283
try:
284-
backup_configuration = json.loads(backup_configuration)
284+
aks_backup_configuration = json.loads(aks_backup_configuration)
285285
except json.JSONDecodeError:
286-
raise InvalidArgumentValueError("Provided --backup-configuration is not valid JSON.")
286+
raise InvalidArgumentValueError("Provided --aks-backup-configuration is not valid JSON.")
287287
except Exception:
288-
raise InvalidArgumentValueError("Provided --backup-configuration is not valid.")
289-
backup_instance['properties']['policyInfo']['policyParameters']['backupDatasourceParametersList'] = [backup_configuration]
288+
raise InvalidArgumentValueError("Provided --aks-backup-configuration is not valid.")
289+
backup_instance['properties']['policyInfo']['policyParameters']['backupDatasourceParametersList'] = [aks_backup_configuration]
290290
elif datasource_type == "Microsoft.Storage/storageAccounts/blobServices":
291-
if backup_configuration is not None:
292-
raise InvalidArgumentValueError('Invalid argument --backup-configuration for given datasource type.')
291+
if aks_backup_configuration is not None:
292+
raise InvalidArgumentValueError('Invalid argument --aks-backup-configuration for given datasource type.')
293293
elif vaulted_blob_container_list is not None:
294294
backup_instance['properties']['policyInfo']['policyParameters']['backupDatasourceParametersList'] = [vaulted_blob_container_list]
295295
else:

src/dataprotection/azext_dataprotection/tests/latest/test_dataprotection_backup_instance_operations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ def test_dataprotection_backup_instance_update_aks_configuration(test):
316316
})
317317

318318
# Apply temp configuration
319-
test.cmd('az dataprotection backup-instance update -g "{rg}" --vault-name "{vaultName}" --backup-instance-name "{backupInstanceName}" --backup-configuration "{tempBackupConfig}"', checks=[
319+
test.cmd('az dataprotection backup-instance update -g "{rg}" --vault-name "{vaultName}" --backup-instance-name "{backupInstanceName}" --aks-backup-configuration "{tempBackupConfig}"', checks=[
320320
test.check('name', "{backupInstanceName}")
321321
])
322322

@@ -330,6 +330,6 @@ def test_dataprotection_backup_instance_update_aks_configuration(test):
330330
])
331331

332332
# Reset to original configuration
333-
test.cmd('az dataprotection backup-instance update -g "{rg}" --vault-name "{vaultName}" --backup-instance-name "{backupInstanceName}" --backup-configuration "{backupConfig}"', checks=[
333+
test.cmd('az dataprotection backup-instance update -g "{rg}" --vault-name "{vaultName}" --backup-instance-name "{backupInstanceName}" --aks-backup-configuration "{backupConfig}"', checks=[
334334
test.check('name', "{backupInstanceName}")
335335
])

0 commit comments

Comments
 (0)