diff options
3 files changed, 8 insertions, 1 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index 0f5a5e6271d..43527335802 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -879,7 +879,8 @@ "public java.util.Optional tlsSecrets()", "public java.util.Optional endpointCertificateSecrets()", "public abstract double defaultTermwiseLimit()", - "public abstract boolean useBucketSpaceMetric()" + "public abstract boolean useBucketSpaceMetric()", + "public boolean useNewAthenzFilter()" ], "fields": [] }, diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 81ac02a5400..2410de55f86 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -59,6 +59,7 @@ public interface ModelContext { default Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return Optional.empty(); } double defaultTermwiseLimit(); boolean useBucketSpaceMetric(); + default boolean useNewAthenzFilter() { return false; } } } 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 8b2c3e2cb0a..829a59a9598 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 @@ -134,6 +134,7 @@ public class ModelContextImpl implements ModelContext { private final Optional<EndpointCertificateSecrets> endpointCertificateSecrets; private final double defaultTermwiseLimit; private final boolean useBucketSpaceMetric; + private final boolean useNewAthenzFilter; public Properties(ApplicationId applicationId, boolean multitenantFromConfig, @@ -166,6 +167,8 @@ public class ModelContextImpl implements ModelContext { .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.useBucketSpaceMetric = Flags.USE_BUCKET_SPACE_METRIC.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); + this.useNewAthenzFilter = Flags.USE_NEW_ATHENZ_FILTER.bindTo(flagSource) + .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); } @Override @@ -219,6 +222,8 @@ public class ModelContextImpl implements ModelContext { @Override public boolean useBucketSpaceMetric() { return useBucketSpaceMetric; } + + @Override public boolean useNewAthenzFilter() { return useNewAthenzFilter; } } } |