From 1448e7ce71422c8104dbdbf0fec15dd0730d591c Mon Sep 17 00:00:00 2001 From: m-nash Date: Fri, 10 Dec 2021 12:45:46 -0800 Subject: [PATCH] update keyvault tests --- .../tests/ManagedHsmTests.cs | 24 +++++++-------- ...stCompoundIdentityAccessControlPolicy.json | 6 ++-- .../tests/VaultOperationsTests.cs | 30 +++++++++---------- .../tests/VaultOperationsTestsBase.cs | 12 ++++++-- 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/ManagedHsmTests.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/ManagedHsmTests.cs index 8475e9040b0e..5ef06933e279 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/ManagedHsmTests.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/ManagedHsmTests.cs @@ -19,11 +19,11 @@ public ManagedHsmTests(bool isAsync) } [SetUp] - public void ClearChallengeCacheforRecord() + public async Task ClearChallengeCacheforRecord() { if (Mode == RecordedTestMode.Record || Mode == RecordedTestMode.Playback) { - Initialize().ConfigureAwait(false).GetAwaiter().GetResult(); + await Initialize(); } } @@ -31,8 +31,8 @@ public void ClearChallengeCacheforRecord() [RecordedTest] public async Task ManagedHsmCreateUpdateDelete() { - Location = "southcentralus"; - var parameters = new ManagedHsmData(Location) + LocationToUse = "southcentralus"; + var parameters = new ManagedHsmData(LocationToUse) { Sku = new ManagedHsmSku(ManagedHsmSkuFamily.B, ManagedHsmSkuName.StandardB1), Properties = ManagedHsmProperties @@ -46,7 +46,7 @@ public async Task ManagedHsmCreateUpdateDelete() ResGroupName, TestEnvironment.SubscriptionId, TenantIdGuid, - Location, + LocationToUse, ManagedHsmSkuFamily.B, ManagedHsmSkuName.StandardB1, CreateMode.Default, @@ -61,7 +61,7 @@ public async Task ManagedHsmCreateUpdateDelete() ManagedHsmProperties.PublicNetworkAccess = PublicNetworkAccess.Enabled; ManagedHsmProperties.NetworkAcls.DefaultAction = "Allow"; - parameters = new ManagedHsmData(Location) + parameters = new ManagedHsmData(LocationToUse) { Sku = new ManagedHsmSku(ManagedHsmSkuFamily.B, ManagedHsmSkuName.StandardB1), Properties = ManagedHsmProperties @@ -105,7 +105,7 @@ public async Task ManagedHsmCreateUpdateDelete() ResGroupName, TestEnvironment.SubscriptionId, TenantIdGuid, - Location, + LocationToUse, ManagedHsmSkuFamily.B, ManagedHsmSkuName.StandardB1, CreateMode.Default, @@ -125,7 +125,7 @@ public async Task ManagedHsmCreateUpdateDelete() ResGroupName, TestEnvironment.SubscriptionId, TenantIdGuid, - Location, + LocationToUse, ManagedHsmSkuFamily.B, ManagedHsmSkuName.StandardB1, CreateMode.Default, @@ -155,10 +155,10 @@ public async Task ManagedHsmListKeys() { List resourceIds = new List(); List vaultList = new List(); - Location = "westus"; + LocationToUse = "westus"; string vaultName = Recording.GenerateAssetName("sdktestvault"); - var parameters = new ManagedHsmData(Location) + var parameters = new ManagedHsmData(LocationToUse) { Sku = new ManagedHsmSku(ManagedHsmSkuFamily.B, ManagedHsmSkuName.StandardB1), Properties = ManagedHsmProperties @@ -195,8 +195,8 @@ public async Task ManagedHsmListKeys() [RecordedTest] public async Task ManagedHsmRecoverDeletedVault() { - Location = "westus"; - var parameters = new ManagedHsmData(Location) + LocationToUse = "westus"; + var parameters = new ManagedHsmData(LocationToUse) { Sku = new ManagedHsmSku(ManagedHsmSkuFamily.B, ManagedHsmSkuName.StandardB1), Properties = ManagedHsmProperties diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/SessionRecords/VaultOperationsTests/KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy.json b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/SessionRecords/VaultOperationsTests/KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy.json index 68c83b00a2af..07c78a70719f 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/SessionRecords/VaultOperationsTests/KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy.json +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/SessionRecords/VaultOperationsTests/KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy.json @@ -98,7 +98,7 @@ "RequestHeaders": { "Accept": "application/json", "Authorization": "Sanitized", - "Content-Length": "691", + "Content-Length": "689", "Content-Type": "application/json", "User-Agent": [ "azsdk-net-ResourceManager/1.0.0-alpha.20210823.1", @@ -108,7 +108,7 @@ "x-ms-return-client-request-id": "true" }, "RequestBody": { - "location": "North Central US", + "location": "northcentralus", "tags": { "tag1": "value1", "tag2": "value2", @@ -1427,4 +1427,4 @@ "SUBSCRIPTION_ID": "db1ab6f0-4769-4b27-930e-01e2ef9c123c", "TENANT_ID": "72f988bf-86f1-41af-91ab-2d7cd011db47" } -} \ No newline at end of file +} diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTests.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTests.cs index b77dbceda8eb..3f536d8054aa 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTests.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTests.cs @@ -15,7 +15,7 @@ namespace Azure.ResourceManager.KeyVault.Tests public class VaultOperationsTests : VaultOperationsTestsBase { public VaultOperationsTests(bool isAsync) - : base(isAsync) + : base(isAsync)//, RecordedTestMode.Record) { } @@ -33,7 +33,7 @@ public async Task KeyVaultManagementVaultCreateUpdateDelete() { VaultProperties.EnableSoftDelete = null; - var parameters = new VaultCreateOrUpdateParameters(Location, VaultProperties); + var parameters = new VaultCreateOrUpdateParameters(LocationToUse, VaultProperties); parameters.Tags.InitializeFrom(Tags); var rawVault = await VaultCollection.CreateOrUpdateAsync(VaultName, parameters).ConfigureAwait(false); @@ -45,7 +45,7 @@ public async Task KeyVaultManagementVaultCreateUpdateDelete() ResGroupName, TestEnvironment.SubscriptionId, TenantIdGuid, - Location, + LocationToUse, "A", SkuName.Standard, true, @@ -70,7 +70,7 @@ public async Task KeyVaultManagementVaultCreateUpdateDelete() createdVault.Properties.AccessPolicies.Add(AccessPolicy); createdVault.Properties.Sku.Name = SkuName.Premium; - parameters = new VaultCreateOrUpdateParameters(Location, createdVault.Properties); + parameters = new VaultCreateOrUpdateParameters(LocationToUse, createdVault.Properties); parameters.Tags.InitializeFrom(Tags); var rawUpdateVault = await VaultCollection.CreateOrUpdateAsync(VaultName, parameters).ConfigureAwait(false); @@ -81,7 +81,7 @@ public async Task KeyVaultManagementVaultCreateUpdateDelete() ResGroupName, TestEnvironment.SubscriptionId, TenantIdGuid, - Location, + LocationToUse, "A", SkuName.Premium, true, @@ -100,7 +100,7 @@ public async Task KeyVaultManagementVaultCreateUpdateDelete() ResGroupName, TestEnvironment.SubscriptionId, TenantIdGuid, - Location, + LocationToUse, "A", SkuName.Premium, true, @@ -143,7 +143,7 @@ public async Task KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy AccessPolicy.ApplicationId = Guid.Parse(TestEnvironment.ClientId); VaultProperties.EnableSoftDelete = null; - var parameters = new VaultCreateOrUpdateParameters(Location, VaultProperties); + var parameters = new VaultCreateOrUpdateParameters(LocationToUse, VaultProperties); parameters.Tags.InitializeFrom(Tags); var createVault = await VaultCollection.CreateOrUpdateAsync( @@ -157,7 +157,7 @@ public async Task KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy ResGroupName, TestEnvironment.SubscriptionId, TenantIdGuid, - Location, + LocationToUse, "A", SkuName.Standard, true, @@ -175,7 +175,7 @@ public async Task KeyVaultManagementVaultTestCompoundIdentityAccessControlPolicy ResGroupName, TestEnvironment.SubscriptionId, TenantIdGuid, - Location, + LocationToUse, "A", SkuName.Standard, true, @@ -206,7 +206,7 @@ public async Task KeyVaultManagementListVaults() for (int i = 0; i < n; i++) { string vaultName = Recording.GenerateAssetName("sdktestvault"); - var parameters = new VaultCreateOrUpdateParameters(Location, VaultProperties); + var parameters = new VaultCreateOrUpdateParameters(LocationToUse, VaultProperties); parameters.Tags.InitializeFrom(Tags); var createdVault = await VaultCollection.CreateOrUpdateAsync(vaultName, parameters).ConfigureAwait(false); var vaultValue = createdVault.Value; @@ -239,7 +239,7 @@ public async Task KeyVaultManagementListVaults() [Test] public async Task KeyVaultManagementRecoverDeletedVault() { - var parameters = new VaultCreateOrUpdateParameters(Location, VaultProperties); + var parameters = new VaultCreateOrUpdateParameters(LocationToUse, VaultProperties); parameters.Tags.InitializeFrom(Tags); var createdVault = await VaultCollection.CreateOrUpdateAsync(VaultName, parameters).ConfigureAwait(false); var vaultValue = createdVault.Value; @@ -253,7 +253,7 @@ public async Task KeyVaultManagementRecoverDeletedVault() await VaultCollection.GetAsync(VaultName); }); - parameters = new VaultCreateOrUpdateParameters(Location, VaultProperties); + parameters = new VaultCreateOrUpdateParameters(LocationToUse, VaultProperties); parameters.Tags.InitializeFrom(Tags); // Recover in default mode var recoveredRawVault = await VaultCollection.CreateOrUpdateAsync(VaultName,parameters).ConfigureAwait(false); @@ -267,7 +267,7 @@ public async Task KeyVaultManagementRecoverDeletedVault() await getResult.Value.DeleteAsync(); VaultProperties.CreateMode = CreateMode.Recover; - parameters = new VaultCreateOrUpdateParameters(Location, VaultProperties); + parameters = new VaultCreateOrUpdateParameters(LocationToUse, VaultProperties); // Recover in recover mode var recoveredRawVault2 = await VaultCollection.CreateOrUpdateAsync(VaultName, parameters).ConfigureAwait(false); @@ -289,7 +289,7 @@ public async Task KeyVaultManagementListDeletedVaults() int n = 3; List resourceIds = new List(); List vaultList = new List(); - var parameters = new VaultCreateOrUpdateParameters(Location, VaultProperties); + var parameters = new VaultCreateOrUpdateParameters(LocationToUse, VaultProperties); parameters.Tags.InitializeFrom(Tags); for (int i = 0; i < n; i++) { @@ -305,7 +305,7 @@ public async Task KeyVaultManagementListDeletedVaults() await createdVault.DeleteAsync().ConfigureAwait(false); - var deletedVault = await DeletedVaultCollection.GetAsync(Location, vaultName).ConfigureAwait(false); + var deletedVault = await DeletedVaultCollection.GetAsync(LocationToUse, vaultName).ConfigureAwait(false); Assert.IsTrue(deletedVault.Value.Data.Name.Equals(createdVault.Data.Name)); } diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTestsBase.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTestsBase.cs index cf4359bde95a..47ddd8ac7de3 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTestsBase.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTestsBase.cs @@ -9,6 +9,7 @@ using Azure.Graph.Rbac; using Azure.ResourceManager.KeyVault.Models; using Azure.ResourceManager.Resources; +using Azure.ResourceManager.Resources.Models; using Azure.ResourceManager.TestFramework; namespace Azure.ResourceManager.KeyVault.Tests @@ -23,7 +24,7 @@ public abstract class VaultOperationsTestsBase : ManagementRecordedTestBase