From d6f2b3d7b597886f5a8d7a4b49a9680fd2c03615 Mon Sep 17 00:00:00 2001
From: erschef_microsoft <erschef@microsoft.com>
Date: Mon, 18 Nov 2024 11:22:40 -0500
Subject: [PATCH] fix: Reorder parameters in P2S VPN Gateway tests for
 consistency and clarity

---
 .../p2s-vpn-gateway/tests/e2e/defaults/main.test.bicep   | 8 ++++----
 .../tests/e2e/waf-aligned/main.test.bicep                | 9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/avm/res/network/p2s-vpn-gateway/tests/e2e/defaults/main.test.bicep b/avm/res/network/p2s-vpn-gateway/tests/e2e/defaults/main.test.bicep
index 90ae58b912..7a0d7ba6cd 100644
--- a/avm/res/network/p2s-vpn-gateway/tests/e2e/defaults/main.test.bicep
+++ b/avm/res/network/p2s-vpn-gateway/tests/e2e/defaults/main.test.bicep
@@ -52,15 +52,15 @@ module testDeployment '../../../main.bicep' = [
     scope: resourceGroup
     name: '${uniqueString(deployment().name, resourceLocation)}-test-${serviceShort}-${iteration}'
     params: {
-      location: resourceLocation
       name: '${namePrefix}${serviceShort}p2sVpnGw'
-      virtualHubId: nestedDependencies.outputs.virtualHubResourceId
-      vpnServerConfigurationId: nestedDependencies.outputs.vpnServerConfigurationResourceId
+      location: resourceLocation
       p2SConnectionConfigurationsName: 'p2sConnectionConfig1'
-      associatedRouteTableName: 'defaultRouteTable'
       vpnClientAddressPoolAddressPrefixes: [
         '10.0.2.0/24'
       ]
+      associatedRouteTableName: 'defaultRouteTable'
+      virtualHubId: nestedDependencies.outputs.virtualHubResourceId
+      vpnServerConfigurationId: nestedDependencies.outputs.vpnServerConfigurationResourceId
     }
   }
 ]
diff --git a/avm/res/network/p2s-vpn-gateway/tests/e2e/waf-aligned/main.test.bicep b/avm/res/network/p2s-vpn-gateway/tests/e2e/waf-aligned/main.test.bicep
index 87ccec9d46..f855bc1486 100644
--- a/avm/res/network/p2s-vpn-gateway/tests/e2e/waf-aligned/main.test.bicep
+++ b/avm/res/network/p2s-vpn-gateway/tests/e2e/waf-aligned/main.test.bicep
@@ -52,8 +52,8 @@ module testDeployment '../../../main.bicep' = [
     scope: resourceGroup
     name: '${uniqueString(deployment().name, resourceLocation)}-test-${serviceShort}-${iteration}'
     params: {
-      location: resourceLocation
       name: '${namePrefix}${serviceShort}p2sVpnGw'
+      location: resourceLocation
       lock: {
         kind: 'CanNotDelete'
         name: 'myCustomLockName'
@@ -62,10 +62,7 @@ module testDeployment '../../../main.bicep' = [
         Environment: 'Non-Prod'
         Role: 'DeploymentValidation'
       }
-      customDnsServers: [
-        '10.50.10.50'
-        '10.50.50.50'
-      ]
+      p2SConnectionConfigurationsName: 'p2sConnectionConfig1'
       isRoutingPreferenceInternet: false
       enableInternetSecurity: true
       associatedRouteTableName: 'defaultRouteTable'
@@ -73,9 +70,7 @@ module testDeployment '../../../main.bicep' = [
         '10.0.2.0/24'
       ]
       virtualHubId: nestedDependencies.outputs.virtualHubResourceId
-      vpnGatewayScaleUnit: 1
       vpnServerConfigurationId: nestedDependencies.outputs.vpnServerConfigurationResourceId
-      p2SConnectionConfigurationsName: 'p2sConnectionConfig1'
     }
   }
 ]