Cleanup functions and DNS tweaks

Removing unused modules
Removing ListDomainTests function
Removing old AzTable code
Adding DNS Config to tables

Author: JohnDuprey

DNSHelper.psm1

@@ -29,15 +29,22 @@ function Resolve-DnsHttpsQuery {
         [string]$RecordType = 'A'
     )
 
-    if (Test-Path -Path 'Config\DnsConfig.json') {
-        try {
-            $Config = Get-Content 'Config\DnsConfig.json' | ConvertFrom-Json 
-            $Resolver = $Config.Resolver
-        }
-        catch { $Resolver = 'Google' }
+    $ConfigTable = Get-CippTable -tablename Config
+    $Filter = "PartitionKey eq 'Domains' and RowKey eq 'Domains'"
+    $Config = Get-AzDataTableEntity @ConfigTable -Filter $Filter
+
+    $ValidResolvers = @('Google', 'CloudFlare', 'Quad9')
+    if ($ValidResolvers -contains $Config.Resolver) {
+        $Resolver = $Config.Resolver
     }
     else {
         $Resolver = 'Google'
+        $Config = @{
+            PartitionKey = 'Domains'
+            RowKey       = 'Domains'
+            Resolver     = $Resolver
+        }
+        Add-AzDataTableEntity @ConfigTable -Entity $Config -Force
     }
 
     switch ($Resolver) {

ExecDnsConfig/run.ps1

@@ -13,27 +13,22 @@ $ValidResolvers = @(
     'Quad9'
 )
 
-$ConfigPath = 'Config/DnsConfig.json'
-
 # Write to the Azure Functions log stream.
 Write-Host 'PowerShell HTTP trigger function processed a request.'
 
 $StatusCode = [HttpStatusCode]::OK
 try {
-    $Config = ''
-    if (Test-Path $ConfigPath) {
-        try {
-            # Try to parse config file and catch exceptions
-            $Config = Get-Content -Path $ConfigPath | ConvertFrom-Json
-        }
-        catch {}
-    }
-    if ($Config -eq '') {
-        New-Item 'Config' -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
-        $Config = [PSCustomObject]@{
-            Resolver = 'Google'
+    $ConfigTable = Get-CippTable -tablename Config
+    $Filter = "PartitionKey eq 'Domains' and RowKey eq 'Domains'"
+    $Config = Get-AzDataTableEntity @ConfigTable -Filter $Filter
+
+    if ($ValidResolvers -notcontains $Config.Resolver) {
+        $Config = @{
+            PartitionKey = 'Domains'
+            RowKey       = 'Domains'
+            Resolver     = 'Google'
         }
-        $Config | ConvertTo-Json | Set-Content $ConfigPath
+        Add-AzDataTableEntity @ConfigTable -Entity $Config -Force
     }
 
     $updated = $false
@@ -47,15 +42,16 @@ try {
                     $Config.Resolver = $Resolver
                 }
                 catch {
-                    $Config = [PSCustomObject]@{
+                    $Config = @{
                         Resolver = $Resolver
                     }
                 }
                 $updated = $true
             }
         }
         if ($updated) {
-            $Config | ConvertTo-Json | Set-Content $ConfigPath
+            Add-AzDataTableEntity @ConfigTable -Entity $Config -Force
+            #$Config | ConvertTo-Json | Set-Content $ConfigPath
             Write-LogMessage -API $APINAME -tenant 'Global' -user $request.headers.'x-ms-client-principal' -message 'DNS configuration updated' -Sev 'Info' 
             $body = [pscustomobject]@{'Results' = 'Success: DNS configuration updated.' }
         }
@@ -65,7 +61,7 @@ try {
         }
     }
     elseif ($Request.Query.Action -eq 'GetConfig') {
-        $body = $Config
+        $body = [pscustomobject]$Config
         Write-LogMessage -API $APINAME -tenant 'Global' -user $request.headers.'x-ms-client-principal' -message 'Retrieved DNS configuration' -Sev 'Info' 
     }
 }

GraphHelper.psm1

@@ -3,16 +3,6 @@ function Get-CIPPTable {
     param (
         $tablename = 'CippLogs'
     )
-    #$context = New-AzStorageContext -ConnectionString $ENV:AzureWebJobsStorage
-    #try { 
-    #    $StorageTable = Get-AzStorageTable -Context $context -Name $tablename -ErrorAction Stop
-    #}
-    #catch {
-    #    New-AzStorageTable -Context $context -Name $tablename | Out-Null
-    #    $StorageTable = Get-AzStorageTable -Context $context -Name $tablename
-    #}
-    #return $StorageTable.CloudTable
-
     @{
         ConnectionString       = $ENV:AzureWebJobsStorage
         TableName              = $tablename