diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-09-07 11:54:54 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-09-12 09:27:42 +0200 |
| commit | 89dd1b69ed6d036715969bbe2d1c28d20c731d43 (patch) | |
| tree | 1fdc5c966907496746c1394d825cc549d9f40858 /config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java | |
| parent | 939eb860022dde6689c1dabae11ff640d529e9a1 (diff) | |
Allow cloud-account attribute on non-production elements
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java')
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java index c4fec6e668e..ffdceaf7567 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java @@ -376,8 +376,6 @@ public class DeploymentSpec { illegal("Non-prod environments cannot specify a region"); if (environment == Environment.prod && region.isEmpty()) illegal("Prod environments must be specified with a region"); - if (environment != Environment.prod && cloudAccount.isPresent()) - illegal("Non-prod environments cannot specify cloud account"); this.environment = Objects.requireNonNull(environment); this.region = Objects.requireNonNull(region); this.active = active; @@ -403,7 +401,7 @@ public class DeploymentSpec { } @Override - public List<DeclaredZone> zones() { return Collections.singletonList(this); } + public List<DeclaredZone> zones() { return List.of(this); } @Override public boolean concerns(Environment environment, Optional<RegionName> region) { @@ -492,7 +490,7 @@ public class DeploymentSpec { public List<DeclaredZone> zones() { return steps.stream() .flatMap(step -> step.zones().stream()) - .collect(Collectors.toUnmodifiableList()); + .toList(); } @Override |