Skip to content

Commit 36c9eb1

Browse files
Fixed parameter validation logic when uses UseDefaultCVMPolicy (#19368)
* Fixed parameter validation logic when uses UseDefaultCVMPolicy * Update ChangeLog.md Co-authored-by: Yeming Liu <[email protected]>
1 parent 506ebe1 commit 36c9eb1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/KeyVault/KeyVault/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Fixed parameter validation logic of `-UseDefaultCVMPolicy`
2122
* Added parameter `ContentType` in `Import-AzKeyVaultCertificate` to support importing pem via certificate string
2223
* Allowed `DnsName` in `New-AzKeyVaultCertificatePolicy` to accept an empty list [#18954]
2324

src/KeyVault/KeyVault/Commands/Key/AddAzureKeyVaultKey.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,12 @@ private void ValidateParameters()
458458
if (Destination != HsmDestination) { throw new ArgumentException(Resources.KEKMustBeHSM); }
459459
}
460460

461-
if (this.IsParameterBound(c => c.Exportable) && !this.IsParameterBound(c => c.ReleasePolicyPath))
461+
if (this.IsParameterBound(c => c.Exportable) && !this.IsParameterBound(c => c.ReleasePolicyPath) && !this.IsParameterBound(c => c.UseDefaultCVMPolicy))
462462
{
463463
throw new AzPSArgumentException("Exportable keys must have release policy.", nameof(ReleasePolicyPath), ErrorKind.UserError);
464464
}
465-
else if (this.IsParameterBound(c => c.ReleasePolicyPath) && !this.IsParameterBound(c => c.Exportable))
465+
else if ((this.IsParameterBound(c => c.ReleasePolicyPath) || this.IsParameterBound(c => c.UseDefaultCVMPolicy))
466+
&& !this.IsParameterBound(c => c.Exportable))
466467
{
467468
throw new AzPSArgumentException("Non-exportable keys must not have release policy.", nameof(ReleasePolicyPath), ErrorKind.UserError);
468469
}

0 commit comments

Comments
 (0)