Skip to content

[pull] dev from KelvinTegelaar:dev #228

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
pull merged 4 commits into from
Apr 26, 2025
Merged

[pull] dev from KelvinTegelaar:dev #228

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
408e4f6
Fix: variable casing and improve logging messages in Invoke-RemoveSta…
kris6673 Apr 24, 2025
fd0495b
fix delete standard template action
JohnDuprey Apr 26, 2025
8f902a8
Merge branch 'dev' into fix-issue-4005
JohnDuprey Apr 26, 2025
e7a4b2c
Merge pull request #1406 from kris6673/fix-issue-4005
JohnDuprey Apr 26, 2025
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
22 changes: 10 additions & 12 deletions ...Core/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-RemoveStandardTemplate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using namespace System.Net

Function Invoke-RemoveStandardTemplate {
function Invoke-RemoveStandardTemplate {
<#
.FUNCTIONALITY
Entrypoint,AnyTenant
Expand All @@ -12,31 +12,29 @@ Function Invoke-RemoveStandardTemplate {

$APIName = $Request.Params.CIPPEndpoint
$Headers = $Request.Headers
Write-LogMessage -Headers $Headers -API $APINAME -message 'Accessed this API' -Sev 'Debug'
Write-LogMessage -Headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'

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


# Associate values to output bindings by calling 'Push-OutputBinding'.
Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
StatusCode = $StatusCode
Body = @{'Results' = $Result }
})


}