Skip to content

Commit 408e4f6

Browse files
committed
Fix: variable casing and improve logging messages in Invoke-RemoveStandardTemplate function
1 parent 80a1931 commit 408e4f6

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-RemoveStandardTemplate.ps1

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,23 @@ Function Invoke-RemoveStandardTemplate {
1212

1313
$APIName = $Request.Params.CIPPEndpoint
1414
$Headers = $Request.Headers
15-
Write-LogMessage -Headers $Headers -API $APINAME -message 'Accessed this API' -Sev 'Debug'
15+
Write-LogMessage -Headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
1616

1717
# Interact with query parameters or the body of the request.
1818
$ID = $Request.Body.ID ?? $Request.Query.ID
1919
try {
2020
$Table = Get-CippTable -tablename 'templates'
21-
$Filter = "PartitionKey eq 'StandardsTemplateV2' and RowKey eq '$id'"
22-
$ClearRow = Get-CIPPAzDataTableEntity @Table -Filter $Filter -Property PartitionKey, RowKey
23-
Remove-AzDataTableEntity -Force @Table -Entity $clearRow
24-
$Result = "Removed Standards Template named $($ClearRow.name) and id $($id)"
25-
Write-LogMessage -Headers $Headers -API $APINAME -message $Result -Sev 'Info'
21+
$Filter = "PartitionKey eq 'StandardsTemplateV2' and RowKey eq '$ID'"
22+
$ClearRow = Get-CIPPAzDataTableEntity @Table -Filter $Filter -Property PartitionKey, RowKey, JSON
23+
$TemplateName = (ConvertFrom-Json -InputObject $ClearRow.JSON).templateName
24+
Remove-AzDataTableEntity -Force @Table -Entity $ClearRow
25+
$Result = "Removed Standards Template named: '$($TemplateName)' with id: $($ID)"
26+
Write-LogMessage -Headers $Headers -API $APIName -message $Result -Sev Info
2627
$StatusCode = [HttpStatusCode]::OK
2728
} catch {
2829
$ErrorMessage = Get-CippException -Exception $_
29-
$Result = "Failed to remove Standards template $ID. $($ErrorMessage.NormalizedError)"
30-
Write-LogMessage -Headers $Headers -API $APINAME -message $Result -Sev 'Error' -LogData $ErrorMessage
30+
$Result = "Failed to remove Standards template: $TemplateName with id: $ID. Error: $($ErrorMessage.NormalizedError)"
31+
Write-LogMessage -Headers $Headers -API $APIName -message $Result -Sev Error -LogData $ErrorMessage
3132
$StatusCode = [HttpStatusCode]::InternalServerError
3233
}
3334

0 commit comments

Comments
 (0)