From 93466488dd9d3c00c53fe476fb401682f9f15128 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Mon, 2 Dec 2019 16:54:55 -0500 Subject: [PATCH] Add support for Elasticsearch version 7.5.* Upgrade elasticsearch-rest-client to 7.5.0. Upgrade httpcore-nio to 4.4.12 as a consequence. Add V7_5 to the version manager, and use this in all the V7 tests. Use the 7.5.0 image from blacktop in the test container. Change-Id: I9e3e9b586e8e7c2b788f1f2240a175600b7b0b47 --- java/com/google/gerrit/elasticsearch/ElasticVersion.java | 3 ++- .../google/gerrit/acceptance/pgm/ElasticReindexIT.java | 2 +- .../com/google/gerrit/acceptance/ssh/ElasticIndexIT.java | 2 +- .../com/google/gerrit/elasticsearch/ElasticContainer.java | 2 ++ .../gerrit/elasticsearch/ElasticV7QueryAccountsTest.java | 2 +- .../gerrit/elasticsearch/ElasticV7QueryChangesTest.java | 2 +- .../gerrit/elasticsearch/ElasticV7QueryGroupsTest.java | 2 +- .../gerrit/elasticsearch/ElasticV7QueryProjectsTest.java | 2 +- .../google/gerrit/elasticsearch/ElasticVersionTest.java | 6 ++++++ tools/nongoogle.bzl | 8 ++++---- 10 files changed, 20 insertions(+), 11 deletions(-) diff --git a/java/com/google/gerrit/elasticsearch/ElasticVersion.java b/java/com/google/gerrit/elasticsearch/ElasticVersion.java index 309ee3e5b9..574a22623a 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticVersion.java +++ b/java/com/google/gerrit/elasticsearch/ElasticVersion.java @@ -30,7 +30,8 @@ public enum ElasticVersion { V7_1("7.1.*"), V7_2("7.2.*"), V7_3("7.3.*"), - V7_4("7.4.*"); + V7_4("7.4.*"), + V7_5("7.5.*"); private final String version; private final Pattern pattern; diff --git a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java index c0f27bd208..a5ac3a9163 100644 --- a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java @@ -37,7 +37,7 @@ public class ElasticReindexIT extends AbstractReindexTests { @ConfigSuite.Config public static Config elasticsearchV7() { - return getConfig(ElasticVersion.V7_4); + return getConfig(ElasticVersion.V7_5); } @Override diff --git a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java index 61a490bbca..5348c53266 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java +++ b/javatests/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java @@ -36,7 +36,7 @@ public class ElasticIndexIT extends AbstractIndexTests { @ConfigSuite.Config public static Config elasticsearchV7() { - return getConfig(ElasticVersion.V7_4); + return getConfig(ElasticVersion.V7_5); } @Override diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index c15f1a770d..c692a3b4f8 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -62,6 +62,8 @@ public class ElasticContainer extends ElasticsearchContainer { return "blacktop/elasticsearch:7.3.2"; case V7_4: return "blacktop/elasticsearch:7.4.2"; + case V7_5: + return "blacktop/elasticsearch:7.5.0"; } throw new IllegalStateException("No tests for version: " + version.name()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java index 069ca20cbd..5e533fb1b8 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_4); + container = ElasticContainer.createAndStart(ElasticVersion.V7_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 0290c7a4ac..3c70ed5179 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -47,7 +47,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_4); + container = ElasticContainer.createAndStart(ElasticVersion.V7_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); client = HttpAsyncClients.createDefault(); client.start(); diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index a60068cd97..f2dcdaa335 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_4); + container = ElasticContainer.createAndStart(ElasticVersion.V7_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java index cf93f6fd6c..e2de7fe040 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java @@ -41,7 +41,7 @@ public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest { return; } - container = ElasticContainer.createAndStart(ElasticVersion.V7_4); + container = ElasticContainer.createAndStart(ElasticVersion.V7_5); nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java index 8198cedbc7..b5c455d56e 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticVersionTest.java @@ -63,6 +63,9 @@ public class ElasticVersionTest { assertThat(ElasticVersion.forVersion("7.4.0")).isEqualTo(ElasticVersion.V7_4); assertThat(ElasticVersion.forVersion("7.4.1")).isEqualTo(ElasticVersion.V7_4); + + assertThat(ElasticVersion.forVersion("7.5.0")).isEqualTo(ElasticVersion.V7_5); + assertThat(ElasticVersion.forVersion("7.5.1")).isEqualTo(ElasticVersion.V7_5); } @Test @@ -88,6 +91,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_2.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_3.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); assertThat(ElasticVersion.V7_4.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); + assertThat(ElasticVersion.V7_5.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse(); } @Test @@ -105,6 +109,7 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_2.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_3.isV6OrLater()).isTrue(); assertThat(ElasticVersion.V7_4.isV6OrLater()).isTrue(); + assertThat(ElasticVersion.V7_5.isV6OrLater()).isTrue(); } @Test @@ -122,5 +127,6 @@ public class ElasticVersionTest { assertThat(ElasticVersion.V7_2.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_3.isV7OrLater()).isTrue(); assertThat(ElasticVersion.V7_4.isV7OrLater()).isTrue(); + assertThat(ElasticVersion.V7_5.isV7OrLater()).isTrue(); } } diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index d0a683ca9d..15525958b7 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -61,8 +61,8 @@ def declare_nongoogle_deps(): # elasticsearch-rest-client explicitly depends on this version maven_jar( name = "httpcore-nio", - artifact = "org.apache.httpcomponents:httpcore-nio:4.4.11", - sha1 = "7d0a97d01d39cff9aa3e6db81f21fddb2435f4e6", + artifact = "org.apache.httpcomponents:httpcore-nio:4.4.12", + sha1 = "84cd29eca842f31db02987cfedea245af020198b", ) maven_jar( @@ -94,8 +94,8 @@ def declare_nongoogle_deps(): # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.2", - sha1 = "f48725523c0b3402f869214433602f8d3f4c737c", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.5.0", + sha1 = "62535b6fc3a4e943e88e7640eac22e29f03a696d", ) maven_jar(