Merge pull request #518 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -101,7 +101,7 @@ function Invoke-ExecApiClient {
         'GetAzureConfiguration' {
             $Owner = $env:WEBSITE_OWNER_NAME
             Write-Information "Owner: $Owner"
-            if ($Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {
+            if ($env:WEBSITE_SKU -ne 'FlexConsumption' -and $Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {
                 $RGName = $Matches.RGName
             } else {
                 $RGName = $env:WEBSITE_RESOURCE_GROUP
@@ -123,7 +123,7 @@ function Invoke-ExecApiClient {
         'SaveToAzure' {
             $TenantId = $env:TenantID
             $Owner = $env:WEBSITE_OWNER_NAME
-            if ($Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {
+            if ($env:WEBSITE_SKU -ne 'FlexConsumption' -and $Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {
                 $RGName = $Matches.RGName
             } else {
                 $RGName = $env:WEBSITE_RESOURCE_GROUP

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

@@ -1,4 +1,4 @@
-Function Invoke-ExecBackendURLs {
+function Invoke-ExecBackendURLs {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -14,7 +14,7 @@ Function Invoke-ExecBackendURLs {
     Write-Host 'PowerShell HTTP trigger function processed a request.'
 
     $Owner = $env:WEBSITE_OWNER_NAME
-    if ($Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {
+    if ($env:WEBSITE_SKU -ne 'FlexConsumption' -and $Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {
         $RGName = $Matches.RGName
     } else {
         $RGName = $env:WEBSITE_RESOURCE_GROUP