diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2019-11-05 13:03:00 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2019-11-05 13:03:00 +0100 |
| commit | 871af9909264aad0609bebddc82b41c33dc94044 (patch) | |
| tree | 79420615073630728257428f329048880e78bbb0 /config-model-api | |
| parent | 8eba957eacdf9c50c89f4a3565aca939b3c8c2d7 (diff) | |
Reinstate method used by older config model builders
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/abi-spec.json | 1 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index e74abce6107..f4796372722 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -336,6 +336,7 @@ "public java.util.List zones()", "public java.util.Optional athenzDomain()", "public java.util.Optional athenzService()", + "public java.util.Optional athenzService(com.yahoo.config.provision.InstanceName, com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)", "public java.lang.String xmlForm()", "public boolean includes(com.yahoo.config.provision.Environment, java.util.Optional)", "public java.util.Optional instance(com.yahoo.config.provision.InstanceName)", 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 4c50f9b4ab1..25fd766c8c2 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 @@ -211,6 +211,13 @@ public class DeploymentSpec { // to have environment, instance or region variants on those. public Optional<AthenzService> athenzService() { return this.athenzService; } + // TODO remove when 7.135 is the oldest version + public Optional<AthenzService> athenzService(InstanceName instanceName, Environment environment, RegionName region) { + Optional<DeploymentInstanceSpec> instance = instance(instanceName); + if (instance.isEmpty()) return this.athenzService; + return instance.get().athenzService(environment, region).or(() -> this.athenzService); + } + /** Returns the XML form of this spec, or null if it was not created by fromXml, nor is empty */ public String xmlForm() { return xmlForm; } |