Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Elasticsearch: Unharcode localhost for container's
Change-Id: Id798846df3bc48b4266cec545b2ad607a1a4a06b
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java b/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java
index 9aaf4bb..43307c0 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java
@@ -25,16 +25,19 @@
public final class ElasticTestUtils {
public static class ElasticNodeInfo {
+ public final String hostname;
public final int port;
- public ElasticNodeInfo(int port) {
+ public ElasticNodeInfo(String hostname, int port) {
+ this.hostname = hostname;
this.port = port;
}
}
- public static void configure(Config config, int port, String prefix, ElasticVersion version) {
+ public static void configure(
+ Config config, String hostname, int port, String prefix, ElasticVersion version) {
config.setEnum("index", null, "type", IndexType.ELASTICSEARCH);
- config.setString("elasticsearch", null, "server", "http://localhost:" + port);
+ config.setString("elasticsearch", null, "server", "http://" + hostname + ":" + port);
config.setString("elasticsearch", null, "prefix", prefix);
config.setInt("index", null, "maxLimit", 10000);
String password = version == ElasticVersion.V5_6 ? "changeme" : null;
@@ -43,8 +46,8 @@
}
}
- public static void configure(Config config, int port, String prefix) {
- configure(config, port, prefix, null);
+ public static void configure(Config config, String hostname, int port, String prefix) {
+ configure(config, hostname, port, prefix, null);
}
public static void createAllIndexes(Injector injector) {
@@ -56,12 +59,13 @@
}
public static Config getConfig(ElasticVersion version) {
- ElasticNodeInfo elasticNodeInfo;
ElasticContainer container = ElasticContainer.createAndStart(version);
- elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ ElasticNodeInfo elasticNodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
String indicesPrefix = UUID.randomUUID().toString();
Config cfg = new Config();
- configure(cfg, elasticNodeInfo.port, indicesPrefix, version);
+ configure(cfg, elasticNodeInfo.hostname, elasticNodeInfo.port, indicesPrefix, version);
return cfg;
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java
index 27868d2..cc9bcc1 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -64,7 +66,7 @@
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java
index 2e4e22a..9c6cb2b 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -64,7 +66,7 @@
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java
index 98c4321..9f8a6b5 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -64,7 +66,7 @@
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java
index 6b4b58c..3e3bb57 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V5_6);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -64,7 +66,7 @@
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
ElasticTestUtils.configure(
- elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java
index e39c9b4..8cbff5b 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -63,7 +65,8 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java
index f97d23c..f72661a 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java
@@ -48,7 +48,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
client = HttpAsyncClients.createDefault();
client.start();
}
@@ -81,7 +83,8 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java
index 7e52b3b..63689b7 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -63,7 +65,8 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
index 21d6c4d..3376622 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_8);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -63,7 +65,8 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
index 036dd5a..48a0d50 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -63,7 +65,8 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
index 161cdad..6c83703 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
@@ -48,7 +48,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
client = HttpAsyncClients.createDefault();
client.start();
}
@@ -81,7 +83,8 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
index 665c7c7..359f283 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -63,7 +65,8 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
index a76cbc9..77a3291 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
@@ -42,7 +42,9 @@
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_6);
- nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+ nodeInfo =
+ new ElasticNodeInfo(
+ container.getHttpHost().getHostName(), container.getHttpHost().getPort());
}
@AfterClass
@@ -63,7 +65,8 @@
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
String indicesPrefix = getSanitizedMethodName();
- ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
+ ElasticTestUtils.configure(
+ elasticsearchConfig, nodeInfo.hostname, nodeInfo.port, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig));
}
}
