diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-05-12 14:57:35 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-05-12 14:57:35 +0200 |
| commit | cb40193d64d26eaba2be248f8bfea078891c963f (patch) | |
| tree | 0209d049690cea55aa4fafa16447ddb9708c3586 /config-model-api/src | |
| parent | cc26e57914df77549f439730bde10b2a908eddfb (diff) | |
Limit cloud account to production zones
Diffstat (limited to 'config-model-api/src')
2 files changed, 5 insertions, 2 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 5f6d47fb586..8cb70d50a59 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 @@ -227,6 +227,7 @@ 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(); return zones().stream() .filter(zone -> zone.concerns(environment, Optional.of(region))) .findFirst() diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java index 8baeeb79441..aa8946a9dca 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java @@ -714,8 +714,10 @@ public class DeploymentSpecWithoutInstanceTest { "</deployment>" ); DeploymentSpec spec = DeploymentSpec.fromXml(r); - assertEquals(Optional.of(new CloudAccount("219876543210")), spec.requireInstance("default").cloudAccount(Environment.prod, RegionName.from("us-east-1"))); - assertEquals(Optional.of(new CloudAccount("012345678912")), spec.requireInstance("default").cloudAccount(Environment.prod, RegionName.from("us-west-1"))); + DeploymentInstanceSpec instance = spec.requireInstance("default"); + assertEquals(Optional.of(new CloudAccount("219876543210")), instance.cloudAccount(Environment.prod, RegionName.from("us-east-1"))); + assertEquals(Optional.of(new CloudAccount("012345678912")), instance.cloudAccount(Environment.prod, RegionName.from("us-west-1"))); + assertEquals(Optional.empty(), instance.cloudAccount(Environment.staging, RegionName.defaultName())); r = new StringReader( "<deployment version='1.0'>" + |