Merge branch 'aws-samples:main' into main

ColinL2021 · Nov 23, 2023 · a6be54c · a6be54c
2 parents 9c0c09e + 3ff53c9
commit a6be54c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ The [Landing Zone Accelerator (LZA) on AWS solution](https://aws.amazon.com/solu
 
 The LZA v1.3 release (03/2023) focused on delivering AWS Secure Environment Accelerator (ASEA) feature parity and delivered both [CCCS Cloud Medium](https://aws.amazon.com/solutions/implementations/landing-zone-accelerator-on-aws/#Support_for_specific_regions_and_industries) and [Trusted Secure Enclave Sensitive Edition](https://aws.amazon.com/solutions/implementations/landing-zone-accelerator-on-aws/#Support_for_specific_regions_and_industries) sample configuration files. These samples deliver similar outcomes to the ASEA sample configuration file.
 
-The LZA team is currently developing a semi-automated upgrade from ASEA to LZA. Upgrades from ASEA to LZA must occur before Q4 2024. Please monitor this site for a future LZA release that will support the ASEA to LZA semi-automated upgrade capability [here](https://aws.amazon.com/solutions/implementations/landing-zone-accelerator-on-aws/).  
+The LZA team is currently developing a semi-automated upgrade from ASEA to LZA. Upgrades from ASEA to LZA must occur before Q2 2025. Please monitor this site for a future LZA release that will support the ASEA to LZA semi-automated upgrade capability [here](https://aws.amazon.com/solutions/implementations/landing-zone-accelerator-on-aws/).  
 
 Please reach out to your AWS Account Team with any questions.
 

diff --git a/src/core/cdk/package.json b/src/core/cdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-accelerator/accelerator",
-  "version": "1.5.7-b",
+  "version": "1.5.8",
   "scripts": {
     "bootstrap": "pnpx cdk bootstrap",
     "deploy": "pnpx cdk deploy",
@@ -35,4 +35,4 @@
     "ts-node": "10.9.1",
     "typescript": "5.2.2"
   }
-}
+}
diff --git a/src/deployments/cdk/src/apps/phase-2.ts b/src/deployments/cdk/src/apps/phase-2.ts
@@ -122,7 +122,7 @@ export async function deploy({
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const nfwNameToIdMap = vpcOutput.nfw?.reduce((acc: any, nfwConfig) => {
-      const vpcEndpointAz = nfwConfig.az.substring(-1);
+      const vpcEndpointAz = nfwConfig.az.slice(-1);
       const vpcEndpointId = nfwConfig.vpcEndpoint;
       const mapSubnet = nfwConfig.subnets.filter(subnet => {
         return vpcEndpointAz === subnet.az;

diff --git a/src/installer/cdk/package.json b/src/installer/cdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-accelerator/installer",
-  "version": "1.5.7-b",
+  "version": "1.5.8",
   "scripts": {
     "test": "pnpx jest",
     "synth": "pnpx cdk synth",
@@ -30,4 +30,4 @@
     "ts-node": "10.9.1",
     "typescript": "5.2.2"
   }
-}
+}