From e9425943c648abaaaf877e4d621f7fa22925777a Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 16 Mar 2022 12:52:57 +0100 Subject: Include allowMajor when requesting compile version --- .../main/java/ai/vespa/hosted/api/ControllerHttpClient.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'hosted-api/src/main') diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java index 3189a2c8e92..2860b8878b7 100644 --- a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java +++ b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java @@ -41,6 +41,7 @@ import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Optional; +import java.util.OptionalInt; import java.util.OptionalLong; import java.util.Set; import java.util.concurrent.Callable; @@ -152,10 +153,13 @@ public abstract class ControllerHttpClient { return ZoneId.from(environment.value(), rootObject.field("name").asString()); } - /** Returns the Vespa version to compile against, for a hosted Vespa application. This is its lowest runtime version. */ - public String compileVersion(ApplicationId id) { - return toInspector(send(request(HttpRequest.newBuilder(compileVersionPath(id.tenant(), id.application())) - .timeout(Duration.ofSeconds(20)), + /** Returns the Vespa version to compile against, for a hosted Vespa application */ + public String compileVersion(ApplicationId id, OptionalInt allowMajor) { + URI url = compileVersionPath(id.tenant(), id.application()); + if (allowMajor.isPresent()) { + url = withQuery(url, "allowMajor", Integer.toString(allowMajor.getAsInt())); + } + return toInspector(send(request(HttpRequest.newBuilder(url).timeout(Duration.ofSeconds(20)), GET))) .field("compileVersion").asString(); } -- cgit v1.2.3