Merge pull request #22727 from vespa-engine/revert-22541-bjormel/disallow-accesslog-override-hostedv7.589.25

Revert "Disallow 'accesslog' override for applications"

2 files changed, 2 insertions, 40 deletions

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 abbd9644901..951317b68f3 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
@@ -432,13 +432,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     protected void addAccessLogs(DeployState deployState, ApplicationContainerCluster cluster, Element spec) {
         List<Element> accessLogElements = getAccessLogElements(spec);
 
-        if (cluster.isHostedVespa() && !accessLogElements.isEmpty()) {
-            log.logApplicationPackage(
-                    Level.WARNING, "The element 'accesslog' is not overridable in hosted Vespa");
-        } else {
-            for (Element accessLog : accessLogElements) {
-                AccessLogBuilder.buildIfNotDisabled(deployState, cluster, accessLog).ifPresent(cluster::addComponent);
-            }
+        for (Element accessLog : accessLogElements) {
+            AccessLogBuilder.buildIfNotDisabled(deployState, cluster, accessLog).ifPresent(cluster::addComponent);
         }
 
         if (accessLogElements.isEmpty() && deployState.getAccessLoggingEnabledByDefault())
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 7c76aef0981..16b4a8bed9b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -1095,39 +1095,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
                      logger.msgs.get(1).getSecond());
     }
 
-    @Test
-    public void logs_accesslog_not_overidable_in_hosted() {
-        String containerService = joinLines("<container id='foo' version='1.0'>",
-                "  <accesslog type='json' fileNamePattern='logs/vespa/qrs/access.%Y%m%d%H%M%S' symlinkName='json_access' />",
-                "  <nodes count=\"2\">",
-                "  </nodes>",
-                "</container>");
-
-        String deploymentXml = joinLines("<deployment version='1.0'>",
-                "  <prod>",
-                "    <region>us-east-1</region>",
-                "  </prod>",
-                "</deployment>");
-
-        ApplicationPackage applicationPackage = new MockApplicationPackage.Builder()
-                .withServices(containerService)
-                .withDeploymentSpec(deploymentXml)
-                .build();
-
-        TestLogger logger = new TestLogger();
-        DeployState deployState = new DeployState.Builder()
-                .applicationPackage(applicationPackage)
-                .zone(new Zone(Environment.prod, RegionName.from("us-east-1")))
-                .properties(new TestProperties().setHostedVespa(true))
-                .deployLogger(logger)
-                .build();
-        createModel(root, deployState, null, DomBuilderTest.parse(containerService));
-        assertFalse(logger.msgs.isEmpty());
-        assertEquals(Level.WARNING, logger.msgs.get(0).getFirst());
-        assertEquals("The element 'accesslog' is not overridable in hosted Vespa",
-                logger.msgs.get(0).getSecond());
-    }
-
     private void assertComponentConfigured(ApplicationContainerCluster cluster, String componentId) {
         Component<?, ?> component = cluster.getComponentsMap().get(ComponentId.fromString(componentId));
         assertNotNull(component);