From 3460a8c2134a16d635f6066c5839e6d0cf61578b Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Fri, 26 Mar 2021 12:05:16 -0700 Subject: [PATCH] Fix a few more renaming issues. (#464) This commit fixes some more missed instances where we can perform the renaming to OpenSearch. Signed-off-by: Rabi Panda --- ...DistributionArchiveCheckPluginFuncTest.groovy | 2 +- .../gradle/DistributionDownloadPlugin.java | 4 ++-- .../gradle/testclusters/OpenSearchNode.java | 12 ++++++++---- .../gradle/testclusters/TestClustersPlugin.java | 4 ++-- .../org/opensearch/client/sniff/Sniffer.java | 2 +- .../opensearch/client/sniff/SnifferTests.java | 2 +- .../opensearch/plugins/InstallPluginCommand.java | 2 +- .../plugins/InstallPluginCommandTests.java | 2 +- .../plugins/ListPluginsCommandTests.java | 4 ++-- .../discovery/gce/GceSeedHostsProvider.java | 16 ++++++++-------- .../java/org/opensearch/bootstrap/Security.java | 2 +- .../java/org/opensearch/env/NodeEnvironment.java | 2 +- .../opensearch/monitor/fs/FsHealthService.java | 2 +- .../java/org/opensearch/plugins/PluginInfo.java | 6 +++--- .../bootstrap/BootstrapForTesting.java | 6 ++++-- .../org/opensearch/plugins/PluginTestUtil.java | 2 +- 16 files changed, 38 insertions(+), 32 deletions(-) diff --git a/buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy index 4f3e98d04f3d3..75194f7aa269b 100644 --- a/buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy +++ b/buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy @@ -79,7 +79,7 @@ class InternalDistributionArchiveCheckPluginFuncTest extends AbstractGradleFuncT def "fails on unexpected notice content"() { given: license(file("LICENSE.txt")) - file("NOTICE.txt").text = """Elasticsearch + file("NOTICE.txt").text = """OpenSearch Copyright 2009-2018 Acme Coorp""" buildFile << """ apply plugin:'base' diff --git a/buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java index a3446e18ea526..5805f3b3cbc68 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java @@ -53,7 +53,7 @@ public class DistributionDownloadPlugin implements Plugin { private static final String FAKE_SNAPSHOT_IVY_GROUP = "opensearch-distribution-snapshot"; private static final String DOWNLOAD_REPO_NAME = "opensearch-downloads"; private static final String SNAPSHOT_REPO_NAME = "opensearch-snapshots"; - public static final String DISTRO_EXTRACTED_CONFIG_PREFIX = "es_distro_extracted_"; + public static final String DISTRO_EXTRACTED_CONFIG_PREFIX = "opensearch_distro_extracted_"; private NamedDomainObjectContainer distributionsContainer; private NamedDomainObjectContainer distributionsResolutionStrategiesContainer; @@ -85,7 +85,7 @@ public void apply(Project project) { private void setupDistributionContainer(Project project, Provider dockerSupport) { distributionsContainer = project.container(OpenSearchDistribution.class, name -> { - Configuration fileConfiguration = project.getConfigurations().create("es_distro_file_" + name); + Configuration fileConfiguration = project.getConfigurations().create("opensearch_distro_file_" + name); Configuration extractedConfiguration = project.getConfigurations().create(DISTRO_EXTRACTED_CONFIG_PREFIX + name); extractedConfiguration.getAttributes().attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.DIRECTORY_TYPE); return new OpenSearchDistribution(name, project.getObjects(), dockerSupport, fileConfiguration, extractedConfiguration); diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java index 7f73c15f01bd2..531edfc03940d 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java @@ -96,8 +96,8 @@ public class OpenSearchNode implements TestClusterConfiguration { private static final Logger LOGGER = Logging.getLogger(OpenSearchNode.class); - private static final int ES_DESTROY_TIMEOUT = 20; - private static final TimeUnit ES_DESTROY_TIMEOUT_UNIT = TimeUnit.SECONDS; + private static final int OPENSEARCH_DESTROY_TIMEOUT = 20; + private static final TimeUnit OPENSEARCH_DESTROY_TIMEOUT_UNIT = TimeUnit.SECONDS; private static final int NODE_UP_TIMEOUT = 2; private static final TimeUnit NODE_UP_TIMEOUT_UNIT = TimeUnit.MINUTES; @@ -916,7 +916,11 @@ private void stopHandle(ProcessHandle processHandle, boolean forcibly) { if (processHandle.isAlive() == false) { return; } - LOGGER.info("process did not terminate after {} {}, stopping it forcefully", ES_DESTROY_TIMEOUT, ES_DESTROY_TIMEOUT_UNIT); + LOGGER.info( + "process did not terminate after {} {}, stopping it forcefully", + OPENSEARCH_DESTROY_TIMEOUT, + OPENSEARCH_DESTROY_TIMEOUT_UNIT + ); processHandle.destroyForcibly(); } @@ -1007,7 +1011,7 @@ private String normalizeLogLine(String line) { private void waitForProcessToExit(ProcessHandle processHandle) { try { - processHandle.onExit().get(ES_DESTROY_TIMEOUT, ES_DESTROY_TIMEOUT_UNIT); + processHandle.onExit().get(OPENSEARCH_DESTROY_TIMEOUT, OPENSEARCH_DESTROY_TIMEOUT_UNIT); } catch (InterruptedException e) { LOGGER.info("Interrupted while waiting for ES process", e); Thread.currentThread().interrupt(); diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/TestClustersPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/TestClustersPlugin.java index dbbd33eb13ba6..bf38283877c9b 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/TestClustersPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/TestClustersPlugin.java @@ -137,8 +137,8 @@ private NamedDomainObjectContainer createTestClustersContaine private void createListClustersTask(Project project, NamedDomainObjectContainer container) { // Task is never up to date so we can pass an lambda for the task action project.getTasks().register(LIST_TASK_NAME, task -> { - task.setGroup("ES cluster formation"); - task.setDescription("Lists all ES clusters configured for this project"); + task.setGroup("OpenSearch cluster formation"); + task.setDescription("Lists all OpenSearch clusters configured for this project"); task.doLast( (Task t) -> container.forEach(cluster -> logger.lifecycle(" * {}: {}", cluster.getName(), cluster.getNumberOfNodes())) ); diff --git a/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java b/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java index bb61126051561..1648cdb9e0f5a 100644 --- a/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java +++ b/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java @@ -52,7 +52,7 @@ public class Sniffer implements Closeable { private static final Log logger = LogFactory.getLog(Sniffer.class); - private static final String SNIFFER_THREAD_NAME = "es_rest_client_sniffer"; + private static final String SNIFFER_THREAD_NAME = "opensearch_rest_client_sniffer"; private final NodesSniffer nodesSniffer; private final RestClient restClient; diff --git a/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java b/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java index 2bc32013103fa..3e5f3037c050b 100644 --- a/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java +++ b/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java @@ -630,7 +630,7 @@ public void run() { } }); - assertThat(thread.getName(), equalTo("es_rest_client_sniffer[T#" + i + "]")); + assertThat(thread.getName(), equalTo("opensearch_rest_client_sniffer[T#" + i + "]")); assertThat(thread.isDaemon(), is(true)); } } finally { diff --git a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java index f80e31e0275b7..dc9b5124a88e6 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java @@ -850,7 +850,7 @@ private PluginInfo installPlugin(Terminal terminal, boolean isBatch, Path tmpRoo throws Exception { final PluginInfo info = loadPluginInfo(terminal, tmpRoot, env); // read optional security policy (extra permissions), if it exists, confirm or warn the user - Path policy = tmpRoot.resolve(PluginInfo.ES_PLUGIN_POLICY); + Path policy = tmpRoot.resolve(PluginInfo.OPENSEARCH_PLUGIN_POLICY); final Set permissions; if (Files.exists(policy)) { permissions = PluginSecurity.parsePermissions(policy, env.tmpFile()); diff --git a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java index b9bd05c67168c..55930436ff909 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java @@ -755,7 +755,7 @@ public void testMissingDescriptor() throws Exception { public void testContainsIntermediateDirectory() throws Exception { Tuple env = createEnv(fs, temp); Path pluginDir = createPluginDir(temp); - Files.createFile(pluginDir.resolve(PluginInfo.ES_PLUGIN_PROPERTIES)); + Files.createFile(pluginDir.resolve(PluginInfo.OPENSEARCH_PLUGIN_PROPERTIES)); String pluginZip = writeZip(pluginDir, "opensearch").toUri().toURL().toString(); UserException e = expectThrows(UserException.class, () -> installPlugin(pluginZip, env.v1())); assertThat(e.getMessage(), containsString("This plugin was built with an older plugin structure")); diff --git a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java index ba863f6091a83..4b4e9d42f525c 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java @@ -228,14 +228,14 @@ public void testPluginWithoutDescriptorFile() throws Exception { final Path pluginDir = env.pluginsFile().resolve("fake1"); Files.createDirectories(pluginDir); NoSuchFileException e = expectThrows(NoSuchFileException.class, () -> listPlugins(home)); - assertEquals(pluginDir.resolve(PluginInfo.ES_PLUGIN_PROPERTIES).toString(), e.getFile()); + assertEquals(pluginDir.resolve(PluginInfo.OPENSEARCH_PLUGIN_PROPERTIES).toString(), e.getFile()); } public void testPluginWithWrongDescriptorFile() throws Exception { final Path pluginDir = env.pluginsFile().resolve("fake1"); PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc"); IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> listPlugins(home)); - final Path descriptorPath = pluginDir.resolve(PluginInfo.ES_PLUGIN_PROPERTIES); + final Path descriptorPath = pluginDir.resolve(PluginInfo.OPENSEARCH_PLUGIN_PROPERTIES); assertEquals("property [name] is missing in [" + descriptorPath.toString() + "]", e.getMessage()); } diff --git a/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java b/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java index 271df89ed8195..ad6759e1b069b 100644 --- a/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java +++ b/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java @@ -219,20 +219,20 @@ public List getSeedAddresses(HostsResolver hostsResolver) { logger.trace("current node found. Ignoring {} - {}", name, ip_private); } else { String address = ip_private; - // Test if we have es_port metadata defined here - if (instance.getMetadata() != null && instance.getMetadata().containsKey("es_port")) { - Object es_port = instance.getMetadata().get("es_port"); - logger.trace("es_port is defined with {}", es_port); - if (es_port instanceof String) { - address = address.concat(":").concat((String) es_port); + // Test if we have opensearch_port metadata defined here + if (instance.getMetadata() != null && instance.getMetadata().containsKey("opensearch_port")) { + Object opensearch_port = instance.getMetadata().get("opensearch_port"); + logger.trace("opensearch_port is defined with {}", opensearch_port); + if (opensearch_port instanceof String) { + address = address.concat(":").concat((String) opensearch_port); } else { // Ignoring other values - logger.trace("es_port is instance of {}. Ignoring...", es_port.getClass().getName()); + logger.trace("opensearch_port is instance of {}. Ignoring...", opensearch_port.getClass().getName()); } } // ip_private is a single IP Address. We need to build a TransportAddress from it - // If user has set `es_port` metadata, we don't need to ping all ports + // If user has set `opensearch_port` metadata, we don't need to ping all ports TransportAddress[] addresses = transportService.addressesFromString(address); for (TransportAddress transportAddress : addresses) { diff --git a/server/src/main/java/org/opensearch/bootstrap/Security.java b/server/src/main/java/org/opensearch/bootstrap/Security.java index 2c45f42cf12ff..f5b0e8e7cafcc 100644 --- a/server/src/main/java/org/opensearch/bootstrap/Security.java +++ b/server/src/main/java/org/opensearch/bootstrap/Security.java @@ -168,7 +168,7 @@ static Map getPluginPermissions(Environment environment) throws I // now process each one for (Path plugin : pluginsAndModules) { - Path policyFile = plugin.resolve(PluginInfo.ES_PLUGIN_POLICY); + Path policyFile = plugin.resolve(PluginInfo.OPENSEARCH_PLUGIN_POLICY); if (Files.exists(policyFile)) { // first get a list of URLs for the plugins' jars: // we resolve symlinks so map is keyed on the normalize codebase name diff --git a/server/src/main/java/org/opensearch/env/NodeEnvironment.java b/server/src/main/java/org/opensearch/env/NodeEnvironment.java index 412607bff5745..18edec0ef1f31 100644 --- a/server/src/main/java/org/opensearch/env/NodeEnvironment.java +++ b/server/src/main/java/org/opensearch/env/NodeEnvironment.java @@ -1244,7 +1244,7 @@ private void assertCanWrite() throws IOException { } // package private for testing - static final String TEMP_FILE_NAME = ".es_temp_file"; + static final String TEMP_FILE_NAME = ".opensearch_temp_file"; private static void tryWriteTempFile(Path path) throws IOException { if (Files.exists(path)) { diff --git a/server/src/main/java/org/opensearch/monitor/fs/FsHealthService.java b/server/src/main/java/org/opensearch/monitor/fs/FsHealthService.java index 1d2a11aa6c902..305bc1e61a49b 100644 --- a/server/src/main/java/org/opensearch/monitor/fs/FsHealthService.java +++ b/server/src/main/java/org/opensearch/monitor/fs/FsHealthService.java @@ -133,7 +133,7 @@ public StatusInfo getHealth() { class FsHealthMonitor implements Runnable { - static final String TEMP_FILE_NAME = ".es_temp_file"; + static final String TEMP_FILE_NAME = ".opensearch_temp_file"; private byte[] byteToWrite; FsHealthMonitor(){ diff --git a/server/src/main/java/org/opensearch/plugins/PluginInfo.java b/server/src/main/java/org/opensearch/plugins/PluginInfo.java index e2e8232078d6c..181504960feaf 100644 --- a/server/src/main/java/org/opensearch/plugins/PluginInfo.java +++ b/server/src/main/java/org/opensearch/plugins/PluginInfo.java @@ -46,8 +46,8 @@ */ public class PluginInfo implements Writeable, ToXContentObject { - public static final String ES_PLUGIN_PROPERTIES = "plugin-descriptor.properties"; - public static final String ES_PLUGIN_POLICY = "plugin-security.policy"; + public static final String OPENSEARCH_PLUGIN_PROPERTIES = "plugin-descriptor.properties"; + public static final String OPENSEARCH_PLUGIN_POLICY = "plugin-security.policy"; private final String name; private final String description; @@ -148,7 +148,7 @@ public void writeTo(final StreamOutput out) throws IOException { * @throws IOException if an I/O exception occurred reading the plugin descriptor */ public static PluginInfo readFromProperties(final Path path) throws IOException { - final Path descriptor = path.resolve(ES_PLUGIN_PROPERTIES); + final Path descriptor = path.resolve(OPENSEARCH_PLUGIN_PROPERTIES); final Map propsMap; { diff --git a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java index 3c2ac0426433b..8045d8cc25d20 100644 --- a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java +++ b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java @@ -162,7 +162,8 @@ public boolean implies(ProtectionDomain domain, Permission permission) { // guarantee plugin classes are initialized first, in case they have one-time hacks. // this just makes unit testing more realistic - for (URL url : Collections.list(BootstrapForTesting.class.getClassLoader().getResources(PluginInfo.ES_PLUGIN_PROPERTIES))) { + for (URL url : Collections.list( + BootstrapForTesting.class.getClassLoader().getResources(PluginInfo.OPENSEARCH_PLUGIN_PROPERTIES))) { Properties properties = new Properties(); try (InputStream stream = FileSystemUtils.openFileURLStream(url)) { properties.load(stream); @@ -200,7 +201,8 @@ private static void addClassCodebase(Map codebases, String name, St */ @SuppressForbidden(reason = "accesses fully qualified URLs to configure security") static Map getPluginPermissions() throws Exception { - List pluginPolicies = Collections.list(BootstrapForTesting.class.getClassLoader().getResources(PluginInfo.ES_PLUGIN_POLICY)); + List pluginPolicies = + Collections.list(BootstrapForTesting.class.getClassLoader().getResources(PluginInfo.OPENSEARCH_PLUGIN_POLICY)); if (pluginPolicies.isEmpty()) { return Collections.emptyMap(); } diff --git a/test/framework/src/main/java/org/opensearch/plugins/PluginTestUtil.java b/test/framework/src/main/java/org/opensearch/plugins/PluginTestUtil.java index 1cbe1fb25a123..5b132797e9469 100644 --- a/test/framework/src/main/java/org/opensearch/plugins/PluginTestUtil.java +++ b/test/framework/src/main/java/org/opensearch/plugins/PluginTestUtil.java @@ -29,7 +29,7 @@ public class PluginTestUtil { public static void writePluginProperties(Path pluginDir, String... stringProps) throws IOException { - writeProperties(pluginDir.resolve(PluginInfo.ES_PLUGIN_PROPERTIES), stringProps); + writeProperties(pluginDir.resolve(PluginInfo.OPENSEARCH_PLUGIN_PROPERTIES), stringProps); } /** convenience method to write a plugin properties file */