From 0be2fb094366c58ce1ac2a84bdd181fd14a09a0a Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Wed, 3 Jan 2024 11:24:27 -0800 Subject: [PATCH] Removing extra changes Signed-off-by: Varun Jain --- .../neuralsearch/OpenSearchSecureRestTestCase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/testFixtures/java/org/opensearch/neuralsearch/OpenSearchSecureRestTestCase.java b/src/testFixtures/java/org/opensearch/neuralsearch/OpenSearchSecureRestTestCase.java index efa45b205..12dbefbf8 100644 --- a/src/testFixtures/java/org/opensearch/neuralsearch/OpenSearchSecureRestTestCase.java +++ b/src/testFixtures/java/org/opensearch/neuralsearch/OpenSearchSecureRestTestCase.java @@ -9,6 +9,7 @@ import org.apache.http.ParseException; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.message.BasicHeader; @@ -109,9 +110,8 @@ private void configureHttpsClient(final RestClientBuilder builder, final Setting .orElseThrow(() -> new RuntimeException("user name is missing")); final String password = Optional.ofNullable(System.getProperty(SYS_PROPERTY_KEY_PASSWORD)) .orElseThrow(() -> new RuntimeException("password is missing")); - final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider(); - final AuthScope anyScope = new AuthScope(null, -1); - credentialsProvider.setCredentials(anyScope, new UsernamePasswordCredentials(userName, password)); + final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); + credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password)); try { return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider) // disable the certificate since our testing cluster just uses the default security configuration