diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-11-14 11:09:04 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-11-14 11:37:14 +0100 |
| commit | 1de6f92b18a9096ace4ac3e90ac7b06800062f84 (patch) | |
| tree | e8e101114e13f7e004efb4e409d334b25081239c /controller-server | |
| parent | ab09b81951e20cd85d8c2e595ca02be9e3deae77 (diff) | |
Remove unnecessary constant
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index b1ad178b34e..cd6b590f22b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -677,7 +677,7 @@ public class ApplicationController { .flatMap(instanceSpec -> instanceSpec.cloudAccount(zoneId.environment(), Optional.of(zoneId.region()))) .or(spec::cloudAccount); - if (requestedAccount.isEmpty() || requestedAccount.map(CloudAccount::isDefault).orElse(false)) { + if (requestedAccount.isEmpty() || requestedAccount.get().isEmpty()) { return Optional.empty(); } TenantName tenant = deployment.applicationId().tenant(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 3b03f7660c8..8f82faedeb9 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -1335,7 +1335,7 @@ public class ControllerTest { .region(prodZone2.region(), "default") .build(); - // I don't know why this makes the test pass :( + // Allow use of custom account (zone 1) tester.controllerTester().flagSource().withListFlag(PermanentFlags.CLOUD_ACCOUNTS.id(), List.of(cloudAccount), String.class); // Deployment to prod succeeds once all zones are configured in requested account |