From a735d7827bbeb52bf88258a603b37b786a42e061 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 20 Jul 2023 13:54:17 +0200 Subject: Only include relevant client definitions for filters --- .../java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java | 1 + .../com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilter.java | 1 + 2 files changed, 2 insertions(+) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java index 2d0d47288d1..2d3d76e9d0e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java @@ -42,6 +42,7 @@ class CloudDataPlaneFilter extends Filter implements CloudDataPlaneFilterConfig. builder.legacyMode(true); } else { var clientsCfg = clients.stream() + .filter(c -> !c.certificates().isEmpty()) .map(x -> new CloudDataPlaneFilterConfig.Clients.Builder() .id(x.id()) .certificates(x.certificates().stream().map(X509CertificateUtils::toPem).toList()) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilter.java index 5b57682e759..a6f6d0a36ba 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilter.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilter.java @@ -40,6 +40,7 @@ class CloudTokenDataPlaneFilter extends Filter implements CloudTokenDataPlaneFil @Override public void getConfig(CloudTokenDataPlaneFilterConfig.Builder builder) { var clientsCfg = clients.stream() + .filter(c -> !c.tokens().isEmpty()) .map(x -> new CloudTokenDataPlaneFilterConfig.Clients.Builder() .id(x.id()) .tokens(tokensConfig(x.tokens())) -- cgit v1.2.3