From 4f09b08c156a0b9c579683c70ad5333e4e5d684a Mon Sep 17 00:00:00 2001
From: Ryan Cerrato <rycerrat@amazon.com>
Date: Thu, 20 Mar 2025 17:02:20 -0500
Subject: [PATCH] fix(convert-config): fix sub-pool missing in assignedCidr
 filter

---
 .../lza-upgrade/src/common/outputs/load-assigned-cidrs.ts       | 1 +
 .../Custom-Scripts/lza-upgrade/src/convert-config.ts            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/reference-artifacts/Custom-Scripts/lza-upgrade/src/common/outputs/load-assigned-cidrs.ts b/reference-artifacts/Custom-Scripts/lza-upgrade/src/common/outputs/load-assigned-cidrs.ts
index 499aa93dd..5ed8d529a 100644
--- a/reference-artifacts/Custom-Scripts/lza-upgrade/src/common/outputs/load-assigned-cidrs.ts
+++ b/reference-artifacts/Custom-Scripts/lza-upgrade/src/common/outputs/load-assigned-cidrs.ts
@@ -11,6 +11,7 @@ export interface VpcAssignedCidr {
 }
 
 export interface SubnetAssignedCidr {
+  'sub-pool': string;
   'subnet-pool': string;
   'status': string;
   'cidr': string;
diff --git a/reference-artifacts/Custom-Scripts/lza-upgrade/src/convert-config.ts b/reference-artifacts/Custom-Scripts/lza-upgrade/src/convert-config.ts
index bab3541b6..64ce20b39 100644
--- a/reference-artifacts/Custom-Scripts/lza-upgrade/src/convert-config.ts
+++ b/reference-artifacts/Custom-Scripts/lza-upgrade/src/convert-config.ts
@@ -3698,7 +3698,7 @@ export class ConvertAseaConfig {
           sc['vpc-name'] === vpcName &&
           sc['subnet-name'] === subnetName &&
           sc.az === subnetDefinition.az &&
-          sc['subnet-pool'] === subnetDefinition.cidr?.pool,
+          (sc['subnet-pool'] === subnetDefinition.cidr?.pool || sc['sub-pool'] === subnetDefinition.cidr?.pool),
       )?.cidr!;
     }
     return ipv4CidrBlock;