diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-06-04 13:46:45 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-06-04 13:46:45 +0200 |
| commit | 5b27023172aab47a0b1c164b100dc79fc9bcbe26 (patch) | |
| tree | 711f38177e9f05b4872ecc4353c96a112c4a47a7 /config-model | |
| parent | 9baea78885f4f28d865f45c95775ecb380d02a0c (diff) | |
Only warn when surely preventing a validation failure
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 22cc2032881..937d511bb09 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -121,11 +121,12 @@ public class DeployState implements ConfigDefinitionStore { this.importedModels = new ImportedMlModels(applicationPackage.getFileReference(ApplicationPackage.MODELS_DIR), modelImporters); + ValidationOverrides suppliedValidationOverrides = applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml) + .orElse(ValidationOverrides.empty); this.validationOverrides = - zone.environment().isManuallyDeployed() - ? new ValidationOverrides.AllowAllValidationOverrides(deployLogger) // Don't protect manually deployed zones - : applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml) - .orElse(ValidationOverrides.empty); + zone.environment().isManuallyDeployed() // // Warn but allow in manually deployed zones + ? new ValidationOverrides.AllowAllValidationOverrides(suppliedValidationOverrides, deployLogger) + : suppliedValidationOverrides; this.wantedNodeVespaVersion = wantedNodeVespaVersion; this.now = now; |