fix(core): Fixing remove account or Leave from organization action trigger (#618)

* Fixing remove account action

* Changing Config for suspended accounts

* Update ou-validation with suspended account fix

Author: naveenkoppula

src/core/runtime/src/ou-validation.ts

@@ -12,6 +12,8 @@ import { JSON_FORMAT, YAML_FORMAT } from '@aws-accelerator/common/src/util/const
 import { DynamoDB } from '@aws-accelerator/common/src/aws/dynamodb';
 import { getItemInput } from './utils/dynamodb-requests';
 
+const SUSPENDED_OU_NAME = 'Suspended';
+
 export interface ValdationInput extends LoadConfigurationInput {
   acceleratorPrefix: string;
   parametersTableName: string;
@@ -221,10 +223,9 @@ export const handler = async (input: ValdationInput): Promise<string> => {
       rootAccountIds = rootAccountIds.filter(acc => acc !== rootMasterAccount?.Id!);
     }
   }
-  const suspendedOuName = 'Suspended';
-  let suspendedOu = awsOusWithPath.find(o => o.Path === suspendedOuName);
+  let suspendedOu = awsOusWithPath.find(o => o.Path === SUSPENDED_OU_NAME);
   if (!suspendedOu) {
-    suspendedOu = await createSuspendedOu(suspendedOuName, rootId);
+    suspendedOu = await createSuspendedOu(SUSPENDED_OU_NAME, rootId);
     awsOusWithPath.push(suspendedOu);
   }
 

src/lib/common/src/util/common.ts

@@ -149,12 +149,15 @@ export function equalIgnoreCase(value1: string, value2: string): boolean {
 export async function loadAccounts(tableName: string, client: DynamoDB): Promise<Account[]> {
   let index = 0;
   const accounts: Account[] = [];
+  if (!client) {
+    client = new DynamoDB();
+  }
   while (true) {
     const itemsInput = {
       TableName: tableName,
       Key: { id: { S: `accounts/${index}` } },
     };
-    const item = await new DynamoDB().getItem(itemsInput);
+    const item = await client.getItem(itemsInput);
     if (index === 0 && !item.Item) {
       throw new Error(`Cannot find parameter with ID "accounts"`);
     }