-
Notifications
You must be signed in to change notification settings - Fork 4.2k
[KeyVault] Fix New-AzKeyVault RequestDisallowedByPolicy error by explicitly setting enableSoftDelete in the request body #29497
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
notyashhh
merged 2 commits into
Azure:main
from
rahulalapati43:fix/keyvault-soft-delete-policy
May 11, 2026
+184
−1
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
97 changes: 97 additions & 0 deletions
97
src/KeyVault/KeyVault.Test/UnitTests/NewAzureKeyVaultSoftDeleteTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // Copyright Microsoft Corporation | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // ---------------------------------------------------------------------------------- | ||
|
|
||
| using Microsoft.Azure.Commands.KeyVault.Models; | ||
| using Microsoft.Azure.Management.KeyVault; | ||
| using Microsoft.Azure.Management.KeyVault.Models; | ||
| using Microsoft.Rest.Azure; | ||
| using Microsoft.WindowsAzure.Commands.ScenarioTest; | ||
| using Moq; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using Xunit; | ||
|
|
||
| namespace Microsoft.Azure.Commands.KeyVault.Test.UnitTests | ||
| { | ||
| /// <summary> | ||
| /// Verify that New-AzKeyVault explicitly sets EnableSoftDelete=true in the request body | ||
| /// so that Azure Policy checks requiring the property to be present are satisfied. | ||
| /// </summary> | ||
| public class NewAzureKeyVaultSoftDeleteTests : KeyVaultUnitTestBase | ||
| { | ||
| [Fact] | ||
| [Trait(Category.AcceptanceType, Category.CheckIn)] | ||
| public void CreateNewVault_Sets_EnableSoftDelete_True_In_VaultProperties() | ||
| { | ||
| // Arrange | ||
| VaultCreateOrUpdateParameters capturedParameters = null; | ||
| var mockVaultsOperations = new Mock<IVaultsOperations>(); | ||
| mockVaultsOperations | ||
| .Setup(v => v.CreateOrUpdateWithHttpMessagesAsync( | ||
| It.IsAny<string>(), | ||
| It.IsAny<string>(), | ||
| It.IsAny<VaultCreateOrUpdateParameters>(), | ||
| It.IsAny<Dictionary<string, List<string>>>(), | ||
| It.IsAny<CancellationToken>())) | ||
| .Callback<string, string, VaultCreateOrUpdateParameters, Dictionary<string, List<string>>, CancellationToken>( | ||
| (rg, name, parameters, headers, ct) => capturedParameters = parameters) | ||
| .Returns(Task.FromResult(new AzureOperationResponse<Vault> | ||
| { | ||
| Body = new Vault( | ||
| properties: new VaultProperties | ||
| { | ||
| TenantId = Guid.NewGuid(), | ||
| Sku = new Sku(SkuName.Standard), | ||
| AccessPolicies = new AccessPolicyEntry[] { }, | ||
| VaultUri = "https://testvault.vault.azure.net" | ||
| }, | ||
| name: "testvault", | ||
| location: "eastus") | ||
| })); | ||
|
|
||
| var mockClient = new Mock<IKeyVaultManagementClient>(); | ||
| mockClient.Setup(c => c.Vaults).Returns(mockVaultsOperations.Object); | ||
|
|
||
| var vaultManagementClient = new VaultManagementClient(); | ||
| // Use reflection to set the private KeyVaultManagementClient property | ||
| var prop = typeof(VaultManagementClient).GetProperty("KeyVaultManagementClient", | ||
| System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); | ||
| prop.SetValue(vaultManagementClient, mockClient.Object); | ||
|
|
||
| var createParameters = new VaultCreationOrUpdateParameters | ||
| { | ||
| Name = "testvault", | ||
| ResourceGroupName = "testrg", | ||
| Location = "eastus", | ||
| SkuFamilyName = "A", | ||
| SkuName = "Standard", | ||
| TenantId = Guid.NewGuid(), | ||
| EnableSoftDelete = true, | ||
| SoftDeleteRetentionInDays = 90, | ||
| NetworkAcls = new NetworkRuleSet() | ||
| }; | ||
|
|
||
| // Act | ||
| vaultManagementClient.CreateNewVault(createParameters); | ||
|
|
||
| // Assert | ||
| Assert.NotNull(capturedParameters); | ||
| Assert.True(capturedParameters.Properties.EnableSoftDelete, | ||
| "CreateNewVault must set EnableSoftDelete=true in the request body " + | ||
| "to satisfy Azure Policy checks"); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.