Merge pull request #25017 from vespa-engine/mpolden/full-version-in-response

Return full version in UpgraderResponse

3 files changed, 6 insertions, 7 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java
index 2b4c6411386..c1e3ec851f6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java
@@ -36,7 +36,6 @@ import java.security.Principal;
 import java.security.cert.X509Certificate;
 import java.time.Instant;
 import java.util.Optional;
-import java.util.OptionalInt;
 import java.util.Scanner;
 import java.util.function.Function;
 
@@ -176,7 +175,7 @@ public class ControllerApiHandler extends AuditLoggingRequestHandler {
     }
 
     private HttpResponse overrideConfidence(HttpRequest request, String version) {
-        Confidence confidence = Confidence.valueOf(asString(request.getData()));
+        Confidence confidence = Confidence.valueOf(asString(request.getData()).trim());
         maintenance.upgrader().overrideConfidence(Version.fromString(version), confidence);
         return new UpgraderResponse(maintenance.upgrader());
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java
index 28fa5183e5c..f9add356f19 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java
@@ -23,7 +23,7 @@ public class UpgraderResponse extends SlimeJsonResponse {
         Cursor array = root.setArray("confidenceOverrides");
         upgrader.confidenceOverrides().forEach((version, confidence) -> {
             Cursor object = array.addObject();
-            object.setString(version.toString(), confidence.name());
+            object.setString(version.toFullString(), confidence.name());
         });
 
         return slime;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java
index 80bcbc7ee7e..799189410ea 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java
@@ -96,19 +96,19 @@ public class ControllerApiTest extends ControllerContainerTest {
         // Override confidence
         tester.assertResponse(
                 operatorRequest("http://localhost:8080/controller/v1/jobs/upgrader/confidence/6.42", "broken", Request.Method.POST),
-                "{\"upgradesPerMinute\":42.0,\"confidenceOverrides\":[{\"6.42\":\"broken\"}]}",
+                "{\"upgradesPerMinute\":42.0,\"confidenceOverrides\":[{\"6.42.0\":\"broken\"}]}",
                 200);
 
         // Override confidence for another version
         tester.assertResponse(
-                operatorRequest("http://localhost:8080/controller/v1/jobs/upgrader/confidence/6.43", "broken", Request.Method.POST),
-                "{\"upgradesPerMinute\":42.0,\"confidenceOverrides\":[{\"6.42\":\"broken\"},{\"6.43\":\"broken\"}]}",
+                operatorRequest("http://localhost:8080/controller/v1/jobs/upgrader/confidence/6.43", " broken ", Request.Method.POST),
+                "{\"upgradesPerMinute\":42.0,\"confidenceOverrides\":[{\"6.42.0\":\"broken\"},{\"6.43.0\":\"broken\"}]}",
                 200);
 
         // Remove first override
         tester.assertResponse(
                 operatorRequest("http://localhost:8080/controller/v1/jobs/upgrader/confidence/6.42", "", Request.Method.DELETE),
-                "{\"upgradesPerMinute\":42.0,\"confidenceOverrides\":[{\"6.43\":\"broken\"}]}",
+                "{\"upgradesPerMinute\":42.0,\"confidenceOverrides\":[{\"6.43.0\":\"broken\"}]}",
                 200);
 
         assertFalse(tester.controller().auditLogger().readLog().entries().isEmpty(), "Actions are logged to audit log");