Merge pull request #27524 from vespa-engine/bjorncs/endpoint-auth-type

Bjorncs/endpoint auth type

2 files changed, 11 insertions, 5 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java
index ffaee34e727..d73a7410cc6 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java
@@ -26,18 +26,21 @@ public class InstanceInformation {
         public URI url;
         public String scope;
         public RoutingMethod routingMethod;
+        public String auth;
 
         @JsonCreator
         public Endpoint(@JsonProperty("cluster") String cluster ,
                         @JsonProperty("tls") boolean tls,
                         @JsonProperty("url") URI url,
                         @JsonProperty("scope") String scope,
-                        @JsonProperty("routingMethod") RoutingMethod routingMethod) {
+                        @JsonProperty("routingMethod") RoutingMethod routingMethod,
+                        @JsonProperty("authMethod") String auth) {
             this.cluster = cluster;
             this.tls = tls;
             this.url = url;
             this.scope = scope;
             this.routingMethod = routingMethod;
+            this.auth = auth;
         }
 
         @Override
@@ -47,6 +50,7 @@ public class InstanceInformation {
                    ", tls=" + tls +
                    ", url=" + url +
                    ", scope='" + scope + '\'' +
+                   ", authType='" + auth + '\'' +
                    ", routingMethod=" + routingMethod +
                    '}';
         }
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 aa3f78f1395..693275987c5 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
@@ -139,7 +139,6 @@ import com.yahoo.yolean.Exceptions;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UncheckedIOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -911,14 +910,17 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
     }
 
     private HttpResponse listTokens(String tenant, HttpRequest request) {
-        List<DataplaneTokenVersions> dataplaneTokenVersions = controller.dataplaneTokenService().listTokens(TenantName.from(tenant));
+        var tokens = controller.dataplaneTokenService().listTokens(TenantName.from(tenant))
+                .stream().sorted(Comparator.comparing(DataplaneTokenVersions::tokenId)).toList();
         Slime slime = new Slime();
         Cursor tokensArray = slime.setObject().setArray("tokens");
-        for (DataplaneTokenVersions token : dataplaneTokenVersions) {
+        for (DataplaneTokenVersions token : tokens) {
             Cursor tokenObject = tokensArray.addObject();
             tokenObject.setString("id", token.tokenId().value());
             Cursor fingerprintsArray = tokenObject.setArray("versions");
-            for (DataplaneTokenVersions.Version tokenVersion : token.tokenVersions()) {
+            var versions = token.tokenVersions().stream()
+                    .sorted(Comparator.comparing(DataplaneTokenVersions.Version::creationTime)).toList();
+            for (var tokenVersion : versions) {
                 Cursor fingerprintObject = fingerprintsArray.addObject();
                 fingerprintObject.setString("fingerprint", tokenVersion.fingerPrint().value());
                 fingerprintObject.setString("created", tokenVersion.creationTime().toString());