Merge pull request #620 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

.github/workflows/dev_cippwxl5o.yml

@@ -0,0 +1,30 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cippwxl5o
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+      
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cippwxl5o'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_9C426C0B5ADE471A98CEDB9F88EBD232 }}

Modules/CIPPCore/Public/Clear-CippDurables.ps1

@@ -2,7 +2,6 @@ function Clear-CippDurables {
     [CmdletBinding(SupportsShouldProcess = $true)]
     param()
     # Collect info
-    $StorageContext = New-AzStorageContext -ConnectionString $env:AzureWebJobsStorage
     $FunctionName = $env:WEBSITE_SITE_NAME -replace '-', ''
 
     # Get orchestrators
@@ -16,21 +15,22 @@ function Clear-CippDurables {
     Remove-AzDataTable @QueueTable
     Remove-AzDataTable @CippQueueTasks
 
-    $Queues = Get-AzStorageQueue -Context $StorageContext -Name ('{0}*' -f $FunctionName) | Select-Object -Property Name, ApproximateMessageCount, QueueClient
+    $Queues = Get-CIPPAzStorageQueue -Name ('{0}*' -f $FunctionName)
 
     $RunningQueues = $Queues | Where-Object { $_.ApproximateMessageCount -gt 0 }
     foreach ($Queue in $RunningQueues) {
         Write-Information "- Removing queue: $($Queue.Name), message count: $($Queue.ApproximateMessageCount)"
         if ($PSCmdlet.ShouldProcess($Queue.Name, 'Clear Queue')) {
-            $Queue.QueueClient.ClearMessagesAsync()
+            $null = Clear-CIPPAzStorageQueue -Name $Queue.Name
         }
     }
 
     $BlobContainer = '{0}-largemessages' -f $FunctionName
-    if (Get-AzStorageContainer -Name $BlobContainer -Context $StorageContext -ErrorAction SilentlyContinue) {
+    $containerMatch = Get-CIPPAzStorageContainer -Name $BlobContainer | Where-Object { $_.Name -eq $BlobContainer }
+    if ($containerMatch) {
         Write-Information "- Removing blob container: $BlobContainer"
         if ($PSCmdlet.ShouldProcess($BlobContainer, 'Remove Blob Container')) {
-            Remove-AzStorageContainer -Name $BlobContainer -Context $StorageContext -Confirm:$false -Force
+            $null = Remove-CIPPAzStorageContainer -Name $BlobContainer
         }
     }
 

Modules/CIPPCore/Public/GraphHelper/Clear-CIPPAzStorageQueue.ps1

@@ -0,0 +1,43 @@
+function Clear-CIPPAzStorageQueue {
+    <#
+    .SYNOPSIS
+        Clears all messages from a specified Azure Storage Queue.
+    .DESCRIPTION
+        Issues a DELETE request to /<queue>/messages via New-CIPPAzStorageRequest.
+        Returns a compact object with StatusCode, Headers, and Request Uri.
+    .PARAMETER Name
+        The name of the queue to clear.
+    .PARAMETER ConnectionString
+        Azure Storage connection string. Defaults to $env:AzureWebJobsStorage.
+    .EXAMPLE
+        Clear-CIPPAzStorageQueue -Name 'cippjta72-workitems'
+    #>
+    [CmdletBinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [ValidateNotNullOrEmpty()]
+        [string]$Name,
+
+        [Parameter(Mandatory = $false)]
+        [string]$ConnectionString = $env:AzureWebJobsStorage
+    )
+
+    if ($PSCmdlet.ShouldProcess($Name, 'Clear queue messages')) {
+        try {
+            $headers = @{ Accept = 'application/xml' }
+            $resp = New-CIPPAzStorageRequest -Service 'queue' -Resource ("$Name/messages") -Method 'DELETE' -Headers $headers -ConnectionString $ConnectionString
+            if ($null -eq $resp) {
+                # Fallback when no object returned: assume 204 if no exception was thrown
+                return [PSCustomObject]@{ StatusCode = 204; Headers = @{}; Uri = $null; Name = $Name }
+            }
+            # Normalize to concise output and include the queue name
+            $status = $null; $uri = $null; $hdrs = @{}
+            if ($resp.PSObject.Properties['StatusCode']) { $status = [int]$resp.StatusCode }
+            if ($resp.PSObject.Properties['Uri']) { $uri = $resp.Uri }
+            if ($resp.PSObject.Properties['Headers']) { $hdrs = $resp.Headers }
+            return [PSCustomObject]@{ Name = $Name; StatusCode = $status; Headers = $hdrs; Uri = $uri }
+        } catch {
+            throw $_
+        }
+    }
+}

Modules/CIPPCore/Public/GraphHelper/Get-CIPPAzStorageContainer.ps1

@@ -0,0 +1,155 @@
+function Get-CIPPAzStorageContainer {
+    <#
+    .SYNOPSIS
+        Lists Azure Storage blob containers using Shared Key auth.
+    .DESCRIPTION
+        Uses New-CIPPAzStorageRequest to call the Blob service list API.
+        - Uses server-side 'prefix' when Name ends with a single trailing '*'.
+        - Builds container URIs from the connection string (standard, provided endpoint, emulator).
+        - Passes through container Properties returned by the service.
+    .PARAMETER Name
+        Container name filter. Supports wildcards (e.g., 'cipp*'). Defaults to '*'.
+        When the pattern ends with a single trailing '*' and contains no other wildcards,
+        a server-side 'prefix' is used for listing; otherwise client-side filtering is applied.
+    .PARAMETER ConnectionString
+        Azure Storage connection string. Defaults to $env:AzureWebJobsStorage
+    .EXAMPLE
+        Get-CIPPAzStorageContainer -Name 'cipp*'
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $false, Position = 0)]
+        [string]$Name = '*',
+
+        [Parameter(Mandatory = $false)]
+        [string]$ConnectionString = $env:AzureWebJobsStorage
+    )
+
+    begin {
+        function Parse-ConnString {
+            param([string]$Conn)
+            $map = @{}
+            if (-not $Conn) { return $map }
+            foreach ($part in ($Conn -split ';')) {
+                $p = $part.Trim()
+                if ($p -and $p -match '^(.+?)=(.+)$') { $map[$matches[1]] = $matches[2] }
+            }
+            $map
+        }
+
+        function Get-BlobBaseInfo {
+            param([hashtable]$ConnParams)
+            $service = 'blob'
+            $svcCap = [char]::ToUpper($service[0]) + $service.Substring(1)
+            $endpointKey = "${svcCap}Endpoint"
+            $provided = $ConnParams[$endpointKey]
+            $useDev = ($ConnParams['UseDevelopmentStorage'] -eq 'true')
+            $account = $ConnParams['AccountName']
+
+            if ($provided) {
+                $u = [System.Uri]::new($provided)
+                return [PSCustomObject]@{
+                    Scheme  = $u.Scheme
+                    Host    = $u.Host
+                    Port    = $u.Port
+                    Path    = $u.AbsolutePath.TrimEnd('/')
+                    Mode    = 'ProvidedEndpoint'
+                    Account = $account
+                }
+            }
+
+            if ($useDev) {
+                return [PSCustomObject]@{
+                    Scheme  = 'http'
+                    Host    = '127.0.0.1'
+                    Port    = 10000
+                    Path    = $null
+                    Mode    = 'Emulator'
+                    Account = ($account ?? 'devstoreaccount1')
+                }
+            }
+
+            $suffix = $ConnParams['EndpointSuffix']
+            if (-not $suffix) { $suffix = 'core.windows.net' }
+            $scheme = $ConnParams['DefaultEndpointsProtocol']
+            if (-not $scheme) { $scheme = 'https' }
+            return [PSCustomObject]@{
+                Scheme  = $scheme
+                Host    = "$account.blob.$suffix"
+                Port    = -1
+                Path    = $null
+                Mode    = 'Standard'
+                Account = $account
+            }
+        }
+
+        function Build-ContainerUri {
+            param([pscustomobject]$BaseInfo, [string]$ContainerName)
+            $ub = [System.UriBuilder]::new()
+            $ub.Scheme = $BaseInfo.Scheme
+            $ub.Host = $BaseInfo.Host
+            if ($BaseInfo.Port -and $BaseInfo.Port -ne -1) { $ub.Port = [int]$BaseInfo.Port }
+            switch ($BaseInfo.Mode) {
+                'ProvidedEndpoint' {
+                    $prefixPath = $BaseInfo.Path
+                    if ([string]::IsNullOrEmpty($prefixPath)) { $ub.Path = "/$ContainerName" }
+                    else { $ub.Path = ("$prefixPath/$ContainerName").Replace('//', '/') }
+                }
+                'Emulator' { $ub.Path = "$($BaseInfo.Account)/$ContainerName" }
+                default { $ub.Path = "/$ContainerName" }
+            }
+            $ub.Uri.AbsoluteUri
+        }
+    }
+
+    process {
+        $connParams = Parse-ConnString -Conn $ConnectionString
+        $baseInfo = Get-BlobBaseInfo -ConnParams $connParams
+
+        # Determine server-side prefix optimization
+        $serverPrefix = $null
+        $pattern = $Name
+        if ([string]::IsNullOrEmpty($pattern)) { $pattern = '*' }
+        $canUsePrefix = $false
+        if ($pattern.EndsWith('*') -and $pattern.IndexOfAny([char[]]@('*', '?')) -eq ($pattern.Length - 1)) {
+            $serverPrefix = $pattern.Substring(0, $pattern.Length - 1)
+            $canUsePrefix = $true
+        }
+
+        $listParams = @{ Service = 'blob'; Component = 'list'; ConnectionString = $ConnectionString }
+        if ($canUsePrefix -and $serverPrefix) { $listParams['QueryParams'] = @{ prefix = $serverPrefix } }
+
+        $containers = New-CIPPAzStorageRequest @listParams
+        if (-not $containers) { return @() }
+
+        # Normalize to array of {Name, Properties}
+        $items = @()
+        foreach ($c in $containers) {
+            if ($null -ne $c -and $c.PSObject.Properties['Name']) {
+                $items += [PSCustomObject]@{ Name = $c.Name; Properties = $c.Properties }
+            }
+        }
+
+        # Client-side wildcard filtering when needed
+        if (-not $canUsePrefix) {
+            $items = $items | Where-Object { $_.Name -like $pattern }
+        }
+
+        $results = @()
+        foreach ($it in $items) {
+            $uri = Build-ContainerUri -BaseInfo $baseInfo -ContainerName $it.Name
+            $results += [PSCustomObject]@{
+                Name       = $it.Name
+                Uri        = $uri
+                Properties = $it.Properties
+            }
+        }
+
+        # Optional banner for UX parity when displayed directly
+        if ($results.Count -gt 0 -and $baseInfo.Account) {
+            Write-Host "\n   Storage Account Name: $($baseInfo.Account)\n" -ForegroundColor DarkGray
+        }
+
+        $results
+    }
+}