diff options
| author | jonmv <venstad@gmail.com> | 2023-08-30 13:28:04 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-08-30 13:28:04 +0200 |
| commit | 48efe7bc28cdf4ae7c38f1a3794779a0f60bcfd8 (patch) | |
| tree | 2c6dff296260cabf98e72f216807517defa27d11 /config-model/src/main/java/com/yahoo/config | |
| parent | 58bc7893a5cfc62aa7debdf231447cea7600576a (diff) | |
Use deployed cloud account when deciding host TTL, and ignore when noclave
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java index abd803dcebb..ad50ad02171 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelContext.java @@ -9,6 +9,7 @@ import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AnyConfigProducer; import com.yahoo.config.model.producer.TreeConfigProducer; +import com.yahoo.config.provision.CloudAccount; import com.yahoo.config.provision.ClusterInfo; import com.yahoo.config.provision.ClusterInfo.Builder; import com.yahoo.config.provision.zone.ZoneId; @@ -81,13 +82,8 @@ public final class ConfigModelContext { ClusterInfo.Builder builder = new ClusterInfo.Builder(); spec.hostTTL(properties().applicationId().instance(), deployState.zone().environment(), deployState.zone().region()) .filter(ttl -> ! ttl.isZero()) - .ifPresent(ttl -> { - ZoneId zoneId = ZoneId.from(deployState.zone().environment(), deployState.zone().region()); - if (spec.cloudAccount(deployState.zone().cloud().name(), properties().applicationId().instance(), zoneId).isUnspecified()) - throw new IllegalArgumentException("deployment spec specifies host TTL for " + zoneId + - " but no cloud account is specified for this zone"); - builder.hostTTL(ttl); - }); + .filter(__ -> deployState.getProperties().cloudAccount().map(account -> ! account.isUnspecified()).orElse(false)) + .ifPresent(builder::hostTTL); spec.instance(properties().applicationId().instance()) .flatMap(instance -> instance.bcp().groups().stream() .filter(group -> group.memberRegions().contains(properties().zone().region())) |