Model cloud features explicitly

1 files changed, 1 insertions, 5 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()) {