diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-12-01 12:47:34 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2021-12-02 10:24:17 +0100 |
| commit | 5f5b2c2592f5b3f65b4678feb11d796d29bbf2bf (patch) | |
| tree | fb059f4e7058afc953a051eabb2890aef62bf99d /config-model/src/main/java/com/yahoo/vespa/model/application | |
| parent | 89e48adac8d32bf72d8618c52d469b239f569ece (diff) | |
Remove support for 'servlet' from config-model.
- Keep it in rnc schema for at least one release.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/application')
2 files changed, 2 insertions, 2 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 e5c8a27debf..a07e07169d1 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 @@ -31,7 +31,7 @@ public class AwsAccessControlValidator extends Validator { || ! http.getAccessControl().get().writeEnabled || ! http.getAccessControl().get().readEnabled) - if (hasHandlerThatNeedsProtection(cluster) || ! cluster.getAllServlets().isEmpty()) + if (hasHandlerThatNeedsProtection(cluster)) offendingClusters.add(cluster.getName()); } if (! offendingClusters.isEmpty()) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlOnFirstDeploymentValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlOnFirstDeploymentValidator.java index a64f93a046a..dd6e6ad590d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlOnFirstDeploymentValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlOnFirstDeploymentValidator.java @@ -38,7 +38,7 @@ public class AccessControlOnFirstDeploymentValidator extends Validator { || ! cluster.getHttp().getAccessControl().isPresent() || ! cluster.getHttp().getAccessControl().get().writeEnabled) - if (hasHandlerThatNeedsProtection(cluster) || ! cluster.getAllServlets().isEmpty()) + if (hasHandlerThatNeedsProtection(cluster)) offendingClusters.add(cluster.getName()); } if (! offendingClusters.isEmpty()) |