Fix number account name (#1015)

* removed debugging logging

* fixed account stacks that start with a number

Co-authored-by: hickeydh-aws <hickeydh@amazon.com>
Co-authored-by: Brian969 <56414362+Brian969@users.noreply.github.com>

Author: hickeydh-aws

src/deployments/cdk/src/common/account-stacks.ts

@@ -196,12 +196,19 @@ export class AccountStacks {
   protected createStackLogicalId(accountKey: string, region: string, suffix?: string) {
     // BE CAREFUL CHANGING THE STACK LOGICAL ID
     // When changed, it will generate new logical IDs for all resources in this stack and recreate all resources!
-    const accountPrettyName = pascalCase(accountKey);
+    let accountPrettyName = pascalCase(accountKey);
+    if (this.startsWithNum(accountPrettyName)) {
+      accountPrettyName = `a${accountPrettyName}`;
+    }
     const suffixPretty = suffix ? pascalCase(suffix) : '';
     const regionPrettyName = region === this.props.context.defaultRegion ? '' : pascalCase(region);
     const stackConstructId = !suffix
       ? `${accountPrettyName}Phase${this.props.phase}${regionPrettyName}`
       : `${accountPrettyName}Phase${this.props.phase}${regionPrettyName}${suffixPretty}`;
     return stackConstructId;
   }
+
+  startsWithNum = (expression: string) => {
+    return new RegExp(/^\d/).test(expression);
+  };
 }

src/deployments/cdk/src/common/vpc.ts

@@ -368,9 +368,6 @@ export class Vpc extends cdk.Construct implements constructs.Vpc {
           availabilityZone,
           outpostArn: subnetDefinition['outpost-arn'],
         });
-        if (availabilityZone.length > 1) {
-          console.log(subnet);
-        }
         for (const extensions of extendVpc) {
           subnet.addDependsOn(extensions);
         }

src/lib/cdk-plugin-assume-role/src/assume-role-provider-source.ts

@@ -71,7 +71,7 @@ export class AssumeRoleProviderSource implements CredentialProviderSource {
       endpoint = `sts.${region}.amazonaws.com`;
     }
     const sts = new aws.STS({ endpoint, region });
-    const assumeRoleResponse = await throttlingBackOff(() =>
+    return await throttlingBackOff(() =>
       sts
         .assumeRole({
           RoleArn: roleArn,
@@ -80,8 +80,5 @@ export class AssumeRoleProviderSource implements CredentialProviderSource {
         })
         .promise(),
     );
-
-    console.log(assumeRoleResponse);
-    return assumeRoleResponse;
   }
 }