Add feature flag to control whether user filters are allowed

1 files changed, 5 insertions, 0 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index 531bddec4cb..e5ac99fbc70 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -372,6 +372,7 @@ public class ModelContextImpl implements ModelContext {
         private final List<String> zoneDnsSuffixes;
         private final List<String> environmentVariables;
         private final Optional<CloudAccount> cloudAccount;
+        private final boolean allowUserFilters;
 
         public Properties(ApplicationId applicationId,
                           Version modelVersion,
@@ -416,6 +417,8 @@ public class ModelContextImpl implements ModelContext {
             this.environmentVariables = PermanentFlags.ENVIRONMENT_VARIABLES.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.cloudAccount = cloudAccount;
+            this.allowUserFilters = PermanentFlags.ALLOW_USER_FILTERS.bindTo(flagSource)
+                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
         }
 
         @Override public ModelContext.FeatureFlags featureFlags() { return featureFlags; }
@@ -505,6 +508,8 @@ public class ModelContextImpl implements ModelContext {
             return cloudAccount;
         }
 
+        @Override public boolean allowUserFilters() { return allowUserFilters; }
+
     }
 
 }