Passes Environment into New-TestSettings, Simplifies Configuration

core/Azure.Mcp.Core/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

core/Microsoft.Mcp.Core/src/Services/Azure/Authentication/AzureCloudConfiguration.cs

@@ -37,11 +37,12 @@ public AzureCloudConfiguration(
         // Try to get cloud configuration from various sources in priority order:
         // 1. ServiceStartOptions (--cloud command line argument)
         // 2. Configuration (appsettings.json or environment variables)
+        //    - Keys are case-insensitive
+        //    - Usually IConfiguration is created using EnvironmentVariablesConfigurationProvider which 
+        //      includes environment variables, but we check both to be safe
         var cloudValue = serviceStartOptions?.Value?.Cloud
             ?? configuration["AZURE_CLOUD"]
-            ?? configuration["azure_cloud"]
-            ?? configuration["cloud"]
-            ?? configuration["Cloud"]
+            ?? configuration["CLOUD"]
             ?? Environment.GetEnvironmentVariable("AZURE_CLOUD");
 
         (AuthorityHost, ArmEnvironment, CloudType) = ParseCloudValue(cloudValue);

core/Microsoft.Mcp.Core/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs
 )

eng/pipelines/templates/jobs/live-test.yml

@@ -14,6 +14,9 @@ jobs:
   timeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
   # The variable reference in the matrix parameter will resolve to a json map. If there are no live test legs, it will be an empty map.
   condition: and(succeeded(), ne(${{ parameters.Matrix }}, '{}'))
+  variables:
+    Environment: ${{ iif(parameters.GovTest, 'AzureUSGovernment', 'AzureCloud') }}
+    SubscriptionConfiguration: '{"Environment": "$(Environment)"}'
   strategy:
     maxParallel: ${{ parameters.MaxParallel }}
     matrix: $[ ${{ parameters.Matrix }} ]
@@ -62,6 +65,7 @@ jobs:
       ServiceConnection: ${{ iif(parameters.GovTest, 'azure-mcp-gov-test', 'azure-sdk-tests-public') }}
       PersistOidcToken: true
       TestResourcesDirectory: $(Build.SourcesDirectory)/$(TestResourcesPath)
+      SubscriptionConfiguration: $(SubscriptionConfiguration)
 
   - task: AzurePowershell@5
     displayName: "Run tests (stdio) - az pwsh"
@@ -75,6 +79,7 @@ jobs:
       Inline: |
         ./eng/scripts/Test-Code.ps1 `
           -TestType 'Live' `
+          -Environment $(Environment) `
           -Path $(PathToTest) `
           -TestResultsPath '$(Build.ArtifactStagingDirectory)/testResults'
 
@@ -87,6 +92,7 @@ jobs:
       ServiceConnection: ${{ iif(parameters.GovTest, 'azure-mcp-gov-test', 'azure-sdk-tests-public') }}
       PersistOidcToken: true
       TestResourcesDirectory: $(Build.SourcesDirectory)/$(TestResourcesPath)
+      SubscriptionConfiguration: $(SubscriptionConfiguration)
       AdditionalParameters: "@{ UseHttpTransport = true }"
 
   - task: AzurePowershell@5
@@ -101,6 +107,7 @@ jobs:
       Inline: |
         ./eng/scripts/Test-Code.ps1 `
           -TestType 'Live' `
+          -Environment $(Environment) `
           -Path $(PathToTest) `
           -TestResultsPath '$(Build.ArtifactStagingDirectory)/testResults'
 
@@ -122,3 +129,4 @@ jobs:
       ServiceConnection: ${{ iif(parameters.GovTest, 'azure-mcp-gov-test', 'azure-sdk-tests-public') }}
       EnvVars:
         Pool: $(Pool)
+      SubscriptionConfiguration: $(SubscriptionConfiguration)

eng/scripts/Test-Code.ps1

@@ -7,6 +7,8 @@ param(
     [string[]] $Members,
     [ValidateSet('Live', 'Unit', 'All', 'Recorded')]
     [string] $TestType = 'Unit',
+    [ValidateSet('AzureCloud', 'AzureUSGovernment', 'AzureChinaCloud')]
+    [string] $Environment = 'AzureCloud',
     [string] $TestResultsPath,
     [switch] $CollectCoverage,
     [switch] $OpenReport,
@@ -298,11 +300,12 @@ try {
         exit $LastExitCode
     }
 
+    $environmentArg = "--environment AZURE_CLOUD=$Environment"
     $coverageArg = $CollectCoverage ? "--collect:'XPlat Code Coverage'" : ""
     $resultsArg = "--results-directory '$TestResultsPath'"
     $loggerArg = "--logger 'trx' --logger 'console;verbosity=detailed'"
 
-    $command = "dotnet test $coverageArg $resultsArg $loggerArg"
+    $command = "dotnet test $coverageArg $resultsArg $loggerArg $environmentArg"
 
     if($Members.Count -gt 0) {
         $memberFilterString = $Members | ForEach-Object { "FullyQualifiedName~$_" } | Join-String -Separator '|'

tools/Azure.Mcp.Tools.Acr/tests/test-resources-post.ps1

@@ -3,6 +3,7 @@ param(
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
     [string] $BaseName,
+    [string] $Environment,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters
 )

tools/Azure.Mcp.Tools.Aks/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.Aks/tests/test-resources.bicep

@@ -12,8 +12,8 @@ param location string = resourceGroup().location == 'westus' ? 'westus2' : resou
 @description('The client OID to grant access to test resources.')
 param testApplicationOid string
 
-@description('The VM size for the AKS node pool. Default is Standard_F2 which is the smallest VM that meets AKS system node pool requirements (2 vCPUs, 4 GB RAM).')
-param nodeVmSize string = 'Standard_D2lds_v5'
+@description('The VM size for the AKS node pool. Default is Standard_D2lds_v5.')
+param nodeVmSize string = environment().name == 'AzureUSGovernment' ? 'Standard_D2alds_v6' : 'Standard_D2lds_v5'
 
 // Create a basic AKS cluster for testing
 resource aksCluster 'Microsoft.ContainerService/managedClusters@2024-02-01' = {

tools/Azure.Mcp.Tools.AppConfig/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.AppService/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.Authorization/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.AzureIsv/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.AzureMigrate/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs
 )

tools/Azure.Mcp.Tools.Communication/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.Compute/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs
 )

tools/Azure.Mcp.Tools.ConfidentialLedger/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.Cosmos/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.Deploy/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.EventGrid/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.EventHubs/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.FileShares/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.FoundryExtensions/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.FunctionApp/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.Grafana/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.KeyVault/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.Kusto/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.LoadTesting/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.ManagedLustre/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters

tools/Azure.Mcp.Tools.Marketplace/tests/test-resources-post.ps1

@@ -2,6 +2,7 @@ param(
     [string] $TenantId,
     [string] $TestApplicationId,
     [string] $ResourceGroupName,
+    [string] $Environment,
     [string] $BaseName,
     [hashtable] $DeploymentOutputs,
     [hashtable] $AdditionalParameters