Merge pull request #19923 from vespa-engine/mpolden/readd-rotation-id

Re-add rotationId field

5 files changed, 19 insertions, 0 deletions

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 c52c2080107..4144eda212b 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
@@ -1163,6 +1163,9 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
             }));
         }
 
+        // Rotation ID
+        addRotationId(object, instance);
+
         // Deployments sorted according to deployment spec
         List<Deployment> deployments = deploymentSpec.instance(instance.name())
                                                      .map(spec -> new DeploymentSteps(spec, controller::system))
@@ -1191,6 +1194,15 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         }
     }
 
+    // TODO(mpolden): Remove once MultiRegionTest stops expecting this field
+    private void addRotationId(Cursor object, Instance instance) {
+        // Legacy field. Identifies the first assigned rotation, if any.
+        instance.rotations().stream()
+                .map(AssignedRotation::rotationId)
+                .findFirst()
+                .ifPresent(rotation -> object.setString("rotationId", rotation.asString()));
+    }
+
     private void toSlime(Cursor object, Instance instance, DeploymentStatus status, HttpRequest request) {
         Application application = status.application();
         object.setString("tenant", instance.id().tenant().value());
@@ -1239,6 +1251,9 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
 
         application.majorVersion().ifPresent(majorVersion -> object.setLong("majorVersion", majorVersion));
 
+        // Rotation ID
+        addRotationId(object, instance);
+
         // Deployments sorted according to deployment spec
         List<Deployment> deployments =
                 application.deploymentSpec().instance(instance.name())
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 19ec2b57243..28732acb1df 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
@@ -39,6 +39,7 @@
         }
       },
       "changeBlockers": [],
+      "rotationId": "rotation-id-2",
       "deployments": []
     }
   ],
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 690551efd6a..d009af005e4 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
@@ -38,6 +38,7 @@
         }
       },
       "changeBlockers": [],
+      "rotationId": "rotation-id-2",
       "deployments": []
     }
   ],
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json
index 989827f68a7..bcbdf448ad5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json
@@ -49,6 +49,7 @@
       ]
     }
   ],
+  "rotationId": "rotation-id-1",
   "instances": [
     {
       "environment": "dev",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json
index 729d98c4da7..0c4f046f45c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json
@@ -49,6 +49,7 @@
       ]
     }
   ],
+  "rotationId": "rotation-id-1",
   "instances": [
     @include(dev-us-east-1.json),
     @include(prod-us-central-1.json),