fix(core): MAD Failed to Deploy with 3 AZs in subnet (aws-samples#565)

* fix(core): adding azs param in mad config

* Adding azs property for deployments/adc config

* Adding subnet name check

Author: naveenkoppula

src/core/runtime/src/create-adconnector/create.ts

@@ -113,7 +113,18 @@ export const handler = async (input: AdConnectorInput) => {
     }
 
     // Find subnets based on ADC Config subnet name
-    const subnetIds = vpcOutput.subnets.filter(s => s.subnetName === adcConfig.subnet).map(s => s.subnetId);
+    let subnetIds: string[];
+    if (adcConfig.azs.length > 0) {
+      const adcAzs = adcConfig.azs.slice(0, 2);
+      subnetIds = vpcOutput.subnets
+        .filter(s => s.subnetName === adcConfig.subnet && adcAzs.includes(s.az))
+        .map(s => s.subnetId);
+    } else {
+      subnetIds = vpcOutput.subnets
+        .filter(s => s.subnetName === adcConfig.subnet)
+        .map(s => s.subnetId)
+        .slice(0, 2);
+    }
 
     const accountId = getAccountId(accounts, accountKey);
     if (!accountId) {

src/deployments/cdk/src/deployments/mad/step-2.ts

@@ -62,7 +62,18 @@ function createActiveDirectory(props: MadStep2Props) {
     }
 
     const vpcId = vpcOutput.vpcId;
-    const subnetIds = vpcOutput.subnets.filter(s => s.subnetName === madConfig.subnet).map(s => s.subnetId);
+    let subnetIds: string[];
+    if (madConfig.azs.length > 0) {
+      const madAzs = madConfig.azs.slice(0, 2);
+      subnetIds = vpcOutput.subnets
+        .filter(s => s.subnetName === madConfig.subnet && madAzs.includes(s.az))
+        .map(s => s.subnetId);
+    } else {
+      subnetIds = vpcOutput.subnets
+        .filter(s => s.subnetName === madConfig.subnet)
+        .map(s => s.subnetId)
+        .slice(0, 2);
+    }
 
     const madPasswordSecretArn = getMadConfigRootPasswordSecretArn({
       acceleratorPrefix,

src/lib/common-config/src/index.ts

@@ -338,6 +338,7 @@ export const MadConfigType = t.interface({
   'vpc-name': t.string,
   region: t.string,
   subnet: t.string,
+  azs: fromNullable(t.array(t.string), []),
   size: t.string,
   'dns-domain': t.string,
   'netbios-domain': t.string,
@@ -448,6 +449,7 @@ export const AdcConfigType = t.interface({
   deploy: t.boolean,
   'vpc-name': t.string,
   subnet: t.string,
+  azs: fromNullable(t.array(t.string), []),
   size: t.string,
   restrict_srcips: t.array(cidr),
   'connect-account-key': t.string,