Skip to content

[Fixes] Update LAW force delete #2490

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.

Sign up for GitHub

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
eriqua merged 3 commits into from
Dec 21, 2022
Merged

[Fixes] Update LAW force delete #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26d0b0f
direct purge
eriqua Dec 21, 2022
a04e99a
no get
eriqua Dec 21, 2022
8ba2fad
cleanup
eriqua Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,30 +113,6 @@ function Invoke-ResourcePostRemoval {
}
break
}
'Microsoft.OperationalInsights/workspaces' {
$subscriptionId = $resourceId.Split('/')[2]
$resourceGroupName = $resourceId.Split('/')[4]
$resourceName = Split-Path $ResourceId -Leaf
# Fetch service in soft-delete state
$getPath = '/subscriptions/{0}/providers/Microsoft.OperationalInsights/deletedWorkspaces?api-version=2020-03-01-preview' -f $subscriptionId
$getRequestInputObject = @{
Method = 'GET'
Path = $getPath
}
$softDeletedService = ((Invoke-AzRestMethod @getRequestInputObject).Content | ConvertFrom-Json).value | Where-Object { $_.id -eq $resourceId -and $_.name -eq $resourceName }
if ($softDeletedService) {
# Recover service
$location = $softDeletedService.location
if ($PSCmdlet.ShouldProcess(('Log analytics workspace [{0}]' -f $resourceId), 'Recover')) {
$recoveredWorkspace = New-AzOperationalInsightsWorkspace -ResourceGroupName $resourceGroupName -Name $resourceName -Location $location
}
# Purge service
if ($PSCmdlet.ShouldProcess(('Log analytics workspace with ID [{0}]' -f $resourceId), 'Purge')) {
$recoveredWorkspace | Remove-AzOperationalInsightsWorkspace -ForceDelete -Force
}
}
break
}
'Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems' {
# Remove protected VM
# Required if e.g. a VM was listed in an RSV and only that VM is removed
Expand Down
10 changes: 10 additions & 0 deletions utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,16 @@ function Invoke-ResourceRemoval {
$null = Remove-AzResource -ResourceId $resourceId -Force -ErrorAction 'Stop'
break
}
'Microsoft.OperationalInsights/workspaces' {
$resourceGroupName = $resourceId.Split('/')[4]
$resourceName = Split-Path $resourceId -Leaf
# Force delete workspace (cannot be recovered)
if ($PSCmdlet.ShouldProcess("Log Analytics Workspace [$resourceName]", 'Remove')) {
$null = Remove-AzOperationalInsightsWorkspace -ResourceGroupName $resourceGroupName -Name $resourceName -Force -ForceDelete
}
break
}

### CODE LOCATION: Add custom removal action here
Default {
$null = Remove-AzResource -ResourceId $resourceId -Force -ErrorAction 'Stop'
Expand Down