Don't fail on revoked or mistyped token

We may want to revert this change once we have tombstone for revoked tokens

1 files changed, 6 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index e28c42bdcf2..70a57563919 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -527,7 +527,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
     private Optional<Client> getClient(Element clientElement, DeployState state) {
         String clientId = XML.attribute("id", clientElement).orElseThrow();
-        if (clientId.startsWith("_")) throw new IllegalArgumentException("Invalid client id '%s', id cannot start with '_'".formatted(clientId));
+        if (clientId.startsWith("_"))
+            throw new IllegalArgumentException("Invalid client id '%s', id cannot start with '_'".formatted(clientId));
         List<String> permissions = XML.attribute("permissions", clientElement)
                 .map(p -> p.split(",")).stream()
                 .flatMap(Arrays::stream)
@@ -554,15 +555,16 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                     var tokenId = elem.getAttribute("id");
                     var token = knownTokens.get(tokenId);
                     if (token == null)
-                        throw new IllegalArgumentException(
-                                "Token '%s' for client '%s' does not exist".formatted(tokenId, clientId));
+                        log.logApplicationPackage(
+                                WARNING, "Token '%s' for client '%s' does not exist".formatted(tokenId, clientId));
                     return token;
                 })
                 .filter(token -> {
+                    if (token == null) return false;
                     boolean empty = token.versions().isEmpty();
                     if (empty)
                         log.logApplicationPackage(
-                                WARNING, "Token '%s' for client '%s' has no activate versions"
+                                WARNING, "Token '%s' for client '%s' has no active versions"
                                         .formatted(token.tokenId(), clientId));
                     return !empty;
                 })