fix: use account type STAGE instead of OU names

awslabs · Mar 1, 2022 · decbba1 · decbba1
1 parent bf62b34
commit decbba1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/source/aws-bootstrap-kit/lib/aws-organizations-stack.ts b/source/aws-bootstrap-kit/lib/aws-organizations-stack.ts
@@ -159,8 +159,7 @@ export class AwsOrganizationsStack extends Stack {
       previousSequentialConstruct = account;
 
       // Building stageAccounts array to be used for DNS delegation system
-      // TODO would be better but doesnt work: if (accountSpec.type == AccountType.STAGE) {
-      if(['Prod', 'SDLC'].includes(oUSpec.name)) {
+      if (accountSpec.type == AccountType.STAGE) {
         this.stageAccounts.push(account);
       }
     });

diff --git a/source/aws-bootstrap-kit/test/aws-organizations-stack.test.ts b/source/aws-bootstrap-kit/test/aws-organizations-stack.test.ts
@@ -28,17 +28,23 @@ const awsOrganizationsStackProps: AwsOrganizationsStackProps = {
         {
           name: "Account1",
           stageName: 'theStage',
+          type: AccountType.STAGE,
+          stageOrder: 1
         },
         {
-          name: "Account2"
+          name: "Account2",
+          type: AccountType.STAGE,
+          stageOrder: 2
         }
       ]
     },
     {
       name: "Prod",
       accounts: [
         {
-          name: "Account3"
+          name: "Account3",
+          type: AccountType.STAGE,
+          stageOrder:3
         }
       ]
     }

diff --git a/source/aws-bootstrap-kit/tsconfig.tsbuildinfo b/source/aws-bootstrap-kit/tsconfig.tsbuildinfo