Use batch sanitizing feature from sanitizing fixture (#36512)

Author: mccoyp

sdk/ml/azure-ai-ml/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/ml/azure-ai-ml",
-  "Tag": "python/ml/azure-ai-ml_b0ebee3471"
+  "Tag": "python/ml/azure-ai-ml_a4bd12953c"
 }

sdk/ml/azure-ai-ml/tests/component/e2etests/test_component.py

@@ -206,7 +206,6 @@ def test_parallel_component(self, client: MLClient, randstr: Callable[[str], str
             recorded_component_name="component_name",
         )
 
-    @pytest.mark.live_test_only("Needs re-recording to work with new test proxy sanitizers")
     def test_automl_component(self, client: MLClient, registry_client: MLClient, randstr: Callable[[str], str]) -> None:
         expected_component_dict = {
             "description": "Component that executes an AutoML Classification task model training in a pipeline.",

sdk/ml/azure-ai-ml/tests/conftest.py

@@ -133,9 +133,10 @@ def add_sanitizers(test_proxy, fake_datastore_key):
 
     # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
     #  - AZSDK3430: $..id
+    #  - AZSDK3436: $..resourceGroup
     #  - AZSDK3493: $..name
     #  - AZSDK2003: Location
-    remove_batch_sanitizers(["AZSDK3430", "AZSDK3493", "AZSDK2003"])
+    remove_batch_sanitizers(["AZSDK3430", "AZSDK3493", "AZSDK2003", "AZSDK3436"])
 
 
 def pytest_addoption(parser):

tools/azure-sdk-tools/devtools_testutils/proxy_fixtures.py

@@ -23,7 +23,7 @@
 from .helpers import get_test_id, is_live, is_live_and_not_recording
 from .proxy_testcase import start_record_or_playback, stop_record_or_playback, transform_request
 from .proxy_startup import test_proxy
-from .sanitizers import add_general_string_sanitizer
+from .sanitizers import add_batch_sanitizers, add_general_string_sanitizer, Sanitizer
 
 if TYPE_CHECKING:
     from typing import Any, Callable, Dict, Optional, Tuple
@@ -55,7 +55,7 @@ def sanitize(self, variable: str, value: str) -> str:
         self._fake_values[variable] = value
         real_value = os.getenv(variable)
         if real_value:
-            add_general_string_sanitizer(target=real_value, value=value)
+            add_general_string_sanitizer(target=real_value, value=value, function_scoped=True)
         else:
             _LOGGER.info(f"No value for {variable} was found, so a sanitizer could not be registered for the variable.")
 
@@ -70,8 +70,19 @@ def sanitize_batch(self, variables: "Dict[str, str]") -> "Dict[str, str]":
         :returns: A dictionary mapping environment variables to their real values in live mode, or their sanitized
             values in playback.
         """
-        current_values = {variable: self.sanitize(variable, variables[variable]) for variable in variables}
-        return current_values
+        real_values = {}
+        sanitizers = {Sanitizer.GENERAL_STRING: []}
+
+        for variable in variables:
+            self._fake_values[variable] = variables[variable]
+            real_value = os.getenv(variable)
+            real_values[variable] = real_value
+            # If the variable has a value to be sanitized, add a general string sanitizer for it to our batch request
+            if real_value:
+                sanitizers[Sanitizer.GENERAL_STRING].append({"target": real_value, "value": variables[variable]})
+
+        add_batch_sanitizers(sanitizers)
+        return real_values if is_live() else self._fake_values
 
     def get(self, variable: str) -> str:
         """Returns the value of the specified environment variable in live mode, or the sanitized value in playback.

tools/azure-sdk-tools/devtools_testutils/sanitizers.py

@@ -458,6 +458,9 @@ def add_batch_sanitizers(sanitizers: Dict[str, List[Optional[Dict[str, str]]]],
             data.append(sanitizer_definition)
 
     headers_to_send = {"Content-Type": "application/json"}
+    x_recording_id = get_recording_id()
+    if x_recording_id:
+        headers_to_send["x-recording-id"] = x_recording_id
     if headers is not None:
         for key in headers:
             if headers[key] is not None: