From 84e9014eb742431a40d36c8b4af8b6c49690a06e Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sun, 30 Jan 2022 16:45:35 +0100 Subject: Ensure that hostnames are added to config in determinsitic(sorted) order. --- .../vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java index da6da75f409..8e8f02e6773 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java @@ -6,13 +6,12 @@ import com.yahoo.component.ComponentSpecification; import com.yahoo.component.chain.dependencies.Dependencies; import com.yahoo.component.chain.model.ChainedComponentModel; import com.yahoo.config.model.api.ContainerEndpoint; -import com.yahoo.config.provision.ApplicationId; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.jdisc.http.filter.security.rule.RuleBasedFilterConfig; -import com.yahoo.path.Path; import com.yahoo.vespa.model.clients.ContainerDocumentApi; import com.yahoo.vespa.model.container.ContainerCluster; +import java.util.Collection; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -43,8 +42,9 @@ public class BlockFeedGlobalEndpointsFilter extends Filter implements RuleBasedF .flatMap(e -> e.names().stream()) .collect(Collectors.toSet()); if(hostNames.size() > 0) { + Collection hostnamesSorted = hostNames.stream().sorted().collect(Collectors.toList()); RuleBasedFilterConfig.Rule.Builder rule = new RuleBasedFilterConfig.Rule.Builder() - .hostNames(hostNames) + .hostNames(hostnamesSorted) .pathExpressions(ContainerCluster.RESERVED_URI_PREFIX + "/{*}") .pathExpressions(ContainerDocumentApi.DOCUMENT_V1_PREFIX + "/{*}") .methods(List.of(PUT, POST, DELETE)) -- cgit v1.2.3