Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

Commit f500c3f

Browse files
Revert "{dataprotection} Updated packaged vendored SDK azure_mgmt_preview_aks to 2024-10-02-preview (Azure#8544)"
This reverts commit 841aa39.
1 parent 3c2fd9e commit f500c3f

File tree

110 files changed

+26150
-18385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+26150
-18385
lines changed

src/dataprotection/HISTORY.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
Release History
44
===============
55

6-
1.5.6
7-
+++++
8-
* Updated the packaged AKS-preview SDK.
9-
106
1.5.5
117
+++++
128
* `az dataprotection backup-vault initialize-restoreconfig:` Fixed a bug when initializing a restore object for Vaulted AKS Backups.

src/dataprotection/azext_dataprotection/manual/custom.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
ForbiddenError,
2222
UnauthorizedError
2323
)
24+
# from azure.cli.core.aaz import has_value
2425
from azure.cli.core.commands.client_factory import get_mgmt_service_client
2526
from azure.cli.command_modules.role.custom import list_role_assignments, create_role_assignment
26-
from azure.mgmt.core.tools import is_valid_resource_id, parse_resource_id
2727
from knack.log import get_logger
2828
from knack.prompting import prompt_y_n
29+
from azure.mgmt.core.tools import is_valid_resource_id, parse_resource_id
2930
from azext_dataprotection.vendored_sdks.resourcegraph.models import \
3031
QueryRequest, QueryRequestOptions
3132
from azext_dataprotection.manual import backupcenter_helper, helpers as helper

src/dataprotection/azext_dataprotection/manual/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import json
1414
from importlib import import_module
1515
from azure.mgmt.core.tools import is_valid_resource_id, parse_resource_id
16+
from knack.log import get_logger
1617
from azure.cli.core.azclierror import (
1718
RequiredArgumentMissingError,
1819
InvalidArgumentValueError,
@@ -22,7 +23,6 @@
2223
)
2324
from azure.cli.core.commands.client_factory import get_mgmt_service_client
2425
from azure.cli.command_modules.role.custom import list_role_assignments, create_role_assignment
25-
from knack.log import get_logger
2626
from azext_dataprotection.manual import backupcenter_helper
2727
from azext_dataprotection.manual.custom import (
2828
dataprotection_backup_instance_list_from_resourcegraph,

src/dataprotection/azext_dataprotection/tests/latest/recordings/test_dataprotection_backup_and_restore_aks.yaml

Lines changed: 482 additions & 538 deletions
Large diffs are not rendered by default.

src/dataprotection/azext_dataprotection/tests/latest/recordings/test_dataprotection_backup_and_restore_mysql.yaml

Lines changed: 2459 additions & 10 deletions
Large diffs are not rendered by default.

src/dataprotection/azext_dataprotection/tests/latest/recordings/test_dataprotection_backup_and_restore_pgflex.yaml

Lines changed: 4570 additions & 206 deletions
Large diffs are not rendered by default.

src/dataprotection/azext_dataprotection/tests/latest/recordings/test_dataprotection_backup_instance_create_and_delete_blob.yaml

Lines changed: 132 additions & 186 deletions
Large diffs are not rendered by default.

src/dataprotection/azext_dataprotection/tests/latest/recordings/test_dataprotection_backup_instance_create_backup_delete_disk.yaml

Lines changed: 464 additions & 375 deletions
Large diffs are not rendered by default.

src/dataprotection/azext_dataprotection/tests/latest/recordings/test_dataprotection_backup_instance_list_from_resource_graph.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ interactions:
2424
ParameterSetName:
2525
- --datasource-type --datasource-id
2626
User-Agent:
27-
- AZURECLI/2.67.0 azsdk-python-core/1.31.0 Python/3.11.9 (Windows-10-10.0.26100-SP0)
27+
- AZURECLI/2.61.0 azsdk-python-core/1.28.0 Python/3.11.4 (Windows-10-10.0.22631-SP0)
2828
method: POST
2929
uri: https://management.azure.com/providers/Microsoft.ResourceGraph/resources?api-version=2021-03-01
3030
response:
3131
body:
32-
string: '{"totalRecords":1,"count":1,"data":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.DataProtection/backupVaults/clitest-bkp-vault-persistent-bi-donotdelete/backupInstances/clitest-disk-persistent-bi-donotdelete-clitest-disk-persistent-bi-donotdelete-e33c80ba-0bf8-11ee-aaa6-002b670b472e","name":"clitest-disk-persistent-bi-donotdelete-clitest-disk-persistent-bi-donotdelete-e33c80ba-0bf8-11ee-aaa6-002b670b472e","type":"microsoft.dataprotection/backupvaults/backupinstances","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","kind":"","location":"centraluseuap","resourceGroup":"clitest-dpp-rg","subscriptionId":"38304e13-357e-405e-9e9a-220351dcce8c","managedBy":"","sku":null,"plan":null,"properties":{"resourceGuardOperationRequests":null,"protectionStatus":{"errorDetails":null,"status":"ProtectionConfigured"},"friendlyName":"clitest-disk-persistent-bi-donotdelete","currentProtectionState":"ProtectionConfigured","objectType":"BackupInstance","dataSourceSetInfo":{"resourceLocation":"centraluseuap","datasourceType":"Microsoft.Compute/disks","objectType":"DatasourceSet","resourceID":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.Compute/disks/clitest-disk-persistent-bi-donotdelete","resourceType":"Microsoft.Compute/disks","resourceProperties":null,"resourceName":"clitest-disk-persistent-bi-donotdelete","resourceUri":"","baseUri":null},"dataSourceInfo":{"resourceLocation":"centraluseuap","datasourceType":"Microsoft.Compute/disks","objectType":"Datasource","resourceID":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.Compute/disks/clitest-disk-persistent-bi-donotdelete","resourceType":"Microsoft.Compute/disks","resourceProperties":null,"resourceName":"clitest-disk-persistent-bi-donotdelete","resourceUri":"","baseUri":null},"policyInfo":{"policyId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.DataProtection/backupVaults/clitest-bkp-vault-persistent-bi-donotdelete/backupPolicies/diskpolicy","policyParameters":{"backupDatasourceParametersList":null,"dataStoreParametersList":[{"objectType":"AzureOperationalStoreParameters","dataStoreType":"OperationalStore","resourceGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg"}],"tags":null},"policyVersion":null},"backupInstanceExtendedProperties":{"allowedOperations":["BackupNow","Restore","ChangePolicy","EditBackupInstance","StopBackup","Delete"],"protectionStateInSecondaryRegion":"NotProtected","protectedPrimaryRegion":"centraluseuap","vaultId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.DataProtection/backupVaults/clitest-bkp-vault-persistent-bi-donotdelete","protectedSecondaryRegion":"","dataSourceExtendedInfo":{"dataSourceId":"clitest-disk-persistent-bi-donotdelete"},"policyExtendedInfo":{"configuredRPGenerationFrequencyInSecondaryRegion":"-10675199.02:48:05.4775808","configuredMaximumRetentionInSecondaryRegion":"-10675199.02:48:05.4775808","rpoWarningThresholdInSecondaryRegion":"-10675199.02:48:05.4775808","rpoWarningThresholdInPrimaryRegion":"1.12:00:00","configuredRPGenerationFrequency":"1.00:00:00","configuredMaximumRetention":"7.00:00:00"},"recoveryPointInfo":{"oldestRecoveryPointInSecondaryRegion":"0001-01-01T00:00:00.0000000Z","latestRecoveryPointInSecondaryRegion":"0001-01-01T00:00:00.0000000Z","latestRecoveryPointInPrimaryRegion":"2025-03-10T12:02:58.4730000Z","oldestRecoveryPointInPrimaryRegion":"2025-03-04T12:02:51.5770000Z"}},"datasourceAuthCredentials":null,"protectionErrorDetails":null,"dataSourceProperties":null,"provisioningState":"Succeeded","identityDetails":null,"validationType":null},"tags":null,"identity":null,"zones":null,"extendedLocation":null,"vaultName":"clitest-bkp-vault-persistent-bi-donotdelete","protectionState":"ProtectionConfigured","datasourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.Compute/disks/clitest-disk-persistent-bi-donotdelete"}],"facets":[],"resultTruncated":"false"}'
32+
string: '{"totalRecords":1,"count":1,"data":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.DataProtection/backupVaults/clitest-bkp-vault-persistent-bi-donotdelete/backupInstances/clitest-disk-persistent-bi-donotdelete-clitest-disk-persistent-bi-donotdelete-e33c80ba-0bf8-11ee-aaa6-002b670b472e","name":"clitest-disk-persistent-bi-donotdelete-clitest-disk-persistent-bi-donotdelete-e33c80ba-0bf8-11ee-aaa6-002b670b472e","type":"microsoft.dataprotection/backupvaults/backupinstances","tenantId":"72f988bf-86f1-41af-91ab-2d7cd011db47","kind":"","location":"centraluseuap","resourceGroup":"clitest-dpp-rg","subscriptionId":"38304e13-357e-405e-9e9a-220351dcce8c","managedBy":"","sku":null,"plan":null,"properties":{"protectionStatus":{"errorDetails":null,"status":"ProtectionConfigured"},"resourceGuardOperationRequests":null,"friendlyName":"clitest-disk-persistent-bi-donotdelete","currentProtectionState":"ProtectionConfigured","objectType":"BackupInstance","dataSourceSetInfo":{"resourceLocation":"centraluseuap","datasourceType":"Microsoft.Compute/disks","objectType":"DatasourceSet","resourceID":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.Compute/disks/clitest-disk-persistent-bi-donotdelete","resourceType":"Microsoft.Compute/disks","resourceProperties":null,"resourceName":"clitest-disk-persistent-bi-donotdelete","resourceUri":"","baseUri":null},"dataSourceInfo":{"resourceLocation":"centraluseuap","datasourceType":"Microsoft.Compute/disks","objectType":"Datasource","resourceID":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.Compute/disks/clitest-disk-persistent-bi-donotdelete","resourceType":"Microsoft.Compute/disks","resourceProperties":null,"resourceName":"clitest-disk-persistent-bi-donotdelete","resourceUri":"","baseUri":null},"policyInfo":{"policyId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.DataProtection/backupVaults/clitest-bkp-vault-persistent-bi-donotdelete/backupPolicies/diskpolicy","policyParameters":{"backupDatasourceParametersList":null,"dataStoreParametersList":[{"objectType":"AzureOperationalStoreParameters","dataStoreType":"OperationalStore","resourceGroupId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg"}],"tags":null},"policyVersion":null},"backupInstanceExtendedProperties":{"allowedOperations":["BackupNow","Restore","ChangePolicy","StopBackup","Delete"],"protectionStateInSecondaryRegion":"NotProtected","protectedPrimaryRegion":"centraluseuap","vaultId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.DataProtection/backupVaults/clitest-bkp-vault-persistent-bi-donotdelete","protectedSecondaryRegion":"","dataSourceExtendedInfo":{"dataSourceId":"clitest-disk-persistent-bi-donotdelete"},"policyExtendedInfo":{"configuredRPGenerationFrequencyInSecondaryRegion":"-10675199.02:48:05.4775808","configuredMaximumRetentionInSecondaryRegion":"-10675199.02:48:05.4775808","rpoWarningThresholdInSecondaryRegion":"-10675199.02:48:05.4775808","rpoWarningThresholdInPrimaryRegion":"1.12:00:00","configuredRPGenerationFrequency":"1.00:00:00","configuredMaximumRetention":"7.00:00:00"},"recoveryPointInfo":{"oldestRecoveryPointInSecondaryRegion":"0001-01-01T00:00:00.0000000Z","latestRecoveryPointInSecondaryRegion":"0001-01-01T00:00:00.0000000Z","latestRecoveryPointInPrimaryRegion":"0001-01-01T00:00:00.0000000Z","oldestRecoveryPointInPrimaryRegion":"0001-01-01T00:00:00.0000000Z"}},"datasourceAuthCredentials":null,"protectionErrorDetails":null,"dataSourceProperties":null,"provisioningState":"Succeeded","identityDetails":null,"validationType":null},"tags":null,"identity":null,"zones":null,"extendedLocation":null,"vaultName":"clitest-bkp-vault-persistent-bi-donotdelete","protectionState":"ProtectionConfigured","datasourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest-dpp-rg/providers/Microsoft.Compute/disks/clitest-disk-persistent-bi-donotdelete"}],"facets":[],"resultTruncated":"false"}'
3333
headers:
3434
cache-control:
3535
- no-cache
3636
content-length:
37-
- '4202'
37+
- '4181'
3838
content-type:
3939
- application/json; charset=utf-8
4040
date:
41-
- Tue, 11 Mar 2025 08:28:21 GMT
41+
- Wed, 26 Jun 2024 07:49:39 GMT
4242
expires:
4343
- '-1'
4444
pragma:
@@ -52,13 +52,13 @@ interactions:
5252
x-ms-ratelimit-remaining-tenant-resource-requests:
5353
- '14'
5454
x-ms-resource-graph-request-duration:
55-
- '0:00:00:00.7923260'
55+
- '0:00:00:00.6578580'
5656
x-ms-user-quota-remaining:
5757
- '14'
5858
x-ms-user-quota-resets-after:
5959
- 00:00:05
6060
x-msedge-ref:
61-
- 'Ref A: A940FF2F9BE44923992C3B77EE06AFB3 Ref B: MAA201060516011 Ref C: 2025-03-11T08:28:20Z'
61+
- 'Ref A: 45DCB150895445789166C6358C4EF817 Ref B: MAA201060516009 Ref C: 2024-06-26T07:49:38Z'
6262
status:
6363
code: 200
6464
message: OK

0 commit comments

Comments
 (0)