Merge pull request #232 from EasyPost/fix_slow_scrubbing

fix: slow scrubbing due to wrong for loop placement

Author: Justintime50

Makefile

@@ -19,7 +19,7 @@ clean:
 
 ## coverage - Test the project and generate an HTML coverage report
 coverage:
-	$(VIRTUAL_BIN)/pytest --cov=$(PROJECT_NAME) --cov-branch --cov-report=html --cov-report=term-missing --cov-fail-under=88
+	$(VIRTUAL_BIN)/pytest --cov=$(PROJECT_NAME) --cov-branch --cov-report=html --cov-report=term-missing --cov-fail-under=87
 
 ## black - Runs the Black Python formatter against the project
 black:

tests/conftest.py

@@ -114,35 +114,35 @@ def before_record_response(response: Any) -> Any:
         if response["body"]["string"]:
             response_body = json.loads(response["body"]["string"].decode())
 
-            response_body = scrub_data(response_body)
+            for scrubber in scrubbers:
+                response_body = scrub_data(response_body, scrubber)
 
             response["body"]["string"] = json.dumps(response_body).encode()
         return response
 
-    def scrub_data(data: Any) -> Any:
+    def scrub_data(data: Any, scrubber: Tuple[str, Any]) -> Any:
         """Scrub data from a cassette recursively."""
-        for scrubber in scrubbers:
-            key = scrubber[0]
-            replacement = scrubber[1]
-
-            # Root-level list scrubbing
-            if isinstance(data, list):
+        key = scrubber[0]
+        replacement = scrubber[1]
+
+        # Root-level list scrubbing
+        if isinstance(data, list):
+            for index, item in enumerate(data):
+                if key in item:
+                    data[index][key] = replacement
+        elif isinstance(data, dict):
+            # Root-level key scrubbing
+            if key in data:
+                data[key] = replacement
+            else:
+                # Nested scrubbing
                 for index, item in enumerate(data):
-                    if key in item:
-                        data[index][key] = replacement
-            elif isinstance(data, dict):
-                # Root-level key scrubbing
-                if key in data:
-                    data[key] = replacement
-                else:
-                    # Nested scrubbing
-                    for index, item in enumerate(data):
-                        element = data[item]
-                        if isinstance(element, list):
-                            for nested_index, nested_item in enumerate(element):
-                                data[item][nested_index] = scrub_data(nested_item)
-                        elif isinstance(element, dict):
-                            data[item] = scrub_data(element)
+                    element = data[item]
+                    if isinstance(element, list):
+                        for nested_index, nested_item in enumerate(element):
+                            data[item][nested_index] = scrub_data(nested_item, scrubber)
+                    elif isinstance(element, dict):
+                        data[item] = scrub_data(element, scrubber)
         return data
 
     return before_record_response