Release: 1.6.6

Author: AWS

VERSION

@@ -1 +1 @@
-1.6.5
+1.6.6

sources/aft-lambda-layer/aft_common/account_provisioning_framework.py

@@ -309,10 +309,12 @@ def get_ssm_parameters_names_by_path(session: Session, path: str) -> List[str]:
 
 
 def delete_ssm_parameters(session: Session, parameters: Sequence[str]) -> None:
-
-    if len(parameters) > 0:
+    batches = utils.yield_batches_from_list(
+        parameters, batch_size=10
+    )  # Max batch size for API
+    for batched_names in batches:
         client = session.client("ssm")
-        response = client.delete_parameters(Names=parameters)
+        response = client.delete_parameters(Names=batched_names)
 
 
 def put_ssm_parameters(session: Session, parameters: Dict[str, str]) -> None:

sources/aft-lambda-layer/aft_common/aft_utils.py

@@ -9,8 +9,8 @@
     TYPE_CHECKING,
     Any,
     Dict,
+    Iterable,
     List,
-    Literal,
     Optional,
     Sequence,
     Union,
@@ -534,3 +534,15 @@ def get_aws_partition(session: Session, region: Optional[str] = None) -> str:
 
     partition = session.get_partition_for_region(region)  # type: ignore
     return cast(str, partition)
+
+
+def yield_batches_from_list(
+    input: Sequence[Any], batch_size: int
+) -> Iterable[Sequence[Any]]:
+    if batch_size <= 0:
+        return []
+
+    idx = 0
+    while idx < len(input):
+        yield input[idx : idx + batch_size]
+        idx += batch_size

sources/aft-lambda-layer/aft_common/organizations.py

@@ -3,6 +3,7 @@
 #
 import re
 from copy import deepcopy
+from tokenize import String
 from typing import TYPE_CHECKING, List, Optional, Tuple
 
 from aft_common.aft_utils import get_logger
@@ -74,6 +75,10 @@ def get_name_and_id_from_nested_ou(
         name = nested_ou_name[: first_id_idx - 1]
         return (name, id)
 
+    @staticmethod
+    def get_nested_ou_format_from_name_and_id(ou_name: str, ou_id: str) -> str:
+        return f"{ou_name} ({ou_id})"
+
     def get_root_ou_id(self) -> str:
         return self.orgs_client.list_roots()["Roots"][0]["Id"]