Skip to content

Commit b87302d

Browse files
committed
Fix build flavor verification
1 parent 94d88f7 commit b87302d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,8 +2184,12 @@ private Optional<String> getVersionValidation(Response response) throws IOExcept
21842184
return Optional.empty();
21852185
}
21862186

2187-
if ("default".equals(Build.CURRENT.flavor()) && "default".equals(mainResponse.getVersion().getBuildFlavor()) == false) {
2188-
return Optional.of("Invalid or missing build flavor [" + mainResponse.getVersion().getBuildFlavor() + "]");
2187+
String responseFlavor = mainResponse.getVersion().getBuildFlavor();
2188+
if ("default".equals(responseFlavor) == false) {
2189+
// Flavor is unknown when running tests, and non-mocked responses will return an unknown flavor
2190+
if (Build.CURRENT.flavor() != Build.Flavor.UNKNOWN || "unknown".equals(responseFlavor) == false) {
2191+
return Optional.of("Invalid or missing build flavor [" + responseFlavor + "]");
2192+
}
21892193
}
21902194

21912195
if ("You Know, for Search".equalsIgnoreCase(mainResponse.getTagline()) == false) {

0 commit comments

Comments
 (0)