Implement mechanism for avoiding unnecesssary bundles.

+ Avoid installing security bundles for clustercontroller and
  metrics-proxy.

1 files changed, 18 insertions, 12 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
index b3860459323..1b36ff0afe6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
@@ -15,12 +15,14 @@ import com.yahoo.container.core.ApplicationMetadataConfig;
 import com.yahoo.container.di.config.PlatformBundlesConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames;
+import com.yahoo.vespa.model.container.PlatformBundles;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.Handler;
 import org.junit.Test;
 
+import java.nio.file.Path;
 import java.util.Collection;
-import java.util.stream.Collectors;
+import java.util.Set;
 
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.METRICS_PROXY_BUNDLE_FILE;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.zoneString;
@@ -35,8 +37,8 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.g
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.servicesWithAdminOnly;
 import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -47,21 +49,25 @@ public class MetricsProxyContainerClusterTest {
     @Test
     public void metrics_proxy_bundle_is_included_in_bundles_config() {
         VespaModel model = getModel(servicesWithAdminOnly(), self_hosted);
-        var builder = new PlatformBundlesConfig.Builder();
-        model.getConfig(builder, CLUSTER_CONFIG_ID);
-        PlatformBundlesConfig config = builder.build();
-        assertFalse(config.bundlePaths().stream()
-                .filter(p -> p.endsWith(METRICS_PROXY_BUNDLE_FILE.toString()))
-                .collect(Collectors.toList())
-                .isEmpty());
+        PlatformBundlesConfig config = model.getConfig(PlatformBundlesConfig.class, CLUSTER_CONFIG_ID);
+        assertTrue(config.bundlePaths().stream()
+                           .anyMatch(p -> p.equals(METRICS_PROXY_BUNDLE_FILE.toString())));
+    }
+
+    @Test
+    public void unnecessary_bundles_are_not_installed() {
+        VespaModel model = getModel(servicesWithAdminOnly(), self_hosted);
+        PlatformBundlesConfig config = model.getConfig(PlatformBundlesConfig.class, CLUSTER_CONFIG_ID);
+
+        Set<String> unnecessaryBundles = PlatformBundles.VESPA_SECURITY_BUNDLES.stream().map(Path::toString).collect(toSet());
+        assertTrue(config.bundlePaths().stream()
+                            .noneMatch(unnecessaryBundles::contains));
     }
 
     @Test
     public void cluster_is_prepared_so_that_application_metadata_config_is_produced() {
         VespaModel model = getModel(servicesWithAdminOnly(), self_hosted);
-        var builder = new ApplicationMetadataConfig.Builder();
-        model.getConfig(builder, CLUSTER_CONFIG_ID);
-        ApplicationMetadataConfig config = builder.build();
+        ApplicationMetadataConfig config = model.getConfig(ApplicationMetadataConfig.class, CLUSTER_CONFIG_ID);
         assertEquals(MockApplicationPackage.APPLICATION_GENERATION, config.generation());
         assertEquals(MockApplicationPackage.APPLICATION_NAME, config.name());
     }