diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-08-14 20:23:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-14 20:23:13 +0200 |
commit | 5fbd8495e06fc356c029931a50465c5d87f8abdb (patch) | |
tree | a0d1370a5ee7746cbbe7dd26aff8a5f782acfa01 | |
parent | 88a837e62fb2de78f4cb3084c05b9b27913bbc12 (diff) | |
parent | de8ba01e793c247ba12d253ad7ba5b9a7e516c89 (diff) |
Merge pull request #6573 from vespa-engine/hmusum/use-new-delete-application-in-all-zones
Use non-legacy method deleteApplication in all zones
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 6ace7a61f28..4451271225d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -282,20 +282,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye * @throws RuntimeException if the delete transaction fails. This method is exception safe. */ public boolean delete(ApplicationId applicationId) { - List<String> hostedZonesToUseDeleteApplication = - Arrays.asList("dev.us-east-1", "dev.corp-us-east-1", - "test.us-east-1", "staging.us-east-3", - "prod.aws-us-east-1a", "prod.aws-us-west-1b", - "prod.corp-us-east-1", "prod.us-central-1"); - boolean useDeleteApplicationLegacy = !hostedZonesToUseDeleteApplication.contains(zone().toString()); - - // TODO: Use deleteApplication() in all zones - if (configserverConfig.deleteApplicationLegacy() || - (configserverConfig.hostedVespa() && zone().system() == SystemName.main && useDeleteApplicationLegacy)) { - return deleteApplicationLegacy(applicationId); - } else { - return deleteApplication(applicationId); - } + return configserverConfig.deleteApplicationLegacy() ? deleteApplicationLegacy(applicationId) : deleteApplication(applicationId); } /** |