diff options
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java index 1f8ba3ce93f..8b662c4f66b 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java @@ -27,6 +27,7 @@ public class Zone { .name(CloudName.from(configserverConfig.cloud())) .dynamicProvisioning(cloudConfig.dynamicProvisioning()) .requireAccessControl(cloudConfig.requireAccessControl()) + .account(cloudConfig.account().isEmpty() ? CloudAccount.empty : new CloudAccount(cloudConfig.account())) .build(), SystemName.from(configserverConfig.system()), Environment.from(configserverConfig.environment()), @@ -51,8 +52,13 @@ public class Zone { this.region = region; } + // TODO(mpolden): For compatibility with older config models. Remove when versions < 8.76 are gone + public Cloud getCloud() { + return cloud(); + } + /** Returns the current cloud */ - public Cloud getCloud() { return cloud; } + public Cloud cloud() { return cloud; } /** Returns the current system */ public SystemName system() { return systemName; } |