From 9b42079b07311b7cb59c56e847f4aaf45f83dfa3 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 19 Jun 2023 14:18:52 +0200 Subject: Only setup token infrastructure if enabled in services.xml --- .../com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config-model') 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 70a57563919..00feb0a1c76 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 @@ -624,8 +624,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder { .map(clientAuth -> clientAuth == AccessControl.ClientAuthentication.need) .orElse(false); - // TODO (mortent): Implement token support in model - boolean enableTokenSupport = deployState.featureFlags().enableDataplaneProxy(); + boolean enableTokenSupport = deployState.featureFlags().enableDataplaneProxy() + && cluster.getClients().stream().anyMatch(c -> !c.tokens().isEmpty()); // Set up component to generate proxy cert if token support is enabled if (enableTokenSupport) { -- cgit v1.2.3