Skip to content

Commit 7aa9b34

Browse files
authored
Update (#908)
1 parent 8a73322 commit 7aa9b34

2 files changed

Lines changed: 33 additions & 25 deletions

File tree

src/internal/functions/Get-AzOpsResource.ps1

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,39 @@
2020

2121
process {
2222
Set-AzOpsContext -ScopeObject $ScopeObject
23-
switch ($ScopeObject.Resource) {
24-
# Check if the resource exist
25-
'locks' {
26-
$resource = Get-AzResourceLock -Scope "/subscriptions/$($ScopeObject.Subscription)" -ErrorAction SilentlyContinue | Where-Object { $_.ResourceID -eq $ScopeObject.Scope }
27-
}
28-
'policyAssignments' {
29-
$resource = Get-AzPolicyAssignment -Id $scopeObject.Scope -ErrorAction SilentlyContinue
30-
}
31-
'policyDefinitions' {
32-
$resource = Get-AzPolicyDefinition -Id $scopeObject.Scope -ErrorAction SilentlyContinue
33-
}
34-
'policyExemptions' {
35-
$resource = Get-AzPolicyExemption -Id $scopeObject.Scope -ErrorAction SilentlyContinue
36-
}
37-
'policySetDefinitions' {
38-
$resource = Get-AzPolicySetDefinition -Id $scopeObject.Scope -ErrorAction SilentlyContinue
39-
}
40-
'roleAssignments' {
41-
$resource = Invoke-AzRestMethod -Path "$($scopeObject.Scope)?api-version=2022-04-01" | Where-Object { $_.StatusCode -eq 200 }
42-
}
43-
'resourceGroups' {
44-
$resource = Get-AzResourceGroup -Id $scopeObject.Scope -ErrorAction SilentlyContinue
45-
}
46-
default {
47-
$resource = Get-AzResource -ResourceId $ScopeObject.Scope -ErrorAction SilentlyContinue
23+
try {
24+
switch ($ScopeObject.Resource) {
25+
# Check if the resource exist
26+
'locks' {
27+
$resource = Get-AzResourceLock -Scope "/subscriptions/$($ScopeObject.Subscription)" -ErrorAction SilentlyContinue | Where-Object { $_.ResourceID -eq $ScopeObject.Scope }
28+
}
29+
'policyAssignments' {
30+
$resource = Get-AzPolicyAssignment -Id $scopeObject.Scope -ErrorAction SilentlyContinue
31+
}
32+
'policyDefinitions' {
33+
$resource = Get-AzPolicyDefinition -Id $scopeObject.Scope -ErrorAction SilentlyContinue
34+
}
35+
'policyExemptions' {
36+
$resource = Get-AzPolicyExemption -Id $scopeObject.Scope -ErrorAction SilentlyContinue
37+
}
38+
'policySetDefinitions' {
39+
$resource = Get-AzPolicySetDefinition -Id $scopeObject.Scope -ErrorAction SilentlyContinue
40+
}
41+
'roleAssignments' {
42+
$resource = Invoke-AzRestMethod -Path "$($scopeObject.Scope)?api-version=2022-04-01" | Where-Object { $_.StatusCode -eq 200 }
43+
}
44+
'resourceGroups' {
45+
$resource = Get-AzResourceGroup -Id $scopeObject.Scope -ErrorAction SilentlyContinue
46+
}
47+
default {
48+
$resource = Get-AzResource -ResourceId $ScopeObject.Scope -ErrorAction SilentlyContinue
49+
}
4850
}
4951
}
52+
catch {
53+
Write-AzOpsMessage -LogLevel InternalComment -LogString 'Get-AzOpsResource.Failed' -LogStringValues $_
54+
return
55+
}
5056
if ($resource) {
5157
return $resource
5258
}

src/localized/en-us/Strings.psd1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@
9898
'Get-AzOpsPolicyExemption.ResourceGroup' = 'Retrieving Policy Exemption for Resource Group {0}' # $ScopeObject.ResourceGroup
9999
'Get-AzOpsPolicyExemption.Subscription' = 'Retrieving Policy Exemption for Subscription {0} ({1})' # $ScopeObject.SubscriptionDisplayName, $ScopeObject.Subscription
100100

101+
'Get-AzOpsResource.Failed' = 'Failed retrieving resource with error: {0}' # $_
102+
101103
'Get-AzOpsResourceLock.ResourceGroup' = 'Retrieving Resource Locks for Resource Group {0}' # $ScopeObject.ResourceGroup
102104
'Get-AzOpsResourceLock.Failed' = 'Failed retrieving Resource Locks {0}' # $_
103105
'Get-AzOpsResourceLock.Subscription' = 'Retrieving Resource Locks for Subscription {0} ({1})' # $ScopeObject.SubscriptionDisplayName, $ScopeObject.Subscription

0 commit comments

Comments
 (0)