From 85381f1ba40251e6a9c3773586867f7d2e4b20ec Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Fri, 10 Jun 2022 13:48:38 +0200
Subject: Add additional data to test runtime

---
 tenant-cd-api/abi-spec.json                                   |  8 ++++++--
 .../src/main/java/ai/vespa/hosted/cd/Deployment.java          | 11 +++++++++++
 .../src/main/java/ai/vespa/hosted/cd/TestRuntime.java         |  3 +++
 3 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'tenant-cd-api')

diff --git a/tenant-cd-api/abi-spec.json b/tenant-cd-api/abi-spec.json
index 48222a63e28..8eee085de08 100644
--- a/tenant-cd-api/abi-spec.json
+++ b/tenant-cd-api/abi-spec.json
@@ -8,7 +8,10 @@
       "abstract"
     ],
     "methods": [
-      "public abstract ai.vespa.hosted.cd.Endpoint endpoint(java.lang.String)"
+      "public abstract ai.vespa.hosted.cd.Endpoint endpoint(java.lang.String)",
+      "public abstract java.lang.String platformVersion()",
+      "public abstract long applicationVersion()",
+      "public abstract java.time.Instant deployedAt()"
     ],
     "fields": []
   },
@@ -138,7 +141,8 @@
     "methods": [
       "public static ai.vespa.hosted.cd.TestRuntime get()",
       "public abstract ai.vespa.hosted.cd.Deployment deploymentToTest()",
-      "public abstract ai.vespa.cloud.Zone zone()"
+      "public abstract ai.vespa.cloud.Zone zone()",
+      "public abstract ai.vespa.cloud.ApplicationId application()"
     ],
     "fields": [
       "public static final java.util.logging.Logger logger"
diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/Deployment.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/Deployment.java
index 9d42ba138bd..a04f07d5dae 100644
--- a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/Deployment.java
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/Deployment.java
@@ -1,6 +1,8 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.hosted.cd;
 
+import java.time.Instant;
+
 /**
  * A deployment of a Vespa application, which contains endpoints for document retrieval.
  *
@@ -11,4 +13,13 @@ public interface Deployment {
     /** Returns an Endpoint in the cluster with the given id. */
     Endpoint endpoint(String id);
 
+    /** The Vespa runtime version of the deployment, e.g., 8.16.32. */
+    String platformVersion();
+
+    /** The build number assigned to the application revision of the deployment, e.g., 496. */
+    long applicationVersion();
+
+    /** The time at which the deployment was last updated with a new platform or application version. */
+    Instant deployedAt();
+
 }
diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/TestRuntime.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/TestRuntime.java
index d031054851c..b1aa2bb62ba 100644
--- a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/TestRuntime.java
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/TestRuntime.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.hosted.cd;
 
+import ai.vespa.cloud.ApplicationId;
 import ai.vespa.cloud.Zone;
 import ai.vespa.hosted.cd.internal.TestRuntimeProvider;
 
@@ -33,4 +34,6 @@ public interface TestRuntime {
 
     Zone zone();
 
+    ApplicationId application();
+
 }
-- 
cgit v1.2.3