Skip to content

Commit f9f516f

Browse files
samvaitysamvaity
authored
[Test Proxy] Revisit the default common list for sanitizer removal (Azure#40311)
1 parent f14ef66 commit f9f516f

File tree

76 files changed

+382
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+382
-157
lines changed

‎sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/AadCredentialTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import org.junit.jupiter.params.ParameterizedTest;
1616
import org.junit.jupiter.params.provider.MethodSource;
1717

18-
import java.util.Arrays;
19-
2018
import static com.azure.data.appconfiguration.ConfigurationClientTestBase.FAKE_CONNECTION_STRING;
2119
import static com.azure.data.appconfiguration.TestHelper.DISPLAY_NAME_WITH_ARGUMENTS;
2220

@@ -60,7 +58,7 @@ private void setup(HttpClient httpClient, ConfigurationServiceVersion serviceVer
6058

6159
// Disable `("$.key")` sanitizer
6260
if (!interceptorManager.isLiveMode()) {
63-
interceptorManager.removeSanitizers(Arrays.asList("AZSDK3447"));
61+
interceptorManager.removeSanitizers("AZSDK3447");
6462
}
6563
}
6664

‎sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationAsyncClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private ConfigurationAsyncClient getConfigurationAsyncClient(HttpClient httpClie
9191

9292
// Disable `$.key` snanitizer
9393
if (!interceptorManager.isLiveMode()) {
94-
interceptorManager.removeSanitizers(Arrays.asList("AZSDK3447"));
94+
interceptorManager.removeSanitizers(REMOVE_SANITIZER_ID);
9595
}
9696
return builder.buildAsyncClient();
9797
});

‎sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientBuilderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public void nullServiceVersion(HttpClient httpClient) {
201201
}
202202
// Disable `("$.key")` sanitizer
203203
if (!interceptorManager.isLiveMode()) {
204-
interceptorManager.removeSanitizers(Collections.singletonList("AZSDK3447"));
204+
interceptorManager.removeSanitizers("AZSDK3447");
205205
}
206206

207207
ConfigurationSetting addedSetting = clientBuilder.buildClient().setConfigurationSetting(key, null, value);
@@ -235,7 +235,7 @@ public void defaultPipeline() {
235235

236236
// Disable `("$.key")` sanitizer
237237
if (!interceptorManager.isLiveMode()) {
238-
interceptorManager.removeSanitizers(Collections.singletonList("AZSDK3447"));
238+
interceptorManager.removeSanitizers("AZSDK3447");
239239
}
240240

241241
ConfigurationSetting addedSetting = clientBuilder

‎sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private ConfigurationClient getConfigurationClient(HttpClient httpClient,
8888

8989
// Disable `$.key` snanitizer
9090
if (!interceptorManager.isLiveMode()) {
91-
interceptorManager.removeSanitizers(Arrays.asList("AZSDK3447"));
91+
interceptorManager.removeSanitizers(REMOVE_SANITIZER_ID);
9292
}
9393
return builder.buildClient();
9494
});

‎sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTestBase.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ public abstract class ConfigurationClientTestBase extends TestProxyTestBase {
5151
private static final String LABEL_PREFIX = "label";
5252
private static final int PREFIX_LENGTH = 8;
5353
private static final int RESOURCE_LENGTH = 16;
54+
// Disable `("$.key")` and name sanitizer from the list of common sanitizers
55+
public static final String[] REMOVE_SANITIZER_ID = {"AZSDK3493", "AZSDK3447"};
5456

5557
public static final String FAKE_CONNECTION_STRING =
5658
"Endpoint=https://localhost:8080;Id=0000000000000;Secret=fakeSecrePlaceholder";

‎sdk/batch/azure-compute-batch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<dependency>
7878
<groupId>com.azure</groupId>
7979
<artifactId>azure-core-test</artifactId>
80-
<version>1.25.0</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
80+
<version>1.26.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure:azure-core-test;dependency} -->
8181
<scope>test</scope>
8282
</dependency>
8383
<dependency>

‎sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/BatchClientTestBase.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ protected void beforeTest() {
7979
addTestSanitizersAndRules(interceptorManager);
8080
}
8181

82+
if (!interceptorManager.isLiveMode()) {
83+
interceptorManager.removeSanitizers("AZSDK2003", "AZSDK3430", "AZSDK3493");
84+
}
85+
8286
authenticateClient(AuthMode.AAD);
8387

8488
batchClient = batchClientBuilder.buildClient();

‎sdk/communication/azure-communication-chat/src/test/java/com/azure/communication/chat/ChatClientTestBase.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ protected ChatClientBuilder getChatClientBuilder(String token, HttpClient httpCl
6060
if (!interceptorManager.isLiveMode()) {
6161
interceptorManager.addSanitizers(Arrays.asList(
6262
new TestProxySanitizer("token", null, "REDACTED", TestProxySanitizerType.BODY_KEY)));
63+
// Remove the sanitizer `id` from the list of common sanitizers
64+
interceptorManager.removeSanitizers("AZSDK3430");
6365
}
6466

6567
return builder;
@@ -88,6 +90,8 @@ protected ChatThreadClientBuilder getChatThreadClientBuilder(String token, HttpC
8890
if (!interceptorManager.isLiveMode()) {
8991
interceptorManager.addSanitizers(Arrays.asList(
9092
new TestProxySanitizer("token", null, "REDACTED", TestProxySanitizerType.BODY_KEY)));
93+
// Remove the sanitizer `id` from the list of common sanitizers
94+
interceptorManager.removeSanitizers("AZSDK3430");
9195
}
9296

9397
return builder;
@@ -110,6 +114,8 @@ protected CommunicationIdentityClientBuilder getCommunicationIdentityClientBuild
110114
if (!interceptorManager.isLiveMode()) {
111115
interceptorManager.addSanitizers(Arrays.asList(
112116
new TestProxySanitizer("token", null, "REDACTED", TestProxySanitizerType.BODY_KEY)));
117+
// Remove the sanitizer `id` from the list of common sanitizers
118+
interceptorManager.removeSanitizers("AZSDK3430");
113119
}
114120
return builder;
115121
}

‎sdk/communication/azure-communication-email/src/test/java/com/azure/communication/email/EmailTestBase.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ private EmailClientBuilder getEmailClientBuilder(HttpClient httpClient) {
5353
emailClientBuilder.addPolicy(recordPolicy);
5454
}
5555

56+
if (!interceptorManager.isLiveMode()) {
57+
// Remove `operation-location` sanitizers from list of common sanitizers
58+
interceptorManager.removeSanitizers("AZSDK2030");
59+
}
60+
5661
return emailClientBuilder;
5762
}
5863

‎sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/JobRouterTestBase.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141

4242
class JobRouterTestBase extends TestProxyTestBase {
4343
protected static final String JAVA_LIVE_TESTS = "JAVA_LIVE_TEST";
44+
private static final String[] REMOVE_SANITIZER_ID = {"AZSDK2003", "AZSDK2030", "AZSDK3430", "AZSDK3493", "AZSDK3490"};
45+
private boolean sanitizersRemoved = false;
4446

4547
protected String getConnectionString() {
4648
String connectionString = interceptorManager.isPlaybackMode()
@@ -57,10 +59,6 @@ protected JobRouterAdministrationClient getRouterAdministrationClient(HttpClient
5759
.endpoint(connectionString.getEndpoint())
5860
.pipeline(httpPipeline)
5961
.buildClient();
60-
// Disable `$..etag` sanitizer
61-
if (!interceptorManager.isLiveMode()) {
62-
interceptorManager.removeSanitizers(Arrays.asList("AZSDK3490"));
63-
}
6462
return jobRouterAdministrationClient;
6563
}
6664

@@ -71,10 +69,6 @@ protected JobRouterAdministrationAsyncClient getRouterAdministrationAsyncClient(
7169
.endpoint(connectionString.getEndpoint())
7270
.pipeline(httpPipeline)
7371
.buildAsyncClient();
74-
// Disable `$..etag` sanitizer
75-
if (!interceptorManager.isLiveMode()) {
76-
interceptorManager.removeSanitizers(Arrays.asList("AZSDK3490"));
77-
}
7872
return jobRouterAdministrationAsyncClient;
7973
}
8074

@@ -125,7 +119,11 @@ private HttpPipeline buildHttpPipeline(HttpClient httpClient) {
125119
if (interceptorManager.isRecordMode()) {
126120
policies.add(interceptorManager.getRecordPolicy());
127121
}
128-
122+
// Disable `$..etag` and name sanitizer
123+
if (!interceptorManager.isLiveMode() && !sanitizersRemoved) {
124+
interceptorManager.removeSanitizers(REMOVE_SANITIZER_ID);
125+
sanitizersRemoved = true;
126+
}
129127
HttpPipeline pipeline = new HttpPipelineBuilder()
130128
.policies(policies.toArray(new HttpPipelinePolicy[0]))
131129
.httpClient(interceptorManager.isPlaybackMode() ? interceptorManager.getPlaybackClient() : httpClient)

0 commit comments

Comments
 (0)