Revert "{dataprotection} Updated packaged vendored SDK azure_mgmt_preview_aks to 2024-10-02-preview (Azure#8544)"

This reverts commit 841aa39.

Author: bavneetsingh16

src/dataprotection/HISTORY.rst

@@ -3,10 +3,6 @@
 Release History
 ===============
 
-1.5.6
-+++++
-* Updated the packaged AKS-preview SDK.
-
 1.5.5
 +++++
 * `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

@@ -21,11 +21,12 @@
     ForbiddenError,
     UnauthorizedError
 )
+# from azure.cli.core.aaz import has_value
 from azure.cli.core.commands.client_factory import get_mgmt_service_client
 from azure.cli.command_modules.role.custom import list_role_assignments, create_role_assignment
-from azure.mgmt.core.tools import is_valid_resource_id, parse_resource_id
 from knack.log import get_logger
 from knack.prompting import prompt_y_n
+from azure.mgmt.core.tools import is_valid_resource_id, parse_resource_id
 from azext_dataprotection.vendored_sdks.resourcegraph.models import \
     QueryRequest, QueryRequestOptions
 from azext_dataprotection.manual import backupcenter_helper, helpers as helper

src/dataprotection/azext_dataprotection/manual/helpers.py

@@ -13,6 +13,7 @@
 import json
 from importlib import import_module
 from azure.mgmt.core.tools import is_valid_resource_id, parse_resource_id
+from knack.log import get_logger
 from azure.cli.core.azclierror import (
     RequiredArgumentMissingError,
     InvalidArgumentValueError,
@@ -22,7 +23,6 @@
 )
 from azure.cli.core.commands.client_factory import get_mgmt_service_client
 from azure.cli.command_modules.role.custom import list_role_assignments, create_role_assignment
-from knack.log import get_logger
 from azext_dataprotection.manual import backupcenter_helper
 from azext_dataprotection.manual.custom import (
     dataprotection_backup_instance_list_from_resourcegraph,

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

@@ -24,21 +24,21 @@ interactions:
       ParameterSetName:
       - --datasource-type --datasource-id
       User-Agent:
-      - AZURECLI/2.67.0 azsdk-python-core/1.31.0 Python/3.11.9 (Windows-10-10.0.26100-SP0)
+      - AZURECLI/2.61.0 azsdk-python-core/1.28.0 Python/3.11.4 (Windows-10-10.0.22631-SP0)
     method: POST
     uri: https://management.azure.com/providers/Microsoft.ResourceGraph/resources?api-version=2021-03-01
   response:
     body:
-      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"}'
+      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"}'
     headers:
       cache-control:
       - no-cache
       content-length:
-      - '4202'
+      - '4181'
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 11 Mar 2025 08:28:21 GMT
+      - Wed, 26 Jun 2024 07:49:39 GMT
       expires:
       - '-1'
       pragma:
@@ -52,13 +52,13 @@ interactions:
       x-ms-ratelimit-remaining-tenant-resource-requests:
       - '14'
       x-ms-resource-graph-request-duration:
-      - '0:00:00:00.7923260'
+      - '0:00:00:00.6578580'
       x-ms-user-quota-remaining:
       - '14'
       x-ms-user-quota-resets-after:
       - 00:00:05
       x-msedge-ref:
-      - 'Ref A: A940FF2F9BE44923992C3B77EE06AFB3 Ref B: MAA201060516011 Ref C: 2025-03-11T08:28:20Z'
+      - 'Ref A: 45DCB150895445789166C6358C4EF817 Ref B: MAA201060516009 Ref C: 2024-06-26T07:49:38Z'
     status:
       code: 200
       message: OK