Skip to content

Commit 63ca7b1

Browse files
mentat9BethanyZhou
andauthored
Make Get-AzPolicyDefinitions fail if -Id is nonexistent (#21041)
* Make Get-AzPolicyDefinitions fail if -Id is nonexistent * Move changelog comments to correct file * Remove extra files pushed by mistake * Update src/Resources/Resources/ChangeLog.md --------- Co-authored-by: Beisi Zhou <[email protected]>
1 parent 2a0bdbf commit 63ca7b1

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private async Task<ResponseWithContinuation<JObject[]>> GetResources(ListFilter
127127
}
128128
catch (ErrorResponseMessageException ex)
129129
{
130-
if (!ex.Message.StartsWith("PolicyDefinitionNotFound", StringComparison.OrdinalIgnoreCase))
130+
if (!ex.Message.StartsWith("PolicyDefinitionNotFound", StringComparison.OrdinalIgnoreCase) || string.IsNullOrEmpty(this.Name))
131131
{
132132
throw;
133133
}

src/Resources/Resources.Test/ScenarioTests/PolicyTests.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2045,7 +2045,6 @@ function Test-GetPolicyDefinitionParameters
20452045
Assert-ThrowsContains { Get-AzPolicyDefinition -Name $someName -Id $someId -Custom } $parameterSetError
20462046

20472047
# validate remaining parameter combinations starting with -Id
2048-
$ok = Get-AzureRmPolicyDefinition -Id $goodId
20492048
Assert-ThrowsContains { Get-AzPolicyDefinition -Id $goodId -ManagementGroupName $someManagementGroup } $parameterSetError
20502049
Assert-ThrowsContains { Get-AzPolicyDefinition -Id $goodId -SubscriptionId $subscriptionId } $parameterSetError
20512050
Assert-ThrowsContains { Get-AzPolicyDefinition -Id $goodId -BuiltIn } $parameterSetError

src/Resources/Resources/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-->
2020

2121
## Upcoming Release
22+
* Updated behavior of Get-AzPolicyDefinition which previously returned all definitions when -Id was provided with a nonexistent policy definition id. Fixed to correctly throw a 404 exception in this case.
2223

2324
## Version 6.5.2
2425
* Fixed query issue when objectId in assignment is empty for `Get-DenyAssignment`

0 commit comments

Comments
 (0)