diff options
author | Morten Tokle <mortent@oath.com> | 2018-04-13 09:13:51 +0200 |
---|---|---|
committer | Morten Tokle <mortent@oath.com> | 2018-04-13 09:13:51 +0200 |
commit | a0e3eab5d2843aa2c59ff6b24311df6445b22bbe (patch) | |
tree | aa2ebc6334698db4a92e0f92d5caf4c326193c8d /config-model | |
parent | 8b97e6521c6469bd5b4b0f8807100e51905a9d0f (diff) |
Revert "Temporarily validate apps only in CD zones."
This reverts commit 0d95d5e3cfce0c4a30f377e100bf22fdecd7733b.
Diffstat (limited to 'config-model')
2 files changed, 1 insertions, 10 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..4845d66aeda 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 @@ -6,10 +6,6 @@ import com.yahoo.config.model.NullConfigModelRegistry; import com.yahoo.config.model.deploy.DeployProperties; 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; import org.junit.Test; @@ -138,9 +134,9 @@ 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 .properties(new DeployProperties.Builder() .hostedVespa(true) .build()); |