GDAP Invite durable

bstets1 · Mar 14, 2024 · dbc431a · dbc431a
1 parent 78ae1c8
commit dbc431a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/ExecGDAPInviteApproved_Timer/function.json b/ExecGDAPInviteApproved_Timer/function.json
@@ -7,10 +7,9 @@
       "schedule": "0 0 */3 * * *"
     },
     {
-      "type": "queue",
-      "direction": "out",
-      "name": "gdapinvitequeue",
-      "queueName": "gdapinvitequeue"
+      "name": "starter",
+      "type": "durableClient",
+      "direction": "in"
     }
   ]
 }
diff --git a/ExecGDAPInviteQueue/function.json b/ExecGDAPInviteQueue/function.json
diff --git a/ExecGDAPInviteQueue/run.ps1 b/ExecGDAPInviteQueue/run.ps1
diff --git a/Modules/CIPPCore/Public/Entrypoints/Push-ExecGDAPInviteQueue.ps1 b/Modules/CIPPCore/Public/Entrypoints/Push-ExecGDAPInviteQueue.ps1
@@ -0,0 +1,9 @@
+function Push-ExecGDAPInviteQueue {
+    # Input bindings are passed in via param block.
+    param($Item)
+
+    # Write out the queue message and metadata to the information log.
+    Write-Host "PowerShell queue trigger function processed work item: $($Item.customer.displayName)"
+
+    Set-CIPPGDAPInviteGroups -Relationship $Item
+}
diff --git a/Modules/CIPPCore/Public/Set-CIPPGDAPInviteGroups.ps1 b/Modules/CIPPCore/Public/Set-CIPPGDAPInviteGroups.ps1
@@ -35,12 +35,23 @@ function Set-CIPPGDAPInviteGroups {
         if (($InviteList | Measure-Object).Count -gt 0) {
             $Activations = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships?`$filter=status eq 'active'"
 
-            foreach ($Activation in $Activations) {
+            $Batch = foreach ($Activation in $Activations) {
                 if ($InviteList.RowKey -contains $Activation.id) {
                     Write-Host "Mapping groups for GDAP relationship: $($Activation.customer.displayName) - $($Activation.id)"
-                    Push-OutputBinding -Name gdapinvitequeue -Value $Activation
+                    $Activation | Add-Member -NotePropertyName FunctionName -NotePropertyValue 'ExecGDAPInviteQueue'
+                    $Activation
                 }
             }
+            if (($Batch | Measure-Object).Count -gt 0) {
+                $InputObject = [PSCustomObject]@{
+                    OrchestratorName = 'GDAPInviteOrchestrator'
+                    Batch            = @($Batch)
+                    SkipLog          = $true
+                }
+                #Write-Host ($InputObject | ConvertTo-Json)
+                $InstanceId = Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5)
+                Write-Host "Started GDAP Invite orchestration with ID = '$InstanceId'"
+            }
         }
     }
 }