Merge pull request #27518 from vespa-engine/olaa/dont-hardcode-date

Remove hardcoded datetime
vespa-engine · Jun 26, 2023 · 3a06610 · 3a06610
2 parents 7e1c15d + f04a882
commit 3a06610
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...om/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java b/...om/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java
@@ -27,6 +27,8 @@
 import com.yahoo.yolean.Exceptions;
 
 import java.io.IOException;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -36,6 +38,7 @@ public class ChangeManagementApiHandler extends AuditLoggingRequestHandler {
 
     private final ChangeManagementAssessor assessor;
     private final Controller controller;
+    private static final DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
 
     public ChangeManagementApiHandler(ThreadedHttpRequestHandler.Context ctx, Controller controller) {
         super(ctx, controller.auditLogger());
@@ -164,7 +167,7 @@ private HttpResponse doAssessment(List<String> hostNames) {
         Cursor assessmentCursor = root.setObject("assessment");
 
         // Updated gives clue to if the assessment is old
-        assessmentCursor.setString("updated", "2021-03-12:12:12:12Z");
+        assessmentCursor.setString("updated", formatter.format(controller.clock().instant()));
 
         // Assessment on the cluster level
         Cursor clustersCursor = assessmentCursor.setArray("clusters");

diff --git a/...st/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/initial.json b/...st/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/initial.json
@@ -1,6 +1,6 @@
 {
   "assessment": {
-    "updated": "2021-03-12:12:12:12Z",
+    "updated": "2020-09-13T12:26:40Z",
     "clusters": [
       {
         "app": "mytenant:myapp:default",