Group fingerprints by token id

2 files changed, 10 insertions, 6 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ActiveTokenFingerprintsClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ActiveTokenFingerprintsClientTest.java
index dea224d2e9b..03e379311cc 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ActiveTokenFingerprintsClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ActiveTokenFingerprintsClientTest.java
@@ -17,6 +17,7 @@ import com.yahoo.config.model.api.ServiceInfo;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
+import com.yahoo.vespa.config.server.application.ActiveTokenFingerprints.Token;
 import com.yahoo.vespa.config.server.modelfactory.ModelResult;
 import org.junit.Rule;
 import org.junit.Test;
@@ -54,13 +55,14 @@ public class ActiveTokenFingerprintsClientTest {
             String uriPath = "/data-plane-tokens/v1";
             server1.stubFor(get(urlEqualTo(uriPath)).willReturn(serverError()));
             server2.stubFor(get(urlEqualTo(uriPath)).willReturn(okJson("""
-                                                                       { "fingerprints": [ "foo", "bar", "baz" ] }
+                                                                       { "tokens": [ {"id": "t1", "fingerprints": [ "foo", "bar", "baz" ] } ] }
                                                                        """)));
             server3.stubFor(get(urlEqualTo(uriPath)).willReturn(aResponse().withStatus(503)));
             server4.stubFor(get(urlEqualTo(uriPath)).willReturn(okJson("""
-                                                                       { "fingerprints": [ "quu", "qux", "fez" ] }
+                                                                       { "tokens": [ {"id": "t2", "fingerprints": [ "quu" ] } ] }
                                                                        """)));
-            Map<String, List<String>> expected = Map.of("localhost", List.of("foo", "bar", "baz"));
+            Map<String, List<Token>> expected = Map.of("localhost",
+                                                       List.of(new Token("t1", List.of("foo", "bar", "baz"))));
             assertEquals(expected, client.get(app));
         }
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
index 5b2d5d491a1..6fb5db70b68 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
@@ -28,6 +28,7 @@ import com.yahoo.vespa.config.server.MockLogRetriever;
 import com.yahoo.vespa.config.server.MockProvisioner;
 import com.yahoo.vespa.config.server.MockSecretStoreValidator;
 import com.yahoo.vespa.config.server.MockTesterClient;
+import com.yahoo.vespa.config.server.application.ActiveTokenFingerprints.Token;
 import com.yahoo.vespa.config.server.application.ApplicationCuratorDatabase;
 import com.yahoo.vespa.config.server.application.ApplicationReindexing;
 import com.yahoo.vespa.config.server.application.ClusterReindexing;
@@ -117,7 +118,7 @@ public class ApplicationHandlerTest {
     private ManualClock clock;
     private List<Endpoint> expectedEndpoints;
     private Availability availability;
-    private Map<String, List<String>> activeTokenFingerprints;
+    private Map<String, List<Token>> activeTokenFingerprints;
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -243,12 +244,13 @@ public class ApplicationHandlerTest {
     @Test
     public void testGetTokenFingerprints() throws IOException {
         applicationRepository.deploy(testApp, prepareParams(applicationId));
-        activeTokenFingerprints.putAll(Map.of("host", List.of("fingers", "toes"),
+        activeTokenFingerprints.putAll(Map.of("host", List.of(new Token("t1", List.of("fingers", "toes")),
+                                                              new Token("t2", List.of())),
                                               "toast", List.of()));
         HttpResponse response = createApplicationHandler().handleGET(createTestRequest(toUrlPath(applicationId, Zone.defaultZone(), true) + "/active-token-fingerprints", GET));
         assertEquals(200, response.getStatus());
         assertEquals("""
-                     {"hosts":[{"host":"host","fingerprints":["fingers","toes"]},{"host":"toast","fingerprints":[]}]}""",
+                     {"hosts":[{"host":"host","tokens":[{"id":"t1","fingerprints":["fingers","toes"]},{"id":"t2","fingerprints":[]}]},{"host":"toast","tokens":[]}]}""",
                      getRenderedString(response));
     }