Remove support for overriding application id in access-control

5 files changed, 4 insertions, 28 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java
index 3fb4c5d6b6b..37657bea0be 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java
@@ -39,7 +39,6 @@ public final class AccessControl {
 
     public static final class Builder {
         private String domain;
-        private String applicationId;
         private boolean readEnabled = false;
         private boolean writeEnabled = true;
         private final Set<String> excludeBindings = new LinkedHashSet<>();
@@ -47,9 +46,8 @@ public final class AccessControl {
         private Collection<Servlet> servlets = Collections.emptyList();
         private final DeployLogger logger;
 
-        public Builder(String domain, String applicationId, DeployLogger logger) {
+        public Builder(String domain, DeployLogger logger) {
             this.domain = domain;
-            this.applicationId = applicationId;
             this.logger = logger;
         }
 
@@ -79,13 +77,12 @@ public final class AccessControl {
         }
 
         public AccessControl build() {
-            return new AccessControl(domain, applicationId, writeEnabled, readEnabled,
+            return new AccessControl(domain, writeEnabled, readEnabled,
                                      excludeBindings, servlets, handlers, logger);
         }
     }
 
     public final String domain;
-    public final String applicationId;
     public final boolean readEnabled;
     public final boolean writeEnabled;
     private final Set<String> excludedBindings;
@@ -94,7 +91,6 @@ public final class AccessControl {
     private final DeployLogger logger;
 
     private AccessControl(String domain,
-                          String applicationId,
                           boolean writeEnabled,
                           boolean readEnabled,
                           Set<String> excludedBindings,
@@ -102,7 +98,6 @@ public final class AccessControl {
                           Collection<Handler<?>> handlers,
                           DeployLogger logger) {
         this.domain = domain;
-        this.applicationId = applicationId;
         this.readEnabled = readEnabled;
         this.writeEnabled = writeEnabled;
         this.excludedBindings = Collections.unmodifiableSet(excludedBindings);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java
index 8e78b2c7064..9e0b8ad7424 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java
@@ -6,8 +6,6 @@ import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.builder.xml.XmlHelper;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
@@ -63,10 +61,7 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
     }
 
     private AccessControl buildAccessControl(DeployState deployState, AbstractConfigProducer ancestor, Element accessControlElem) {
-        String application = XmlHelper.getOptionalChildValue(accessControlElem, "application")
-                .orElse(getDeployedApplicationId(deployState, ancestor).value());
-
-        AccessControl.Builder builder = new AccessControl.Builder(accessControlElem.getAttribute("domain"), application, deployState.getDeployLogger());
+        AccessControl.Builder builder = new AccessControl.Builder(accessControlElem.getAttribute("domain"), deployState.getDeployLogger());
 
         getContainerCluster(ancestor).ifPresent(cluster -> {
             builder.setHandlers(cluster.getHandlers());
@@ -87,15 +82,6 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http>
         return builder.build();
     }
 
-    /**
-     * Returns the id of the deployed application, or the default value if not explicitly set (self-hosted).
-     */
-    private static ApplicationName getDeployedApplicationId(DeployState deployState, AbstractConfigProducer ancestor) {
-        return getContainerCluster(ancestor)
-                .map(cluster -> deployState.getProperties().applicationId().application())
-                .orElse(ApplicationId.defaultId().application());
-    }
-
     private static Optional<ApplicationContainerCluster> getContainerCluster(AbstractConfigProducer configProducer) {
         AbstractConfigProducer currentProducer = configProducer;
         while (! ApplicationContainerCluster.class.isAssignableFrom(currentProducer.getClass())) {
diff --git a/config-model/src/main/resources/schema/container.rnc b/config-model/src/main/resources/schema/container.rnc
index fde3eb4dd5a..b9cb5e1fae6 100644
--- a/config-model/src/main/resources/schema/container.rnc
+++ b/config-model/src/main/resources/schema/container.rnc
@@ -27,7 +27,6 @@ AccessControl = element access-control {
     attribute read { string "true" | string "false" }? &
     attribute write { string "true" | string "false" }? &
     element vespa-domain { xsd:NCName }? & # TODO Remove after end of March 2020
-    element application { xsd:NCName }? &
     element exclude {
         Binding+
     }?
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
index ffcafecda52..b1e63628852 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
@@ -64,9 +64,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         Element clusterElem = DomBuilderTest.parse(
                 "  <http>",
                 "    <filtering>",
-                "      <access-control domain='my-domain'>",
-                "        <application>my-app</application>",
-                "      </access-control>",
+                "      <access-control domain='my-domain'/>",
                 "    </filtering>",
                 "  </http>");
 
@@ -75,7 +73,6 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         AccessControl accessControl = http.getAccessControl().get();
 
         assertEquals("Wrong domain.", "my-domain", accessControl.domain);
-        assertEquals("Wrong application.", "my-app", accessControl.applicationId);
     }
 
     @Test
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index 253af585c73..e7ea2683e3f 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -90,7 +90,6 @@
           <exclude>
             <binding>http//*/foo/*</binding>
           </exclude>
-          <application>my-app</application>
           <vespa-domain>vespa.vespa.cd</vespa-domain>
         </access-control>