revert

Azure · May 9, 2024 · 4f96094 · 4f96094
1 parent 974c702
commit 4f96094
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/sdk/core/azure-core-test/assets.json b/sdk/core/azure-core-test/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/core/azure-core-test",
-  "Tag": "java/core/azure-core-test_48fa0c3d54"
+  "Tag": "java/core/azure-core-test_6c6629f320"
 }
diff --git a/sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestProxyTestBase.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestProxyTestBase.java
@@ -29,7 +29,7 @@ public TestProxyTestBase() {
     public static void setupTestProxy() {
         testMode = initializeTestMode();
         if (isTestProxyEnabled() && (testMode == TestMode.PLAYBACK || testMode == TestMode.RECORD)) {
-           TestProxyManager.startProxy();
+            TestProxyManager.startProxy();
         }
     }
 }
diff --git a/sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/TestProxyPlaybackClient.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/TestProxyPlaybackClient.java
@@ -218,10 +218,10 @@ public HttpResponse sendSync(HttpRequest request, Context context) {
      */
     public void addProxySanitization(List<TestProxySanitizer> sanitizers) {
         if (isPlayingBack()) {
-            sanitizers.forEach(sanitizer -> {
-                HttpRequest request = createAddSanitizersRequest(List.of(sanitizer), proxyUrl).setHeader(X_RECORDING_ID, xRecordingId);
-                client.sendSync(request, Context.NONE).close();
-            });
+            HttpRequest request
+                = createAddSanitizersRequest(sanitizers, proxyUrl).setHeader(X_RECORDING_ID, xRecordingId);
+
+            client.sendSync(request, Context.NONE).close();
         } else {
             this.sanitizers.addAll(sanitizers);
         }

diff --git a/sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/TestProxyRecordPolicy.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/TestProxyRecordPolicy.java
@@ -194,14 +194,10 @@ public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineN
      */
     public void addProxySanitization(List<TestProxySanitizer> sanitizers) {
         if (isRecording()) {
-            sanitizers.forEach(sanitizer -> {
-                HttpRequest request = createAddSanitizersRequest(List.of(sanitizer), proxyUrl).setHeader(X_RECORDING_ID, xRecordingId);
-                client.sendSync(request, Context.NONE).close();
-            });
-//            HttpRequest request
-//                = createAddSanitizersRequest(sanitizers, proxyUrl).setHeader(X_RECORDING_ID, xRecordingId);
-//
-//            client.sendSync(request, Context.NONE).close();
+            HttpRequest request
+                = createAddSanitizersRequest(sanitizers, proxyUrl).setHeader(X_RECORDING_ID, xRecordingId);
+
+            client.sendSync(request, Context.NONE).close();
         } else {
             this.sanitizers.addAll(sanitizers);
         }

diff --git a/sdk/core/azure-core-test/src/test/java/com/azure/core/test/TestProxyTests.java b/sdk/core/azure-core-test/src/test/java/com/azure/core/test/TestProxyTests.java
@@ -231,7 +231,7 @@ public void testRecordWithRedaction() {
             assertEquals(REDACTED, record.getHeaders().get("Ocp-Apim-Subscription-Key"));
             assertTrue(record.getResponseHeaders()
                 .get("Operation-Location")
-                .startsWith("https://REDACTED"));
+                .startsWith("https://REDACTED/fr/models//905a58f9-131e-42b8-8410-493ab1517d62"));
             // custom sanitizers
             assertEquals(REDACTED, record.getResponse().get("modelId"));
             assertEquals(REDACTED, record.getResponse().get("client_secret"));