diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-04-20 15:12:07 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-04-20 15:12:07 +0200 |
commit | f48b87653d8757db767881c860aab34e24248932 (patch) | |
tree | c0b53e4ea76fdfaf2c5b42b6e5ba88c7ca042a56 /config-application-package/src | |
parent | 386413e2452d17bc2c65a6b302a9a55b9725551e (diff) |
Default to prod only if env is not given
Diffstat (limited to 'config-application-package/src')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java index db506c0ed51..03d70a610c6 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java @@ -126,8 +126,16 @@ class OverrideProcessor implements PreProcessor { } private boolean matches(Optional<Environment> elementEnvironment, RegionName elementRegion) { - if (elementEnvironment.isPresent() && ! environment.equals(elementEnvironment.get())) return false; - if ( ! elementRegion.isDefault() && ( ! region.equals(elementRegion) || ! environment.equals(Environment.prod))) return false; + if (elementEnvironment.isPresent()) { // match environment + if (! environment.equals(elementEnvironment.get())) return false; + } + + if ( ! elementRegion.isDefault()) { // match region + if ( ! region.equals(elementRegion)) return false; + // match region but no environment in prod only to avoid a region attribute overriding capacity policies outside prod + if ( ! elementEnvironment.isPresent() && ! environment.equals(Environment.prod)) return false; + } + return true; } |