Merge pull request #5571 from vespa-engine/mortent/enable-athenz-write-protect-

Require access-control in all systems

2 files changed, 2 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java
index d7fb46a8fb2..26a1478d0a7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.application.validation.first;
 
 import com.yahoo.config.model.ConfigModelContext.ApplicationType;
 import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.Validator;
 import com.yahoo.vespa.model.container.ContainerCluster;
@@ -29,10 +28,6 @@ public class AccessControlValidator extends Validator {
         if (! deployState.zone().environment().isProduction()) return;
         if (model.getAdmin().getApplicationType() != ApplicationType.DEFAULT) return;
 
-        // Temporarily validate apps in CD zones only
-        // TODO: remove, and also remove the zone setting in the unit test
-        if (deployState.zone().system() != SystemName.cd) return;
-
         List<String> offendingClusters = new ArrayList<>();
         for (ContainerCluster cluster : model.getContainerClusters().values()) {
             if (cluster.getHttp() == null
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java
index 82d521516b4..3f109b53bd9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java
@@ -8,7 +8,6 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.model.VespaModel;
 import org.junit.Rule;
@@ -138,9 +137,10 @@ public class AccessControlValidatorTest  {
         ApplicationPackage app = new MockApplicationPackage.Builder()
                 .withServices(servicesXml)
                 .build();
+
         DeployState.Builder builder = new DeployState.Builder()
                 .applicationPackage(app)
-                .zone(new Zone(SystemName.cd, Environment.prod, RegionName.from("foo")) )// TODO: remove cd setting
+                .zone(new Zone(Environment.prod, RegionName.from("foo")) )
                 .properties(new DeployProperties.Builder()
                                     .hostedVespa(true)
                                     .build());