AzTable to AzBobbyTables Conversion

- AzTable conversion Add new Activity_ functions for getting / updating rows Convert all AzTableRow functions Optimization on DomainAnalyser orchestrator to prevent race condition with log entries - Misc Update all Log-Request functions to Write-LogMessage
Sab66 · Jul 20, 2022 · 35a3504 · 35a3504
1 parent 53802fb
commit 35a3504
Show file tree

Hide file tree

Showing 213 changed files with 2,344 additions and 1,688 deletions.
diff --git a/Activity_AddOrUpdateTableRows/function.json b/Activity_AddOrUpdateTableRows/function.json
@@ -0,0 +1,9 @@
+{
+  "bindings": [
+    {
+      "name": "TableParams",
+      "type": "activityTrigger",
+      "direction": "in"
+    }
+  ]
+}
diff --git a/Activity_AddOrUpdateTableRows/run.ps1 b/Activity_AddOrUpdateTableRows/run.ps1
@@ -0,0 +1,3 @@
+param($TableParams)
+
+Add-AzDataTableEntity @TableParams
diff --git a/Activity_GetAllTableRows/function.json b/Activity_GetAllTableRows/function.json
@@ -0,0 +1,9 @@
+{
+  "bindings": [
+    {
+      "name": "name",
+      "type": "activityTrigger",
+      "direction": "in"
+    }
+  ]
+}
diff --git a/Activity_GetAllTableRows/run.ps1 b/Activity_GetAllTableRows/run.ps1
@@ -0,0 +1,6 @@
+param($name)
+
+$Table = Get-CippTable -tablename $name
+$Rows = Get-AzDataTableEntity @Table
+
+Write-Output $Rows
diff --git a/AddAPDevice/run.ps1 b/AddAPDevice/run.ps1
@@ -4,7 +4,7 @@ using namespace System.Net
 param($Request, $TriggerMetadata)
 
 $APIName = $TriggerMetadata.FunctionName
-Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
 
 
 # Write to the Azure Functions log stream.
@@ -23,12 +23,12 @@ $Result = try {
     $NewStatus = New-GraphgetRequest -uri "https://api.partnercenter.microsoft.com/v1/customers/$tenantfilter/DeviceBatches" -scope 'https://api.partnercenter.microsoft.com/user_impersonation'
     if ($Newstatus.totalcount -eq $CurrentStatus.totalcount) { throw "We could not find the new autopilot device. Please check if your input is correct." }
     Write-Host $CurrentStatus.Items
-    Log-Request -user $request.headers.'x-ms-client-principal' -API $APIName -tenant $($Request.body.TenantFilter) -message "Created Autopilot devices group. Group ID is $GroupName" -Sev "Info"
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APIName -tenant $($Request.body.TenantFilter) -message "Created Autopilot devices group. Group ID is $GroupName" -Sev "Info"
     "Created Autopilot devices group for $($Request.body.TenantFilter). Group ID is $GroupName"
 }
 catch {
     "$($Request.body.TenantFilter): Failed to create autopilot devices. $($_.Exception.Message)"
-    Log-Request -user $request.headers.'x-ms-client-principal' -API $APIName -tenant $($Request.body.TenantFilter) -message "Failed to create autopilot devices. $($_.Exception.Message)" -Sev "Error"
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APIName -tenant $($Request.body.TenantFilter) -message "Failed to create autopilot devices. $($_.Exception.Message)" -Sev "Error"
 }
 
 $body = [pscustomobject]@{"Results" = $Result }

diff --git a/AddAlert/run.ps1 b/AddAlert/run.ps1
@@ -4,7 +4,7 @@ using namespace System.Net
 param($Request, $TriggerMetadata)
 
 $APIName = $TriggerMetadata.FunctionName
-Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
 
 $Tenants = ($Request.body | Select-Object Select_*).psobject.properties.value
 $Results = foreach ($Tenant in $tenants) {
@@ -29,22 +29,25 @@ $Results = foreach ($Tenant in $tenants) {
             UnusedLicenses  = [bool]$Request.body.UnusedLicenses
             AppSecretExpiry = [bool]$Request.body.AppSecretExpiry
             type            = 'Alert'
+            RowKey          = $TenantID 
+            PartitionKey    = 'Alert'
         }
 
-        $TableRow = @{
-            table          = (get-cipptable -TableName 'SchedulerConfig')
-            rowKey         = $TenantID 
-            partitionKey   = 'Alert'
+        $Table = get-cipptable -TableName 'SchedulerConfig'
+        <#$TableRow = @{
+            table          = ()
             property       = $CompleteObject
             UpdateExisting = $true
-        }
+        }#>
         Write-Host ($TableRow | ConvertTo-Json)
-        Add-AzTableRow @TableRow | Out-Null
+
+        #Add-AzTableRow @TableRow | Out-Null
+        Add-AzDataTableEntity @Table -Entity $CompleteObject -Force
         "Succesfully added Alert for $($Tenant) to queue."
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Succesfully added Alert for $($Tenant) to queue." -Sev 'Info'
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Succesfully added Alert for $($Tenant) to queue." -Sev 'Info'
     }
     catch {
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Failed to add Alert for for $($Tenant) to queue" -Sev 'Error'
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Failed to add Alert for for $($Tenant) to queue" -Sev 'Error'
         "Failed to add Alert for for $($Tenant) to queue $($_.Exception.message)"
     }
 }

diff --git a/AddAutopilotConfig/run.ps1 b/AddAutopilotConfig/run.ps1
@@ -4,7 +4,7 @@ using namespace System.Net
 param($Request, $TriggerMetadata)
 
 $APIName = $TriggerMetadata.FunctionName
-Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
 
 
 # Write to the Azure Functions log stream.
@@ -43,17 +43,17 @@ $results = foreach ($Tenant in $tenants) {
         }
         $Body = ConvertTo-Json -InputObject $ObjBody
         $GraphRequest = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/deviceManagement/windowsAutopilotDeploymentProfiles" -body $body -tenantid $Tenant
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APIName  -tenant $($tenant) -message "Added Autopilot profile $($Displayname)" -Sev "Info"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APIName  -tenant $($tenant) -message "Added Autopilot profile $($Displayname)" -Sev "Info"
         if ($AssignTo) {
             $AssignBody = '{"target":{"@odata.type":"#microsoft.graph.allDevicesAssignmentTarget"}}'
             $assign = New-GraphPOSTRequest -uri  "https://graph.microsoft.com/beta/deviceManagement/windowsAutopilotDeploymentProfiles/$($GraphRequest.id)/assignments" -tenantid $Tenant -type POST -body $AssignBody
-            Log-Request -user $request.headers.'x-ms-client-principal' -API $APIName  -tenant $($tenant) -message "Assigned autopilot profile $($Displayname) to $AssignTo" -Sev "Info"
+            Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APIName  -tenant $($tenant) -message "Assigned autopilot profile $($Displayname) to $AssignTo" -Sev "Info"
         }
         "Succesfully added profile for $($Tenant)"
     }
     catch {
         "Failed to add profile for $($Tenant): $($_.Exception.Message)"
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APIName  -tenant $($tenant)  -message "Failed adding Autopilot Profile $($Displayname). Error: $($_.Exception.Message)" -Sev "Error"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APIName  -tenant $($tenant)  -message "Failed adding Autopilot Profile $($Displayname). Error: $($_.Exception.Message)" -Sev "Error"
         continue
     }
 

diff --git a/AddCAPolicy/run.ps1 b/AddCAPolicy/run.ps1
@@ -4,7 +4,7 @@ using namespace System.Net
 param($Request, $TriggerMetadata)
 
 $APIName = $TriggerMetadata.FunctionName
-Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
 
 $Tenants = ($Request.body | Select-Object Select_*).psobject.properties.value
 if ("AllTenants" -in $Tenants) { $Tenants = (Get-Tenants).DefaultDomainName }
@@ -47,12 +47,12 @@ $results = foreach ($Tenant in $tenants) {
         }
 
         $CreateRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/v1.0/identity/conditionalAccess/policies" -tenantid $tenant -type POST -body $RawJSON
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Added Conditional Access Policy $($Displayname)" -Sev "Error"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Added Conditional Access Policy $($Displayname)" -Sev "Error"
         "Succesfully added Conditional Access Policy for $($Tenant)"
     }
     catch {
         "Failed to add policy for $($Tenant): $($_.Exception.Message)"
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Failed adding Conditional Access Policy $($Displayname). Error: $($_.Exception.Message)" -Sev "Error"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Failed adding Conditional Access Policy $($Displayname). Error: $($_.Exception.Message)" -Sev "Error"
         continue
     }
 

diff --git a/AddCATemplate/run.ps1 b/AddCATemplate/run.ps1
@@ -4,7 +4,7 @@ using namespace System.Net
 param($Request, $TriggerMetadata)
 
 $APIName = $TriggerMetadata.FunctionName
-Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
 Write-Host ($request | ConvertTo-Json -Compress)
 
 try {        
@@ -21,12 +21,12 @@ try {
     }
     $JSON = ($JSON | ConvertTo-Json -Depth 10)
     Set-Content "Config\$($GUID).CATemplate.json" -Value ($JSON) -Force
-    Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Created Transport Rule Template $($Request.body.name) with GUID $GUID" -Sev "Debug"
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Created Transport Rule Template $($Request.body.name) with GUID $GUID" -Sev "Debug"
     $body = [pscustomobject]@{"Results" = "Successfully added template" }
 
 }
 catch {
-    Log-Request -user $request.headers.'x-ms-client-principal'  -API $APINAME -message "Failed to create Transport Rule Template: $($_.Exception.Message)" -Sev "Error"
+    Write-LogMessage -user $request.headers.'x-ms-client-principal'  -API $APINAME -message "Failed to create Transport Rule Template: $($_.Exception.Message)" -Sev "Error"
     $body = [pscustomobject]@{"Results" = "Intune Template Deployment failed: $($_.Exception.Message)" }
 }
 

diff --git a/AddChocoApp/run.ps1 b/AddChocoApp/run.ps1
@@ -4,7 +4,7 @@ using namespace System.Net
 param($Request, $TriggerMetadata)
 
 $APIName = $TriggerMetadata.FunctionName
-Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
 
 
 Write-Host "PowerShell HTTP trigger function processed a request."
@@ -34,10 +34,10 @@ $Results = foreach ($Tenant in $tenants) {
         } | ConvertTo-Json -Depth 15
         $JSONFile = New-Item -Path ".\ChocoApps.Cache\$((New-Guid).GUID)" -Value $CompleteObject -Force -ErrorAction Stop
         "Succesfully added Choco App for $($Tenant) to queue."
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Chocolatey Application $($intunebody.Displayname) queued to add" -Sev "Info"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Chocolatey Application $($intunebody.Displayname) queued to add" -Sev "Info"
     }
     catch {
-        Log-Request -user $request.headers.'x-ms-client-principal'  -API $APINAME -tenant $tenant -message "Failed to add Chocolatey Application $($intunebody.Displayname) to queue" -Sev "Error"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal'  -API $APINAME -tenant $tenant -message "Failed to add Chocolatey Application $($intunebody.Displayname) to queue" -Sev "Error"
         "Failed added Choco App for $($Tenant) to queue"
     }
 }

diff --git a/AddChocoApp_OrchestrationStarter/run.ps1 b/AddChocoApp_OrchestrationStarter/run.ps1
@@ -4,13 +4,13 @@ param($Request, $TriggerMetadata)
 $CurrentlyRunning = Get-Item "ChocoApps.Cache\CurrentlyRunning.txt" -ErrorAction SilentlyContinue | Where-Object -Property LastWriteTime -GT (Get-Date).AddHours(-24)
 if ($CurrentlyRunning) {
     $Results = [pscustomobject]@{"Results" = "Already running. Please wait for the current instance to finish" }
-    Log-request  -API "ChocoApps" -message "Attempted to start upload but an instance was already running." -sev Info
+    Write-LogMessage  -API "ChocoApps" -message "Attempted to start upload but an instance was already running." -sev Info
 }
 else {
     $InstanceId = Start-NewOrchestration -FunctionName 'Applications_Orchestrator'
     Write-Host "Started orchestration with ID = '$InstanceId'"
     $Orchestrator = New-OrchestrationCheckStatusResponse -Request $Request -InstanceId $InstanceId
-    Log-request  -API "ChocoApps" -message "Started uploading applications to tenants" -sev Info
+    Write-LogMessage  -API "ChocoApps" -message "Started uploading applications to tenants" -sev Info
     $Results = [pscustomobject]@{"Results" = "Started application queue" }
 }
 Write-Host ($Orchestrator | ConvertTo-Json)

diff --git a/AddChocoApp_OrchestrationStarterTimer/run.ps1 b/AddChocoApp_OrchestrationStarterTimer/run.ps1
@@ -4,13 +4,13 @@ try {
     $CurrentlyRunning = Get-Item 'ChocoApps.Cache\CurrentlyRunning.txt' -ErrorAction SilentlyContinue | Where-Object -Property LastWriteTime -GT (Get-Date).AddHours(-24)
     if ($CurrentlyRunning) {
         $Results = [pscustomobject]@{'Results' = 'Already running. Please wait for the current instance to finish' }
-        Log-request -API 'ChocoApps' -message 'Attempted to start upload but an instance was already running.' -sev Info
+        Write-LogMessage -API 'ChocoApps' -message 'Attempted to start upload but an instance was already running.' -sev Info
     }
     else {
         $InstanceId = Start-NewOrchestration -FunctionName 'Applications_Orchestrator'
         Write-Host "Started orchestration with ID = '$InstanceId'"
         $Orchestrator = New-OrchestrationCheckStatusResponse -Request $Timer -InstanceId $InstanceId
-        Log-request -API 'ChocoApps' -message 'Started uploading applications to tenants' -sev Info
+        Write-LogMessage -API 'ChocoApps' -message 'Started uploading applications to tenants' -sev Info
         $Results = [pscustomobject]@{'Results' = 'Started running analysis' }
     }
     Write-Host ($Orchestrator | ConvertTo-Json)

diff --git a/AddEnrollment/run.ps1 b/AddEnrollment/run.ps1
@@ -4,7 +4,7 @@ using namespace System.Net
 param($Request, $TriggerMetadata)
 
 $APIName = $TriggerMetadata.FunctionName
-Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
 
 
 # Write to the Azure Functions log stream.
@@ -37,12 +37,12 @@ $results = foreach ($Tenant in $tenants) {
         $ExistingStatusPage = (New-GraphGetRequest -Uri "https://graph.microsoft.com/beta/deviceManagement/deviceEnrollmentConfigurations" -tenantid $Tenant) | Where-Object { $_.id -like "*DefaultWindows10EnrollmentCompletionPageConfiguration" }
         $GraphRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/deviceEnrollmentConfigurations/$($ExistingStatusPage.ID)" -body $body -Type PATCH -tenantid $tenant
         "Succesfully changed default enrollment status page for $($Tenant)"
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Added Autopilot Enrollment Status Page $($Displayname)" -Sev "Info"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Added Autopilot Enrollment Status Page $($Displayname)" -Sev "Info"
 
     }
     catch {
         "Failed to change default enrollment status page for $($Tenant): $($_.Exception.Message)"
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Failed adding Autopilot Enrollment Status Page $($Displayname). Error: $($_.Exception.Message)" -Sev "Error"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $tenant -message "Failed adding Autopilot Enrollment Status Page $($Displayname). Error: $($_.Exception.Message)" -Sev "Error"
         continue
     }
 

diff --git a/AddGroup/run.ps1 b/AddGroup/run.ps1
@@ -4,7 +4,7 @@ using namespace System.Net
 param($Request, $TriggerMetadata)
 
 $APIName = $TriggerMetadata.FunctionName
-Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
 
 $groupobj = $Request.body
 
@@ -36,11 +36,11 @@ try {
         New-ExoRequest -tenantid $groupobj.tenantid -cmdlet "New-DistributionGroup" -cmdParams $params
     }
     $body = [pscustomobject]@{"Results" = "Succesfully created group. $($_.Exception.Message)" }
-    Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($groupobj.tenantid) -message "Created group $($groupobj.displayname) with id $($GraphRequest.id) " -Sev "Info"
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($groupobj.tenantid) -message "Created group $($groupobj.displayname) with id $($GraphRequest.id) " -Sev "Info"
 
 }
 catch {
-    Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($groupobj.tenantid) -message "Group creation API failed. $($_.Exception.Message)" -Sev "Error"
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($groupobj.tenantid) -message "Group creation API failed. $($_.Exception.Message)" -Sev "Error"
     $body = [pscustomobject]@{"Results" = "Failed to create group. $($_.Exception.Message)" }
 
 }

diff --git a/AddIntuneTemplate/run.ps1 b/AddIntuneTemplate/run.ps1
@@ -4,7 +4,7 @@ using namespace System.Net
 param($Request, $TriggerMetadata)
 
 $APIName = $TriggerMetadata.FunctionName
-Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
+Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Accessed this API" -Sev "Debug"
 
 $GUID = (New-Guid).GUID
 try { 
@@ -22,7 +22,7 @@ try {
         } | ConvertTo-Json
         New-Item Config -ItemType Directory -ErrorAction SilentlyContinue
         Set-Content "Config\$($GUID).IntuneTemplate.json" -Value $Object -Force
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Created intune policy template named $($Request.body.displayname) with GUID $GUID" -Sev "Debug"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Created intune policy template named $($Request.body.displayname) with GUID $GUID" -Sev "Debug"
 
         $body = [pscustomobject]@{"Results" = "Successfully added template" }
     }
@@ -71,13 +71,13 @@ try {
         } | ConvertTo-Json
         New-Item Config -ItemType Directory -ErrorAction SilentlyContinue
         Set-Content "Config\$($GUID).IntuneTemplate.json" -Value $Object -Force
-        Log-Request -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Created intune policy template $($Request.body.displayname) with GUID $GUID using an original policy from a tenant" -Sev "Debug"
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -message "Created intune policy template $($Request.body.displayname) with GUID $GUID using an original policy from a tenant" -Sev "Debug"
 
         $body = [pscustomobject]@{"Results" = "Successfully added template" }
     }
 }
 catch {
-    Log-Request -user $request.headers.'x-ms-client-principal'  -API $APINAME -message "Intune Template Deployment failed: $($_.Exception.Message)" -Sev "Error"
+    Write-LogMessage -user $request.headers.'x-ms-client-principal'  -API $APINAME -message "Intune Template Deployment failed: $($_.Exception.Message)" -Sev "Error"
     $body = [pscustomobject]@{"Results" = "Intune Template Deployment failed: $($_.Exception.Message)" }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		param($TableParams)

		Add-AzDataTableEntity @TableParams