Skip to content

Commit

Permalink
Move CippQueue to CippCore
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnDuprey committed Apr 1, 2024
1 parent a17af34 commit 61bcc5a
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 123 deletions.
18 changes: 0 additions & 18 deletions ListCippQueue/function.json

This file was deleted.

23 changes: 23 additions & 0 deletions Modules/CIPPCore/Public/CippQueue/Invoke-ListCippQueue.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
function Invoke-ListCippQueue {
# Input bindings are passed in via param block.
param($Request = $null, $TriggerMetadata)

if ($Request) {
$APIName = $TriggerMetadata.FunctionName
Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'

# Write to the Azure Functions log stream.
Write-Host 'PowerShell HTTP trigger function processed a request.'
}

$CippQueue = Get-CippTable -TableName 'CippQueue'
$CippQueueData = Get-CIPPAzDataTableEntity @CippQueue | Where-Object { ($_.Timestamp.DateTime) -ge (Get-Date).ToUniversalTime().AddHours(-1) } | Sort-Object -Property Timestamp -Descending
if ($request) {
Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
StatusCode = [HttpStatusCode]::OK
Body = @($CippQueueData)
})
} else {
return $CippQueueData
}
}
23 changes: 23 additions & 0 deletions Modules/CIPPCore/Public/CippQueue/New-CippQueueEntry.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
function New-CippQueueEntry {
Param(
$Name,
$Link,
$Reference
)

$CippQueue = Get-CippTable -TableName CippQueue

$QueueEntry = @{
PartitionKey = 'CippQueue'
RowKey = (New-Guid).Guid.ToString()
Name = $Name
Link = $Link
Reference = $Reference
Status = 'Queued'
}
$CippQueue.Entity = $QueueEntry

Add-CIPPAzDataTableEntity @CippQueue

$QueueEntry
}
18 changes: 18 additions & 0 deletions Modules/CIPPCore/Public/CippQueue/Remove-CippQueue.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
function Remove-CippQueue {
# Input bindings are passed in via param block.
param($Request, $TriggerMetadata)

$APIName = $TriggerMetadata.FunctionName
Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'

# Write to the Azure Functions log stream.
Write-Host 'PowerShell HTTP trigger function processed a request.'

$CippQueue = Get-CippTable -TableName 'CippQueue'
Clear-AzDataTable @CippQueue

Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
StatusCode = [HttpStatusCode]::OK
Body = @{Results = @('History cleared') }
})
}
29 changes: 29 additions & 0 deletions Modules/CIPPCore/Public/CippQueue/Update-CippQueueEntry.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
function Update-CippQueueEntry {
Param(
[Parameter(Mandatory = $true)]
$RowKey,
$Status,
$Name
)

$CippQueue = Get-CippTable -TableName CippQueue

if ($RowKey) {
$QueueEntry = Get-CIPPAzDataTableEntity @CippQueue -Filter ("RowKey eq '{0}'" -f $RowKey)

if ($QueueEntry) {
if ($Status) {
$QueueEntry.Status = $Status
}
if ($Name) {
$QueueEntry.Name = $Name
}
Update-AzDataTableEntity @CippQueue -Entity $QueueEntry
$QueueEntry
} else {
return $false
}
} else {
return $false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ function Invoke-ListGraphRequest {
<#
.FUNCTIONALITY
Entrypoint
.ROLE
Core.Read
#>
[CmdletBinding()]
param($Request, $TriggerMetadata)
Expand Down
104 changes: 0 additions & 104 deletions Modules/CippQueue/CippQueue.psm1

This file was deleted.

1 change: 0 additions & 1 deletion Tools/Initialize-DevEnvironment.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ ForEach ($Key in $CIPPSettings.PSObject.Properties.Name) {

Import-Module "$CippRoot\Modules\AzBobbyTables"
Import-Module "$CippRoot\Modules\DNSHealth"
Import-Module "$CippRoot\Modules\CippQueue"
Import-Module "$CippRoot\Modules\CippCore"
Get-CIPPAuthentication

0 comments on commit 61bcc5a

Please sign in to comment.