diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-07-20 13:58:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-20 13:58:34 +0200 |
| commit | ff852270a54db87e858460c99cbae941053c9656 (patch) | |
| tree | 38baa53d029de6116024b91fb109994f99bbf203 | |
| parent | eadf73a6267e95ec4d432f34e9a5b612e393e56d (diff) | |
| parent | a735d7827bbeb52bf88258a603b37b786a42e061 (diff) | |
Merge pull request #27851 from vespa-engine/bjorncs/cloud-token-authz-model
Only include relevant client definitions for filters
2 files changed, 2 insertions, 0 deletions
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())) |