NRL-721 Style changes

Author: sandyforresternhs

scripts/delete_all_table_items.py

@@ -61,10 +61,9 @@ def delete_all_table_items(table_name):
             )
 
             if was_throttled:
+                scan_kwargs.pop("ExclusiveStartKey", None)
                 if last_key:
                     scan_kwargs["ExclusiveStartKey"] = last_key
-                elif "ExclusiveStartKey" in scan_kwargs:
-                    del scan_kwargs["ExclusiveStartKey"]
                 continue
 
             if not last_key:

scripts/seed_sandbox_table.py

@@ -270,24 +270,25 @@ def _generate_and_write_pointers(
     pointer_data: list[list[str]] = []
     batch_upsert_items: list[dict[str, Any]] = []
 
-    for pointer_type, template in templates.items():
-        for custodian in CUSTODIANS:
-            batch_items, csv_rows, counter = _generate_pointers_for_custodian(
-                template,
-                pointer_type,
-                custodian,
-                pointers_per_type,
-                counter,
-                testnum_iter,
-            )
+    for (pointer_type, template), custodian in (
+        (item, cust) for item in templates.items() for cust in CUSTODIANS
+    ):
+        batch_items, csv_rows, counter = _generate_pointers_for_custodian(
+            template,
+            pointer_type,
+            custodian,
+            pointers_per_type,
+            counter,
+            testnum_iter,
+        )
 
-            pointer_data.extend(csv_rows)
+        pointer_data.extend(csv_rows)
 
-            for item in batch_items:
-                batch_upsert_items.append(item)
-                if len(batch_upsert_items) >= 25:
-                    _write_batch_to_dynamodb(table_name, batch_upsert_items)
-                    batch_upsert_items = []
+        for item in batch_items:
+            batch_upsert_items.append(item)
+            if len(batch_upsert_items) >= 25:
+                _write_batch_to_dynamodb(table_name, batch_upsert_items)
+                batch_upsert_items = []
 
     _write_batch_to_dynamodb(table_name, batch_upsert_items)