Filter out non-released versions for compile version

7 files changed, 42 insertions, 9 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/MavenRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/MavenRepository.java
index 853da9c4056..fb133f75654 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/MavenRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/MavenRepository.java
@@ -8,6 +8,9 @@ package com.yahoo.vespa.hosted.controller.api.integration.maven;
 public interface MavenRepository {
 
     /** Returns metadata about all releases of a specific artifact to this repository. */
-    Metadata getMetadata();
+    Metadata metadata();
+
+    /** Returns the id of the artifact whose releases this tracks. */
+    ArtifactId artifactId();
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java
index d4a52a0d77d..0ecb7ae13cc 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java
@@ -17,9 +17,14 @@ public class MockMavenRepository implements MavenRepository {
     public static final ArtifactId id = new ArtifactId("ai.vespa", "search");
 
     @Override
-    public Metadata getMetadata() {
-        return new Metadata(id, List.of(Version.fromString("6.1"),
+    public Metadata metadata() {
+        return new Metadata(id, List.of(Version.fromString("6.0"),
                                         Version.fromString("6.2")));
     }
 
+    @Override
+    public ArtifactId artifactId() {
+        return id;
+    }
+
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 3db8c447572..79684e705b1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -97,6 +97,7 @@ import java.time.Instant;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -515,7 +516,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         });
 
         // Compile version. The version that should be used when building an application
-        object.setString("compileVersion", controller.applications().oldestInstalledPlatform(application.id()).toFullString());
+        object.setString("compileVersion", compileVersion(application.id()).toFullString());
 
         application.majorVersion().ifPresent(majorVersion -> object.setLong("majorVersion", majorVersion));
 
@@ -693,6 +694,26 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         return controller.zoneRegistry().getMonitoringSystemUri(deploymentId);
     }
 
+    /**
+     * Returns a version at least as old as the oldest platform the given application is on, and which is released.
+     *
+     * If no known version is applicable, the newest version at least as old as the oldest platform is selected,
+     * among all versions released for this system. If no such versions exists, throws an IllegalStateException.
+     */
+    private Version compileVersion(ApplicationId id) {
+        Version oldestPlatform = controller.applications().oldestInstalledPlatform(id);
+        return controller.versionStatus().versions().stream()
+                         .filter(VespaVersion::isReleased)
+                         .map(VespaVersion::versionNumber)
+                         .filter(version -> ! version.isAfter(oldestPlatform))
+                         .max(Comparator.naturalOrder())
+                         .orElseGet(() -> controller.mavenRepository().metadata().versions().stream()
+                                                    .filter(version -> ! version.isAfter(oldestPlatform))
+                                                    .max(Comparator.naturalOrder())
+                                                    .orElseThrow(() -> new IllegalStateException("No available releases of " +
+                                                                                                 controller.mavenRepository().artifactId())));
+    }
+
     private HttpResponse setGlobalRotationOverride(String tenantName, String applicationName, String instanceName, String environment, String region, boolean inService, HttpRequest request) {
         Application application = controller.applications().require(ApplicationId.from(tenantName, applicationName, instanceName));
         ZoneId zone = ZoneId.from(environment, region);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/MavenRepositoryClient.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/MavenRepositoryClient.java
index 871cc4d58cc..161c625ce16 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/MavenRepositoryClient.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/MavenRepositoryClient.java
@@ -29,7 +29,7 @@ public class MavenRepositoryClient implements MavenRepository {
     }
 
     @Override
-    public Metadata getMetadata() {
+    public Metadata metadata() {
         try {
             HttpRequest request = HttpRequest.newBuilder(withArtifactPath(apiUrl, id)).build();
             HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString(UTF_8));
@@ -44,6 +44,11 @@ public class MavenRepositoryClient implements MavenRepository {
         }
     }
 
+    @Override
+    public ArtifactId artifactId() {
+        return id;
+    }
+
     static URI withArtifactPath(URI baseUrl, ArtifactId id) {
         List<String> parts = new ArrayList<>(List.of(id.groupId().split("\\.")));
         parts.add(id.artifactId());
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
index 6ff14730285..87f35d3b2c1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
@@ -12,7 +12,6 @@ import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node;
 import com.yahoo.vespa.hosted.controller.api.integration.github.GitSha;
-import com.yahoo.vespa.hosted.controller.api.integration.maven.ArtifactId;
 import com.yahoo.vespa.hosted.controller.application.ApplicationList;
 import com.yahoo.vespa.hosted.controller.application.Deployment;
 import com.yahoo.vespa.hosted.controller.application.JobList;
@@ -130,7 +129,7 @@ public class VersionStatus {
         Collection<DeploymentStatistics> deploymentStatistics = computeDeploymentStatistics(infrastructureVersions,
                                                                                             controller.applications().asList());
         List<VespaVersion> versions = new ArrayList<>();
-        List<Version> releasedVersions = controller.mavenRepository().getMetadata().versions();
+        List<Version> releasedVersions = controller.mavenRepository().metadata().versions();
 
         for (DeploymentStatistics statistics : deploymentStatistics) {
             if (statistics.version().isEmpty()) continue;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
index 46f18f9d813..bf4ae9663f7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
@@ -76,7 +76,7 @@
     }
   ],
   "changeBlockers": [],
-  "compileVersion": "6.1.0",
+  "compileVersion": "6.0.0",
   "majorVersion": 7,
   "globalRotations": [],
   "instances": [],
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
index 3063bb62b7e..1d5a5aac089 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
@@ -76,7 +76,7 @@
     }
   ],
   "changeBlockers": [],
-  "compileVersion": "6.1.0",
+  "compileVersion": "6.0.0",
   "globalRotations": [],
   "instances": [],
   "metrics": {