From 7efd10ab78778af772cad9a1d47cb6a477ba9748 Mon Sep 17 00:00:00 2001 From: ChrisSidebotham-MSFT <48600046+ChrisSidebotham@users.noreply.github.com> Date: Wed, 13 Dec 2023 16:28:44 +0000 Subject: [PATCH] fix: updating location for capacity constraints (#724) ## Description Following PR #700. Capacity in WestEurope is running low for compute. Qouta limits have been imposed on non priority subscriptions ultimately causing the deployment test to fail. Deployment Test has now been changed to North Europe. And the subscription Quota should be checked before merging. | Pipeline | | -------- | | [![avm.res.web.serverfarm](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.res.web.serverfarm.yml/badge.svg?branch=cs/avm/serverfarms)](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.res.web.serverfarm.yml) | --- avm/res/web/serverfarm/README.md | 12 ++++++------ .../serverfarm/tests/e2e/defaults/main.test.bicep | 4 ++-- avm/res/web/serverfarm/tests/e2e/max/main.test.bicep | 8 ++++---- .../serverfarm/tests/e2e/waf-aligned/main.test.bicep | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/avm/res/web/serverfarm/README.md b/avm/res/web/serverfarm/README.md index 899d0faf72..f41016229b 100644 --- a/avm/res/web/serverfarm/README.md +++ b/avm/res/web/serverfarm/README.md @@ -54,7 +54,7 @@ module serverfarm 'br/public:avm/res/web/serverfarm:' = { tier: 'Premium' } // Non-required parameters - location: '' + location: 'eastus' } } ``` @@ -86,7 +86,7 @@ module serverfarm 'br/public:avm/res/web/serverfarm:' = { }, // Non-required parameters "location": { - "value": "" + "value": "eastus" } } } @@ -133,7 +133,7 @@ module serverfarm 'br/public:avm/res/web/serverfarm:' = { } ] kind: 'App' - location: '' + location: 'eastus' lock: { kind: 'CanNotDelete' name: 'lock' @@ -212,7 +212,7 @@ module serverfarm 'br/public:avm/res/web/serverfarm:' = { "value": "App" }, "location": { - "value": "" + "value": "eastus" }, "lock": { "value": { @@ -297,7 +297,7 @@ module serverfarm 'br/public:avm/res/web/serverfarm:' = { } ] kind: 'App' - location: '' + location: 'eastus' lock: { kind: 'CanNotDelete' name: 'lock' @@ -358,7 +358,7 @@ module serverfarm 'br/public:avm/res/web/serverfarm:' = { "value": "App" }, "location": { - "value": "" + "value": "eastus" }, "lock": { "value": { diff --git a/avm/res/web/serverfarm/tests/e2e/defaults/main.test.bicep b/avm/res/web/serverfarm/tests/e2e/defaults/main.test.bicep index 267b7bab2b..e490dc6015 100644 --- a/avm/res/web/serverfarm/tests/e2e/defaults/main.test.bicep +++ b/avm/res/web/serverfarm/tests/e2e/defaults/main.test.bicep @@ -28,7 +28,7 @@ param namePrefix string = '#_namePrefix_#' // ================= resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { name: resourceGroupName - location: location + location: 'eastus' } // ============== // @@ -41,7 +41,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' - location: location + location: 'eastus' sku: { name: 'P1v3' tier: 'Premium' diff --git a/avm/res/web/serverfarm/tests/e2e/max/main.test.bicep b/avm/res/web/serverfarm/tests/e2e/max/main.test.bicep index 66c31b8d68..b88a6052dc 100644 --- a/avm/res/web/serverfarm/tests/e2e/max/main.test.bicep +++ b/avm/res/web/serverfarm/tests/e2e/max/main.test.bicep @@ -28,7 +28,7 @@ param namePrefix string = '#_namePrefix_#' // ================= resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { name: resourceGroupName - location: location + location: 'eastus' } module nestedDependencies 'dependencies.bicep' = { @@ -36,7 +36,7 @@ module nestedDependencies 'dependencies.bicep' = { name: '${uniqueString(deployment().name, location)}-nestedDependencies' params: { managedIdentityName: 'dep-${namePrefix}-msi-${serviceShort}' - location: location + location: 'eastus' } } @@ -48,7 +48,7 @@ module diagnosticDependencies '../../../../../../utilities/e2e-template-assets/t logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}' eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}' eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}' - location: location + location: 'eastus' } } @@ -62,7 +62,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' - location: location + location: 'eastus' sku: { name: 'P1v3' tier: 'Premium' diff --git a/avm/res/web/serverfarm/tests/e2e/waf-aligned/main.test.bicep b/avm/res/web/serverfarm/tests/e2e/waf-aligned/main.test.bicep index 00cad44e81..40c072e8b4 100644 --- a/avm/res/web/serverfarm/tests/e2e/waf-aligned/main.test.bicep +++ b/avm/res/web/serverfarm/tests/e2e/waf-aligned/main.test.bicep @@ -28,7 +28,7 @@ param namePrefix string = '#_namePrefix_#' // ================= resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { name: resourceGroupName - location: location + location: 'eastus' } module diagnosticDependencies '../../../../../../utilities/e2e-template-assets/templates/diagnostic.dependencies.bicep' = { @@ -39,7 +39,7 @@ module diagnosticDependencies '../../../../../../utilities/e2e-template-assets/t logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}' eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}' eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}' - location: location + location: 'eastus' } } @@ -53,7 +53,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem' name: '${uniqueString(deployment().name, location)}-test-${serviceShort}-${iteration}' params: { name: '${namePrefix}${serviceShort}001' - location: location + location: 'eastus' sku: { name: 'P1v3' tier: 'Premium'