Allow cloud-account attribute on non-production elements

1 files changed, 2 insertions, 3 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java
index 8cb70d50a59..cd20b5b8910 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java
@@ -226,10 +226,9 @@ public class DeploymentInstanceSpec extends DeploymentSpec.Steps {
     }
 
     /** Returns the cloud account to use for given environment and region, if any */
-    public Optional<CloudAccount> cloudAccount(Environment environment, RegionName region) {
-        if (!environment.isProduction()) return Optional.empty();
+    public Optional<CloudAccount> cloudAccount(Environment environment, Optional<RegionName> region) {
         return zones().stream()
-                      .filter(zone -> zone.concerns(environment, Optional.of(region)))
+                      .filter(zone -> zone.concerns(environment, region))
                       .findFirst()
                       .flatMap(DeploymentSpec.DeclaredZone::cloudAccount)
                       .or(() -> cloudAccount);