diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-06-23 09:03:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-23 09:03:15 +0200 |
commit | f2e0dabf9d2f86bd304a1658fa50e9db8c4d0b77 (patch) | |
tree | 1cebf61ebe060c6fd6523d33b3a407ef2e51af92 | |
parent | c49ddf4dbc1f299544e2e55015fac3d2e641e68e (diff) | |
parent | 20901f7726e50c45e09e53a32b36273f8d9ac51c (diff) |
Merge pull request #27527 from vespa-engine/revert-27524-bjorncs/endpoint-auth-typev8.183.1
Revert "Bjorncs/endpoint auth type" MERGEOK
2 files changed, 5 insertions, 11 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 d73a7410cc6..ffaee34e727 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,21 +26,18 @@ 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("authMethod") String auth) { + @JsonProperty("routingMethod") RoutingMethod routingMethod) { this.cluster = cluster; this.tls = tls; this.url = url; this.scope = scope; this.routingMethod = routingMethod; - this.auth = auth; } @Override @@ -50,7 +47,6 @@ 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 693275987c5..aa3f78f1395 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,6 +139,7 @@ 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; @@ -910,17 +911,14 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { } private HttpResponse listTokens(String tenant, HttpRequest request) { - var tokens = controller.dataplaneTokenService().listTokens(TenantName.from(tenant)) - .stream().sorted(Comparator.comparing(DataplaneTokenVersions::tokenId)).toList(); + List<DataplaneTokenVersions> dataplaneTokenVersions = controller.dataplaneTokenService().listTokens(TenantName.from(tenant)); Slime slime = new Slime(); Cursor tokensArray = slime.setObject().setArray("tokens"); - for (DataplaneTokenVersions token : tokens) { + for (DataplaneTokenVersions token : dataplaneTokenVersions) { Cursor tokenObject = tokensArray.addObject(); tokenObject.setString("id", token.tokenId().value()); Cursor fingerprintsArray = tokenObject.setArray("versions"); - var versions = token.tokenVersions().stream() - .sorted(Comparator.comparing(DataplaneTokenVersions.Version::creationTime)).toList(); - for (var tokenVersion : versions) { + for (DataplaneTokenVersions.Version tokenVersion : token.tokenVersions()) { Cursor fingerprintObject = fingerprintsArray.addObject(); fingerprintObject.setString("fingerprint", tokenVersion.fingerPrint().value()); fingerprintObject.setString("created", tokenVersion.creationTime().toString()); |