conditional dependency

mbrat2005 · Oct 16, 2024 · ec22527 · ec22527
1 parent 21acf37
commit ec22527
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/avm/res/azure-stack-hci/cluster/main.bicep b/avm/res/azure-stack-hci/cluster/main.bicep
@@ -223,6 +223,9 @@ module deploymentSetting 'deployment-settings/main.bicep' = [
       streamingDataClient: streamingDataClient
       subnetMask: subnetMask
     }
+    dependsOn: (deploymentOperation == 'Deploy' && contains(sortedDeploymentOperations, 'Validate'))
+      ? ['deploymentSettings-Validate']
+      : []
   }
 ]
 

diff --git a/avm/res/azure-stack-hci/cluster/tests/e2e/2nodeswitched.defaults/main.test.bicep b/avm/res/azure-stack-hci/cluster/tests/e2e/2nodeswitched.defaults/main.test.bicep
@@ -79,9 +79,6 @@ module hciDependencies 'dependencies.bicep' = {
 
 module testDeployment '../../../main.bicep' = [
   for deploymentOperation in deploymentOperations: {
-    dependsOn: [
-      hciDependencies
-    ]
     name: '${uniqueString(deployment().name, enforcedLocation)}-test-cluster${deploymentOperation}-${serviceShort}'
     scope: resourceGroup
     params: {
@@ -104,5 +101,8 @@ module testDeployment '../../../main.bicep' = [
       storageNetworks: hciDependencies.outputs.storageNetworks
       subnetMask: hciDependencies.outputs.subnetMask
     }
+    dependsOn: (deploymentOperation == 'Deploy' && contains(deploymentOperations, 'Validate'))
+      ? ['deploymentSettings-Validate', 'hciDependencies']
+      : ['hciDependencies']
   }
 ]
diff --git a/avm/res/azure-stack-hci/cluster/tests/e2e/3nodeswitchless.defaults/main.test.bicep b/avm/res/azure-stack-hci/cluster/tests/e2e/3nodeswitchless.defaults/main.test.bicep
@@ -79,9 +79,9 @@ module hciDependencies 'dependencies.bicep' = {
 
 module testDeployment '../../../main.bicep' = [
   for deploymentOperation in deploymentOperations: {
-    dependsOn: [
-      hciDependencies
-    ]
+    dependsOn: (deploymentOperation == 'Deploy' && contains(deploymentOperations, 'Validate'))
+      ? ['deploymentSettings-Validate', 'hciDependencies']
+      : ['hciDependencies']
     name: '${uniqueString(deployment().name, enforcedLocation)}-test-cluster${deploymentOperation}-${serviceShort}'
     scope: resourceGroup
     params: {

diff --git a/avm/res/azure-stack-hci/cluster/tests/e2e/waf-aligned/main.test.bicep b/avm/res/azure-stack-hci/cluster/tests/e2e/waf-aligned/main.test.bicep
@@ -79,9 +79,9 @@ module hciDependencies 'dependencies.bicep' = {
 
 module testDeployment '../../../main.bicep' = [
   for deploymentOperation in deploymentOperations: {
-    dependsOn: [
-      hciDependencies
-    ]
+    dependsOn: (deploymentOperation == 'Deploy' && contains(deploymentOperations, 'Validate'))
+      ? ['deploymentSettings-Validate', 'hciDependencies']
+      : ['hciDependencies']
     name: '${uniqueString(deployment().name, enforcedLocation)}-test-cluster${deploymentOperation}-${serviceShort}'
     scope: resourceGroup
     params: {