From 8fe296fdd2107cd4269a8132e4872411968082d7 Mon Sep 17 00:00:00 2001 From: Daniel Scott-Raynsford Date: Mon, 12 Aug 2024 11:56:57 +1200 Subject: [PATCH] Fix pipeline build step and update integration test region --- CHANGELOG.md | 2 ++ tests/Integration/CosmosDB.integration.Tests.ps1 | 2 +- tests/TestHelper/AzureDeploy/AzureDeploy.bicep | 2 +- tests/TestHelper/AzureDeploy/CosmosDb.bicep | 2 +- tests/TestHelper/TestHelper.psm1 | 6 +++--- tests/Unit/CosmosDB.accounts.Tests.ps1 | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f2611e..ca0bee6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fixed pipeline build step by limiting Gitversion to 5.* version. +- Change default integration test region from `East US` to `West US 3` due to + quota limitations. ## [5.0.0] - 2024-06-07 diff --git a/tests/Integration/CosmosDB.integration.Tests.ps1 b/tests/Integration/CosmosDB.integration.Tests.ps1 index 356ab8e..89b9a79 100644 --- a/tests/Integration/CosmosDB.integration.Tests.ps1 +++ b/tests/Integration/CosmosDB.integration.Tests.ps1 @@ -49,7 +49,7 @@ if ([System.String]::IsNullOrEmpty($script:testBuildSystem)) $script:testResourceGroupName = ('cdbtestrgp-{0}-{1}-{2}' -f $script:testRandomName,$script:testBuildSystem,$script:testBuildBranch) $script:testAccountName = ('cdbtest{0}' -f $script:testRandomName) -$script:testLocation = 'East US' +$script:testLocation = 'West US 3' $script:testCorsAllowedOrigins = @('https://www.contoso.com', 'https://www.fabrikam.com') $script:testOffer = 'testOffer' $script:testDatabase = 'testDatabase' diff --git a/tests/TestHelper/AzureDeploy/AzureDeploy.bicep b/tests/TestHelper/AzureDeploy/AzureDeploy.bicep index 04db513..43293fb 100644 --- a/tests/TestHelper/AzureDeploy/AzureDeploy.bicep +++ b/tests/TestHelper/AzureDeploy/AzureDeploy.bicep @@ -2,7 +2,7 @@ targetScope = 'subscription' param resourceGroupName string param accountName string -param location string = 'East US' +param location string = 'West US 3' param principalId string @allowed([ '00000000-0000-0000-0000-000000000001'// Built-in role 'Azure Cosmos DB Built-in Data Reader' diff --git a/tests/TestHelper/AzureDeploy/CosmosDb.bicep b/tests/TestHelper/AzureDeploy/CosmosDb.bicep index 989366b..255c82c 100644 --- a/tests/TestHelper/AzureDeploy/CosmosDb.bicep +++ b/tests/TestHelper/AzureDeploy/CosmosDb.bicep @@ -1,5 +1,5 @@ param accountName string -param location string = 'East US' +param location string = 'West US 3' param principalId string @allowed([ '00000000-0000-0000-0000-000000000001'// Built-in role 'Azure Cosmos DB Built-in Data Reader' diff --git a/tests/TestHelper/TestHelper.psm1 b/tests/TestHelper/TestHelper.psm1 index 67ca0d5..42ecdd4 100644 --- a/tests/TestHelper/TestHelper.psm1 +++ b/tests/TestHelper/TestHelper.psm1 @@ -148,7 +148,7 @@ function Get-AzureEntraIdToken The name of the resource group where the Azure Cosmos DB account will be created. .PARAMETER Location - The Azure region where the Azure Cosmos DB account will be created. Defaults to 'East US'. + The Azure region where the Azure Cosmos DB account will be created. Defaults to 'West US 3'. .EXAMPLE New-AzureTestCosmosDbAccount -ObjectId '12345678-1234-1234-1234-123456789012' -AccountName 'testCosmosDb' -ResourceGroupName 'testResourceGroup' @@ -180,7 +180,7 @@ function New-AzureTestCosmosDbAccount [Parameter()] [System.String] - $Location = 'East US' + $Location = 'West US 3' ) try @@ -272,7 +272,7 @@ function New-AzureTestCosmosDbResourceGroup [Parameter()] [System.String] - $Location = 'East US' + $Location = 'West US 3' ) try diff --git a/tests/Unit/CosmosDB.accounts.Tests.ps1 b/tests/Unit/CosmosDB.accounts.Tests.ps1 index 34e6c6d..b438b99 100644 --- a/tests/Unit/CosmosDB.accounts.Tests.ps1 +++ b/tests/Unit/CosmosDB.accounts.Tests.ps1 @@ -19,7 +19,7 @@ InModuleScope $ProjectName { $script:testResourceGroupName = 'testResourceGroupName' $script:testLocation = 'North Central US' $script:testLocationRead1 = 'South Central US' - $script:testLocationRead2 = 'East US' + $script:testLocationRead2 = 'West US 3' $script:testIpRangeFilter = @('10.0.0.1/8', '10.0.0.2/8') $script:testConsistencyLevel = 'Strong' $script:testMaxIntervalInSeconds = 60