1 files changed, 10 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SecretStoreValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SecretStoreValidator.java
index afa29533b93..9c87415395b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SecretStoreValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SecretStoreValidator.java
@@ -2,7 +2,8 @@
 package com.yahoo.vespa.model.application.validation;
 
 import com.yahoo.config.model.ConfigModelContext.ApplicationType;
-import com.yahoo.vespa.model.application.validation.Validation.Context;
+import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.IdentityProvider;
@@ -13,18 +14,18 @@ import com.yahoo.vespa.model.container.component.Component;
  *
  * @author gjoranv
  */
-public class SecretStoreValidator implements Validator {
+public class SecretStoreValidator extends Validator {
 
     @Override
-    public void validate(Context context) {
-        if (! context.deployState().isHosted()) return;
-        if (context.model().getAdmin().getApplicationType() != ApplicationType.DEFAULT) return;
+    public void validate(VespaModel model, DeployState deployState) {
+        if (! deployState.isHosted()) return;
+        if (model.getAdmin().getApplicationType() != ApplicationType.DEFAULT) return;
 
-        for (ContainerCluster<?> cluster : context.model().getContainerClusters().values()) {
+        for (ContainerCluster cluster : model.getContainerClusters().values()) {
             if (cluster.getSecretStore().isPresent() && ! hasIdentityProvider(cluster))
-                    context.illegal(String.format(
-                            "Container cluster '%s' uses a secret store, so an Athenz domain and an Athenz service" +
-                            " must be declared in deployment.xml.", cluster.getName()));
+                    throw new IllegalArgumentException(String.format(
+                        "Container cluster '%s' uses a secret store, so an Athenz domain and an Athenz service" +
+                                " must be declared in deployment.xml.", cluster.getName()));
         }
     }