Refactor deployment script variables and add resourceProviders to hub…

…Spoke and vwanSpoke modules
Azure · Mar 17, 2024 · 103d2ca · 103d2ca
1 parent 950cf6e
commit 103d2ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/main.bicep b/main.bicep
@@ -698,9 +698,9 @@ module createSubscriptionResources 'src/self/subResourceWrapper/deploy.bicep' =
     roleAssignmentEnabled: roleAssignmentEnabled
     roleAssignments: roleAssignments
     disableTelemetry: disableTelemetry
-    deploymentScriptResourceGroupName: '${deploymentScriptResourceGroupName}-${deploymentScriptResourcesSubGuid}'
-    deploymentScriptName: '${deploymentScriptName}-${deploymentScriptResourcesSubGuid}'
-    deploymentScriptManagedIdentityName: '${deploymentScriptManagedIdentityName}-${deploymentScriptResourcesSubGuid}'
+    deploymentScriptResourceGroupName: deploymentScriptResourceGroupName
+    deploymentScriptName: deploymentScriptName
+    deploymentScriptManagedIdentityName: deploymentScriptManagedIdentityName
     resourceProviders: resourceProviders
     deploymentScriptVirtualNetworkName: deploymentScriptVirtualNetworkName
     deploymentScriptNetworkSecurityGroupName: deploymentScriptNetworkSecurityGroupName

diff --git a/tests/lz-vending/full.test.bicep b/tests/lz-vending/full.test.bicep
@@ -65,6 +65,7 @@ module hubSpoke '../../main.bicep' = {
         relativeScope: '/resourceGroups/rsg-${location}-net-hs-pr-${prNumber}'
       }
     ]
+    resourceProviders : {}
   }
 }
 
@@ -86,6 +87,7 @@ module vwanSpoke '../../main.bicep' = {
     virtualNetworkResourceGroupLockEnabled: false
     virtualNetworkPeeringEnabled: true
     hubNetworkResourceId: '/subscriptions/e4e7395f-dc45-411e-b425-95f75e470e16/resourceGroups/rsg-blzv-perm-hubs-001/providers/Microsoft.Network/virtualHubs/vhub-uksouth-blzv'
+    resourceProviders : {}
   }
 }