From ad015fdaa3b12016c00f748a8f43f390623e3233 Mon Sep 17 00:00:00 2001 From: Vacha Date: Wed, 19 May 2021 11:31:22 -0700 Subject: [PATCH] Rename classes, variables, methods to incorporate OpenSearch (#21) Signed-off-by: Vacha Shah --- .../opensearch}/commons/ConfigConstants.java | 16 +++++----- .../opensearch}/commons/InjectSecurity.java | 10 +++--- .../authuser/AuthUserRequestBuilder.java | 0 .../opensearch}/commons/authuser/User.java | 0 .../commons/rest/SecureRestClientBuilder.java | 10 +++--- .../opensearch}/commons/rest/TrustStore.java | 0 .../commons/InjectSecurityTest.java | 16 +++++----- .../commons/authuser/UserTest.java | 32 +++++++++---------- .../commons/rest/IntegrationTests.java | 28 ++++++++-------- .../rest/SecureRestClientBuilderTest.java | 0 .../commons/rest/TrustStoreTest.java | 0 11 files changed, 56 insertions(+), 56 deletions(-) rename src/main/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/ConfigConstants.java (79%) rename src/main/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/InjectSecurity.java (94%) rename src/main/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/authuser/AuthUserRequestBuilder.java (100%) rename src/main/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/authuser/User.java (100%) rename src/main/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/rest/SecureRestClientBuilder.java (96%) rename src/main/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/rest/TrustStore.java (100%) rename src/test/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/InjectSecurityTest.java (89%) rename src/test/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/authuser/UserTest.java (89%) rename src/test/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/rest/IntegrationTests.java (82%) rename src/test/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/rest/SecureRestClientBuilderTest.java (100%) rename src/test/java/{com/amazon/opendistroforelasticsearch => org/opensearch}/commons/rest/TrustStoreTest.java (100%) diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/commons/ConfigConstants.java b/src/main/java/org/opensearch/commons/ConfigConstants.java similarity index 79% rename from src/main/java/com/amazon/opendistroforelasticsearch/commons/ConfigConstants.java rename to src/main/java/org/opensearch/commons/ConfigConstants.java index 2d8d835f..70062e0f 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/commons/ConfigConstants.java +++ b/src/main/java/org/opensearch/commons/ConfigConstants.java @@ -38,13 +38,13 @@ public class ConfigConstants { public static final String AUTHORIZATION = "Authorization"; // These reside in security plugin. - public static final String OPENDISTRO_SECURITY_SSL_HTTP_PEMCERT_FILEPATH = "opendistro_security.ssl.http.pemcert_filepath"; - public static final String OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH = "opendistro_security.ssl.http.keystore_filepath"; - public static final String OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD = "opendistro_security.ssl.http.keystore_password"; - public static final String OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD = "opendistro_security.ssl.http.keystore_keypassword"; - public static final String OPENDISTRO_SECURITY_INJECTED_ROLES = "opendistro_security_injected_roles"; + public static final String OPENSEARCH_SECURITY_SSL_HTTP_PEMCERT_FILEPATH = "opendistro_security.ssl.http.pemcert_filepath"; + public static final String OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH = "opendistro_security.ssl.http.keystore_filepath"; + public static final String OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD = "opendistro_security.ssl.http.keystore_password"; + public static final String OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD = "opendistro_security.ssl.http.keystore_keypassword"; + public static final String OPENSEARCH_SECURITY_INJECTED_ROLES = "opendistro_security_injected_roles"; public static final String INJECTED_USER = "injected_user"; - public static final String OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS = "opendistro_security_use_injected_user_for_plugins"; - public static final String OPENDISTRO_SECURITY_SSL_HTTP_ENABLED = "opendistro_security.ssl.http.enabled"; - public static final String OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT = "_opendistro_security_user_info"; + public static final String OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS = "opendistro_security_use_injected_user_for_plugins"; + public static final String OPENSEARCH_SECURITY_SSL_HTTP_ENABLED = "opendistro_security.ssl.http.enabled"; + public static final String OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT = "_opendistro_security_user_info"; } diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/commons/InjectSecurity.java b/src/main/java/org/opensearch/commons/InjectSecurity.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/commons/InjectSecurity.java rename to src/main/java/org/opensearch/commons/InjectSecurity.java index 9181b326..8c3cd5a6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/commons/InjectSecurity.java +++ b/src/main/java/org/opensearch/commons/InjectSecurity.java @@ -27,8 +27,8 @@ package org.opensearch.commons; import static org.opensearch.commons.ConfigConstants.INJECTED_USER; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_INJECTED_ROLES; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_INJECTED_ROLES; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS; import java.util.List; @@ -116,7 +116,7 @@ public InjectSecurity(final String id, final Settings settings, final ThreadCont * @param roles */ public void inject(final String user, final List roles) { - boolean injectUser = settings.getAsBoolean(OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS, false); + boolean injectUser = settings.getAsBoolean(OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS, false); if (injectUser) injectUser(user); else @@ -152,8 +152,8 @@ public void injectRoles(final List roles) { final String rolesStr = String.join(",", roles); String injectStr = "plugin|" + rolesStr; - if (threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES) == null) { - threadContext.putTransient(OPENDISTRO_SECURITY_INJECTED_ROLES, injectStr); + if (threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES) == null) { + threadContext.putTransient(OPENSEARCH_SECURITY_INJECTED_ROLES, injectStr); log.debug("{}, InjectSecurity - inject roles: {}", Thread.currentThread().getName(), id); } else { log.error("{}, InjectSecurity- most likely thread context corruption : {}", Thread.currentThread().getName(), id); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/commons/authuser/AuthUserRequestBuilder.java b/src/main/java/org/opensearch/commons/authuser/AuthUserRequestBuilder.java similarity index 100% rename from src/main/java/com/amazon/opendistroforelasticsearch/commons/authuser/AuthUserRequestBuilder.java rename to src/main/java/org/opensearch/commons/authuser/AuthUserRequestBuilder.java diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/commons/authuser/User.java b/src/main/java/org/opensearch/commons/authuser/User.java similarity index 100% rename from src/main/java/com/amazon/opendistroforelasticsearch/commons/authuser/User.java rename to src/main/java/org/opensearch/commons/authuser/User.java diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/commons/rest/SecureRestClientBuilder.java b/src/main/java/org/opensearch/commons/rest/SecureRestClientBuilder.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/commons/rest/SecureRestClientBuilder.java rename to src/main/java/org/opensearch/commons/rest/SecureRestClientBuilder.java index 2d77af8a..109809a8 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/commons/rest/SecureRestClientBuilder.java +++ b/src/main/java/org/opensearch/commons/rest/SecureRestClientBuilder.java @@ -143,7 +143,7 @@ public SecureRestClientBuilder(HttpHost[] httpHosts, final boolean httpSSLEnable public SecureRestClientBuilder(Settings settings, Path configPath) { - this.httpSSLEnabled = settings.getAsBoolean(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_ENABLED, false); + this.httpSSLEnabled = settings.getAsBoolean(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_ENABLED, false); this.settings = settings; this.configPath = configPath; this.user = null; @@ -285,17 +285,17 @@ private String resolve(final String originalFile, final Path configPath) { } private String getTrustPem() { - return settings.get(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_PEMCERT_FILEPATH, null); + return settings.get(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_PEMCERT_FILEPATH, null); } private String getKeystorePasswd() { - return settings.get(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, null); + return settings.get(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, null); } private KeyStore getKeyStore() throws IOException, GeneralSecurityException { KeyStore keyStore = KeyStore.getInstance("jks"); - String keyStoreFile = settings.get(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, null); - String passwd = settings.get(ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, null); + String keyStoreFile = settings.get(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, null); + String passwd = settings.get(ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, null); if (Strings.isNullOrEmpty(keyStoreFile) || Strings.isNullOrEmpty(passwd)) { return null; } diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/commons/rest/TrustStore.java b/src/main/java/org/opensearch/commons/rest/TrustStore.java similarity index 100% rename from src/main/java/com/amazon/opendistroforelasticsearch/commons/rest/TrustStore.java rename to src/main/java/org/opensearch/commons/rest/TrustStore.java diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/commons/InjectSecurityTest.java b/src/test/java/org/opensearch/commons/InjectSecurityTest.java similarity index 89% rename from src/test/java/com/amazon/opendistroforelasticsearch/commons/InjectSecurityTest.java rename to src/test/java/org/opensearch/commons/InjectSecurityTest.java index 382a43b0..1b065f1d 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/commons/InjectSecurityTest.java +++ b/src/test/java/org/opensearch/commons/InjectSecurityTest.java @@ -30,8 +30,8 @@ import static junit.framework.TestCase.assertNull; import static org.junit.Assert.assertEquals; import static org.opensearch.commons.ConfigConstants.INJECTED_USER; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_INJECTED_ROLES; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_INJECTED_ROLES; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS; import java.util.Arrays; @@ -48,7 +48,7 @@ public void testUsersRolesEmpty() { try (InjectSecurity helper = new InjectSecurity("test-name", Settings.EMPTY, tc)) { helper.inject("", null); } - Assert.assertNull(tc.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES)); + Assert.assertNull(tc.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES)); } @Test @@ -68,18 +68,18 @@ public void testInjectRoles() { assertEquals("1", threadContext.getHeader("default")); assertEquals("opendistro", threadContext.getHeader("name")); assertEquals("plugin", threadContext.getTransient("ctx.name")); - assertNotNull(threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES)); - assertEquals("plugin|ops-role,logs-role", threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES)); + assertNotNull(threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES)); + assertEquals("plugin|ops-role,logs-role", threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES)); } assertEquals("1", threadContext.getHeader("default")); assertEquals("opendistro", threadContext.getHeader("name")); assertEquals("plugin", threadContext.getTransient("ctx.name")); - assertNull(threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES)); + assertNull(threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES)); } @Test public void testInjectUser() { - Settings settings = Settings.builder().put(OPENDISTRO_SECURITY_USE_INJECTED_USER_FOR_PLUGINS, true).build(); + Settings settings = Settings.builder().put(OPENSEARCH_SECURITY_USE_INJECTED_USER_FOR_PLUGINS, true).build(); Settings headerSettings = Settings.builder().put("request.headers.default", "1").build(); ThreadContext threadContext = new ThreadContext(headerSettings); threadContext.putHeader("name", "opendistro"); @@ -94,7 +94,7 @@ public void testInjectUser() { assertEquals("1", threadContext.getHeader("default")); assertEquals("opendistro", threadContext.getHeader("name")); assertEquals("plugin", threadContext.getTransient("ctx.name")); - assertNull(threadContext.getTransient(OPENDISTRO_SECURITY_INJECTED_ROLES)); + assertNull(threadContext.getTransient(OPENSEARCH_SECURITY_INJECTED_ROLES)); assertNotNull(threadContext.getTransient(INJECTED_USER)); assertEquals("joe", threadContext.getTransient(INJECTED_USER)); } diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/commons/authuser/UserTest.java b/src/test/java/org/opensearch/commons/authuser/UserTest.java similarity index 89% rename from src/test/java/com/amazon/opendistroforelasticsearch/commons/authuser/UserTest.java rename to src/test/java/org/opensearch/commons/authuser/UserTest.java index c3e2a24d..69b6efea 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/commons/authuser/UserTest.java +++ b/src/test/java/org/opensearch/commons/authuser/UserTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT; import java.io.IOException; import java.util.Arrays; @@ -133,8 +133,8 @@ public void testStreamConstForTenantUser() throws IOException { @Test public void testParseUserString() { ThreadContext tc = new ThreadContext(Settings.EMPTY); - tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|bckrole1,bckrol2|role1,role2|myTenant"); - String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT); + tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|bckrole1,bckrol2|role1,role2|myTenant"); + String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT); User user = User.parse(str); assertEquals("myuser", user.getName()); @@ -148,7 +148,7 @@ public void testParseUserString() { @Test public void testParseUserStringEmpty() { ThreadContext tc = new ThreadContext(Settings.EMPTY); - String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT); + String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT); User user = User.parse(str); assertEquals(null, user); } @@ -156,8 +156,8 @@ public void testParseUserStringEmpty() { @Test public void testParseUserStringName() { ThreadContext tc = new ThreadContext(Settings.EMPTY); - tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser||"); - String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT); + tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser||"); + String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT); User user = User.parse(str); assertEquals("myuser", user.getName()); @@ -168,8 +168,8 @@ public void testParseUserStringName() { @Test public void testParseUserStringNameWithTenant() { ThreadContext tc = new ThreadContext(Settings.EMPTY); - tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|||myTenant"); - String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT); + tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|||myTenant"); + String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT); User user = User.parse(str); assertEquals("myuser", user.getName()); @@ -181,8 +181,8 @@ public void testParseUserStringNameWithTenant() { @Test public void testParseUserStringNobackendRoles() { ThreadContext tc = new ThreadContext(Settings.EMPTY); - tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser||role1,role2"); - String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT); + tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser||role1,role2"); + String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT); User user = User.parse(str); assertEquals("myuser", user.getName()); @@ -193,8 +193,8 @@ public void testParseUserStringNobackendRoles() { @Test public void testParseUserStringNoRoles() { ThreadContext tc = new ThreadContext(Settings.EMPTY); - tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|brole1,brole2|"); - String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT); + tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|brole1,brole2|"); + String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT); User user = User.parse(str); assertEquals("myuser", user.getName()); @@ -205,8 +205,8 @@ public void testParseUserStringNoRoles() { @Test public void testParseUserStringNoRolesWithTenant() { ThreadContext tc = new ThreadContext(Settings.EMPTY); - tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|brole1,brole2||myTenant"); - String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT); + tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "myuser|brole1,brole2||myTenant"); + String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT); User user = User.parse(str); assertEquals("myuser", user.getName()); @@ -218,8 +218,8 @@ public void testParseUserStringNoRolesWithTenant() { @Test public void testParseUserStringMalformed() { ThreadContext tc = new ThreadContext(Settings.EMPTY); - tc.putTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT, "|backendrole1,backendrole2|role1,role2"); - String str = tc.getTransient(OPENDISTRO_SECURITY_USER_INFO_THREAD_CONTEXT); + tc.putTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, "|backendrole1,backendrole2|role1,role2"); + String str = tc.getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT); User user = User.parse(str); assertEquals(null, user); } diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/commons/rest/IntegrationTests.java b/src/test/java/org/opensearch/commons/rest/IntegrationTests.java similarity index 82% rename from src/test/java/com/amazon/opendistroforelasticsearch/commons/rest/IntegrationTests.java rename to src/test/java/org/opensearch/commons/rest/IntegrationTests.java index 19c5f835..012fa80a 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/commons/rest/IntegrationTests.java +++ b/src/test/java/org/opensearch/commons/rest/IntegrationTests.java @@ -28,11 +28,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_ENABLED; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD; -import static org.opensearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_PEMCERT_FILEPATH; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_ENABLED; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD; +import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_PEMCERT_FILEPATH; import java.io.File; import java.nio.file.Path; @@ -74,11 +74,11 @@ public void testCreateRestClientWithCerts() throws Exception { Settings settings = Settings .builder() .put("http.port", 9200) - .put(OPENDISTRO_SECURITY_SSL_HTTP_ENABLED, true) - .put(OPENDISTRO_SECURITY_SSL_HTTP_PEMCERT_FILEPATH, "sample.pem") - .put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, "test-kirk.jks") - .put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, "changeit") - .put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, "changeit") + .put(OPENSEARCH_SECURITY_SSL_HTTP_ENABLED, true) + .put(OPENSEARCH_SECURITY_SSL_HTTP_PEMCERT_FILEPATH, "sample.pem") + .put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, "test-kirk.jks") + .put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, "changeit") + .put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, "changeit") .build(); RestClient client = new SecureRestClientBuilder(settings, configPath).build(); @@ -96,10 +96,10 @@ public void testCreateRestClientWithoutPem() throws Exception { Settings settings = Settings .builder() .put("http.port", 9200) - .put(OPENDISTRO_SECURITY_SSL_HTTP_ENABLED, true) - .put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, "test-kirk.jks") - .put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, "changeit") - .put(OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, "changeit") + .put(OPENSEARCH_SECURITY_SSL_HTTP_ENABLED, true) + .put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH, "test-kirk.jks") + .put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_PASSWORD, "changeit") + .put(OPENSEARCH_SECURITY_SSL_HTTP_KEYSTORE_KEYPASSWORD, "changeit") .build(); RestClient client = new SecureRestClientBuilder(settings, configPath).build(); diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/commons/rest/SecureRestClientBuilderTest.java b/src/test/java/org/opensearch/commons/rest/SecureRestClientBuilderTest.java similarity index 100% rename from src/test/java/com/amazon/opendistroforelasticsearch/commons/rest/SecureRestClientBuilderTest.java rename to src/test/java/org/opensearch/commons/rest/SecureRestClientBuilderTest.java diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/commons/rest/TrustStoreTest.java b/src/test/java/org/opensearch/commons/rest/TrustStoreTest.java similarity index 100% rename from src/test/java/com/amazon/opendistroforelasticsearch/commons/rest/TrustStoreTest.java rename to src/test/java/org/opensearch/commons/rest/TrustStoreTest.java