fix resource group name

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecApiClient.ps1

@@ -99,10 +99,13 @@ function Invoke-ExecApiClient {
             }
         }
         'GetAzureConfiguration' {
+            $Owner = $env:WEBSITE_OWNER_NAME
             $RGName = $env:WEBSITE_RESOURCE_GROUP
+            if (!$RGName) {
+                $RGName = $Owner -split '\+' | Select-Object -Last 1
+                $RGName = $RGName -replace '-[^-]+$', ''
+            }
             $FunctionAppName = $env:WEBSITE_SITE_NAME
-            Write-Information "All environment vars: "
-            Write-Information ([System.Environment]::GetEnvironmentVariables() | ConvertTo-Json -Depth 10)
             try {
                 $APIClients = Get-CippApiAuth -RGName $RGName -FunctionAppName $FunctionAppName
                 $Results = $ApiClients
@@ -119,6 +122,10 @@ function Invoke-ExecApiClient {
         'SaveToAzure' {
             $TenantId = $env:TenantId
             $RGName = $env:WEBSITE_RESOURCE_GROUP
+            if (!$RGName) {
+                $RGName = $Owner -split '\+' | Select-Object -Last 1
+                $RGName = $RGName -replace '-[^-]+$', ''
+            }
             $FunctionAppName = $env:WEBSITE_SITE_NAME
             $AllClients = Get-CIPPAzDataTableEntity @Table -Filter 'Enabled eq true' | Where-Object { ![string]::IsNullOrEmpty($_.RowKey) }
             $ClientIds = $AllClients.RowKey

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecBackendURLs.ps1

@@ -18,16 +18,23 @@ Function Invoke-ExecBackendURLs {
     # Write to the Azure Functions log stream.
     Write-Host 'PowerShell HTTP trigger function processed a request.'
 
+    $RGName = $env:WEBSITE_RESOURCE_GROUP
+    if (!$RGName) {
+        $Owner = $env:WEBSITE_OWNER_NAME
+        $RGName = $Owner -split '\+' | Select-Object -Last 1
+        $RGName = $RGName -replace '-[^-]+$', ''
+    }
+
     $results = [PSCustomObject]@{
-        ResourceGroup      = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$env:WEBSITE_RESOURCE_GROUP/overview"
-        KeyVault           = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$env:WEBSITE_RESOURCE_GROUP/providers/Microsoft.KeyVault/vaults/$($env:WEBSITE_SITE_NAME)/secrets"
-        FunctionApp        = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$env:WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/sites/$($env:WEBSITE_SITE_NAME)/appServices"
-        FunctionConfig     = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$env:WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/sites/$($env:WEBSITE_SITE_NAME)/configuration"
-        FunctionDeployment = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$env:WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/sites/$($env:WEBSITE_SITE_NAME)/vstscd"
-        SWADomains         = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$env:WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/staticSites/$SWAName/customDomains"
-        SWARoles           = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$env:WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/staticSites/$SWAName/roleManagement"
+        ResourceGroup      = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$RGName/overview"
+        KeyVault           = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$RGName/providers/Microsoft.KeyVault/vaults/$($env:WEBSITE_SITE_NAME)/secrets"
+        FunctionApp        = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$RGName/providers/Microsoft.Web/sites/$($env:WEBSITE_SITE_NAME)/appServices"
+        FunctionConfig     = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$RGName/providers/Microsoft.Web/sites/$($env:WEBSITE_SITE_NAME)/configuration"
+        FunctionDeployment = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$RGName/providers/Microsoft.Web/sites/$($env:WEBSITE_SITE_NAME)/vstscd"
+        SWADomains         = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$RGName/providers/Microsoft.Web/staticSites/$SWAName/customDomains"
+        SWARoles           = "https://portal.azure.com/#@Go/resource/subscriptions/$Subscription/resourceGroups/$RGName/providers/Microsoft.Web/staticSites/$SWAName/roleManagement"
         Subscription       = $Subscription
-        RGName             = $env:WEBSITE_RESOURCE_GROUP
+        RGName             = $RGName
         FunctionName       = $env:WEBSITE_SITE_NAME
         SWAName            = $SWAName
     }