Model cloud features explicitly

3 files changed, 4 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidator.java
index 631ab0e2640..d8615c95d37 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidator.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.application.validation;
 
 import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.config.provision.CloudName;
 import com.yahoo.vespa.model.VespaModel;
 
 import java.util.ArrayList;
@@ -18,14 +17,11 @@ import static com.yahoo.vespa.model.container.http.AccessControl.hasHandlerThatN
  */
 public class AwsAccessControlValidator extends Validator {
 
-    // NOTE: must be the same as the name in the declaration of the AWS cloud in hosted.
-    static final String AWS_CLOUD_NAME = "aws";
-
     @Override
     public void validate(VespaModel model, DeployState deployState) {
 
         if (! needsAccessControlValidation(model, deployState)) return;
-        if(! deployState.zone().cloud().equals(CloudName.from(AWS_CLOUD_NAME))) return;
+        if(! deployState.zone().cloud().requireAccessControl()) return;
 
         List<String> offendingClusters = new ArrayList<>();
         for (var cluster : model.getContainerClusters().values()) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidatorTest.java
index 4eb69ec405a..1b61215618a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AwsAccessControlValidatorTest.java
@@ -1,15 +1,13 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.application.validation;
 
-import com.yahoo.config.provision.CloudName;
+import com.yahoo.config.provision.Cloud;
 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 org.junit.Before;
 
-import static com.yahoo.vespa.model.application.validation.AwsAccessControlValidator.AWS_CLOUD_NAME;
-
 /**
  * @author gjoranv
  */
@@ -18,7 +16,7 @@ public class AwsAccessControlValidatorTest extends AccessControlValidatorTestBas
     @Before
     public void setup() {
         validator = new AwsAccessControlValidator();
-        zone = new Zone(CloudName.from(AWS_CLOUD_NAME), SystemName.main, Environment.prod, RegionName.from("foo"));
+        zone = new Zone(Cloud.defaultCloud().withRequireAccessControl(true), SystemName.main, Environment.prod, RegionName.from("foo"));
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
index 915b3c01e1b..362a083993e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
@@ -5,13 +5,11 @@ import com.google.common.collect.ImmutableList;
 import com.yahoo.collections.Pair;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.api.ConfigChangeAction;
-import com.yahoo.config.model.api.HostProvisioner;
 import com.yahoo.config.model.api.Provisioned;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.config.model.provision.InMemoryProvisioner;
 import com.yahoo.config.model.test.MockApplicationPackage;
-import com.yahoo.config.provision.CloudName;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
@@ -72,8 +70,7 @@ public class ValidationTester {
                 .build();
         VespaModelCreatorWithMockPkg newModelCreator = new VespaModelCreatorWithMockPkg(newApp);
         DeployState.Builder deployStateBuilder = new DeployState.Builder()
-                                                             .zone(new Zone(CloudName.defaultName(),
-                                                                            SystemName.defaultSystem(),
+                                                             .zone(new Zone(SystemName.defaultSystem(),
                                                                             environment,
                                                                             RegionName.defaultName()))
                                                              .applicationPackage(newApp)