summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-05-27 17:33:54 +0200
committerHarald Musum <musum@verizonmedia.com>2019-05-27 17:33:54 +0200
commitd0aae35c427f7a4777c9cf7df03928eda18aeab4 (patch)
tree019adae5de10bab6f99d1b19a94f872522bf6648 /config-model-api
parent83d0d125433ab8a4e7dbc40cd21d2188d95961d8 (diff)
Add validation override for access control
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/abi-spec.json3
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index acde86824b8..b67b496a7ce 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -451,7 +451,8 @@
"public static final enum com.yahoo.config.application.api.ValidationId globalDocumentChange",
"public static final enum com.yahoo.config.application.api.ValidationId configModelVersionMismatch",
"public static final enum com.yahoo.config.application.api.ValidationId skipOldConfigModels",
- "public static final enum com.yahoo.config.application.api.ValidationId forceAutomaticTenantUpgradeTests"
+ "public static final enum com.yahoo.config.application.api.ValidationId forceAutomaticTenantUpgradeTests",
+ "public static final enum com.yahoo.config.application.api.ValidationId accessControl"
]
},
"com.yahoo.config.application.api.ValidationOverrides$Allow": {
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java
index 6d8fd553502..65dc264eb8a 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java
@@ -21,7 +21,8 @@ public enum ValidationId {
globalDocumentChange("global-document-change"), // Changing global attribute for document types in content clusters
configModelVersionMismatch("config-model-version-mismatch"), // Internal use
skipOldConfigModels("skip-old-config-models"), // Internal use
- forceAutomaticTenantUpgradeTests("force-automatic-tenant-upgrade-test"); // Internal use
+ forceAutomaticTenantUpgradeTests("force-automatic-tenant-upgrade-test"), // Internal use
+ accessControl("access-control"); // Internal use, used in zones where there should be no access-control
private final String id;