From c7741293749cbeb4ae7ad3f1f46dce5f7b88851f Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Wed, 23 Feb 2022 21:32:20 +0100 Subject: Remove available versions "at" timestampp --- .../restapi/application/JobControllerApiHandlerHelper.java | 2 -- .../application/responses/deployment-overview-2.json | 1 - .../restapi/application/responses/deployment-overview.json | 14 ++++---------- 3 files changed, 4 insertions(+), 13 deletions(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java index 0d64117a40f..8b5c21fd474 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java @@ -316,7 +316,6 @@ class JobControllerApiHandlerHelper { Cursor availableObject = availableArray.addObject(); availableObject.setString("platform", available.versionNumber().toFullString()); - availableObject.setLong("at", available.committedAt().toEpochMilli()); } toSlime(latestPlatformObject.setArray("blockers"), blockers.stream().filter(ChangeBlocker::blocksVersions)); } @@ -339,7 +338,6 @@ class JobControllerApiHandlerHelper { Cursor availableObject = availableArray.addObject(); toSlime(availableObject.setObject("application"), available); - availableObject.setLong("at", available.buildTime().orElse(Instant.EPOCH).toEpochMilli()); } toSlime(latestApplicationObject.setArray("blockers"), blockers.stream().filter(ChangeBlocker::blocksRevisions)); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json index 96bb5fd6198..e3d238aaf1e 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json @@ -25,7 +25,6 @@ "available": [ { "platform": "7.1.0", - "at": 0 } ], "blockers": [ diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json index 03eefd19838..6c02c22fe50 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json @@ -25,7 +25,6 @@ "available": [ { "platform": "6.1.0", - "at": "(ignore)" } ], "blockers": [] @@ -547,7 +546,6 @@ "available": [ { "platform": "6.1.0", - "at": "(ignore)" } ], "blockers": [] @@ -568,8 +566,7 @@ "compileVersion": "6.1.0", "sourceUrl": "repository1/tree/commit1", "commit": "commit1" - }, - "at": 1000 + } }, { "application": { @@ -577,8 +574,7 @@ "compileVersion": "6.1.0", "sourceUrl": "repository1/tree/commit1", "commit": "commit1" - }, - "at": 1000 + } }, { "application": { @@ -586,8 +582,7 @@ "compileVersion": "6.1.0", "sourceUrl": "repository1/tree/commit1", "commit": "commit1" - }, - "at": 1000 + } }, { "application": { @@ -595,8 +590,7 @@ "compileVersion": "6.1.0", "sourceUrl": "repository1/tree/commit1", "commit": "commit1" - }, - "at": 1000 + } } ], "blockers": [] -- cgit v1.2.3