diff options
| author | Morten Tokle <mortent@yahooinc.com> | 2023-06-21 14:49:23 +0200 |
|---|---|---|
| committer | Morten Tokle <mortent@yahooinc.com> | 2023-06-21 14:49:23 +0200 |
| commit | b8ff58aafa22c0469abccb33130ce0e1f46f7943 (patch) | |
| tree | 091539079c2da5d3f8541b5beacde71a46624306 /controller-server | |
| parent | 11c19a352cc404ec6b2d316db05f982277f8dfc4 (diff) | |
Rename fingerprints -> versions
Diffstat (limited to 'controller-server')
2 files changed, 3 insertions, 3 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 1e9fe91fff9..ede43a1d871 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 @@ -917,10 +917,10 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { for (DataplaneTokenVersions token : dataplaneTokenVersions) { Cursor tokenObject = tokensArray.addObject(); tokenObject.setString("id", token.tokenId().value()); - Cursor fingerprintsArray = tokenObject.setArray("fingerprints"); + Cursor fingerprintsArray = tokenObject.setArray("versions"); for (DataplaneTokenVersions.Version tokenVersion : token.tokenVersions()) { Cursor fingerprintObject = fingerprintsArray.addObject(); - fingerprintObject.setString("value", tokenVersion.fingerPrint().value()); + fingerprintObject.setString("fingerprint", tokenVersion.fingerPrint().value()); fingerprintObject.setString("created-at", tokenVersion.creationTime().toString()); fingerprintObject.setString("author", tokenVersion.author()); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java index 841e46ad881..5f1d99e09a5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java @@ -476,7 +476,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest { (response) -> Assertions.assertThat(new String(response.getBody(), UTF_8)).matches(Pattern.compile(regexGenerateToken)), 200); - String regexListTokens = "\\{\"tokens\":\\[\\{\"id\":\"myTokenId\",\"fingerprints\":\\[\\{\"value\":\".*\",\"created-at\":\".*\",\"author\":\"user@test\"}]}]}"; + String regexListTokens = "\\{\"tokens\":\\[\\{\"id\":\"myTokenId\",\"versions\":\\[\\{\"fingerprint\":\".*\",\"created-at\":\".*\",\"author\":\"user@test\"}]}]}"; tester.assertResponse(request("/application/v4/tenant/scoober/token", GET) .roles(Role.developer(tenantName)), (response) -> Assertions.assertThat(new String(response.getBody(), UTF_8)).matches(Pattern.compile(regexListTokens)), |