From b5d7bb62636c37511dcf215e4601c846d344d2cc Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 15 May 2018 16:54:48 +0200 Subject: Add athenzDnsSuffix and ztsUrl to identity config --- .../vespa/config/server/deploy/ModelContextImpl.java | 17 +++++++++++++++++ .../vespa/config/server/modelfactory/ModelsBuilder.java | 3 +++ .../vespa/config/server/session/SessionPreparer.java | 3 +++ .../yahoo/vespa/config/server/ModelContextImplTest.java | 2 ++ 4 files changed, 25 insertions(+) (limited to 'configserver') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 1aaddfce6fc..cec879c6e14 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -16,6 +16,7 @@ import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Zone; import java.io.File; +import java.net.URI; import java.util.List; import java.util.Optional; import java.util.Set; @@ -117,6 +118,8 @@ public class ModelContextImpl implements ModelContext { private final boolean multitenant; private final List configServerSpecs; private final HostName loadBalancerName; + private final URI ztsUrl; + private final String athenzDnsSuffix; private final boolean hostedVespa; private final Zone zone; private final Set rotations; @@ -125,6 +128,8 @@ public class ModelContextImpl implements ModelContext { boolean multitenant, List configServerSpecs, HostName loadBalancerName, + URI ztsUrl, + String athenzDnsSuffix, boolean hostedVespa, Zone zone, Set rotations) { @@ -132,6 +137,8 @@ public class ModelContextImpl implements ModelContext { this.multitenant = multitenant; this.configServerSpecs = configServerSpecs; this.loadBalancerName = loadBalancerName; + this.ztsUrl = ztsUrl; + this.athenzDnsSuffix = athenzDnsSuffix; this.hostedVespa = hostedVespa; this.zone = zone; this.rotations = rotations; @@ -149,6 +156,16 @@ public class ModelContextImpl implements ModelContext { @Override public HostName loadBalancerName() { return loadBalancerName; } + @Override + public URI ztsUrl() { + return ztsUrl; + } + + @Override + public String athenzDnsSuffix() { + return athenzDnsSuffix; + } + @Override public boolean hostedVespa() { return hostedVespa; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java index 04e0c9a2902..3010f1383da 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java @@ -23,6 +23,7 @@ import com.yahoo.vespa.config.server.http.InternalServerException; import com.yahoo.vespa.config.server.http.UnknownVespaVersionException; import com.yahoo.vespa.config.server.provision.StaticProvisioner; +import java.net.URI; import java.time.Instant; import java.util.ArrayList; import java.util.Collections; @@ -205,6 +206,8 @@ public abstract class ModelsBuilder { configserverConfig.multitenant(), ConfigServerSpec.fromConfig(configserverConfig), HostName.from(configserverConfig.loadBalancerAddress()), + configserverConfig.ztsUrl() != null ? URI.create(configserverConfig.ztsUrl()) : null, + configserverConfig.athenzDnsSuffix(), configserverConfig.hostedVespa(), zone, rotations); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index bfed526a130..32e87007ba8 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -36,6 +36,7 @@ import org.xml.sax.SAXException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import java.io.IOException; +import java.net.URI; import java.time.Instant; import java.util.List; import java.util.Map; @@ -152,6 +153,8 @@ public class SessionPreparer { configserverConfig.multitenant(), ConfigServerSpec.fromConfig(configserverConfig), HostName.from(configserverConfig.loadBalancerAddress()), + configserverConfig.ztsUrl() != null ? URI.create(configserverConfig.ztsUrl()) : null, + configserverConfig.athenzDnsSuffix(), configserverConfig.hostedVespa(), zone, rotationsSet); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java index aed0a6a9750..5d9a5f0fadc 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java @@ -46,6 +46,8 @@ public class ModelContextImplTest { true, Collections.emptyList(), null, + null, + null, false, Zone.defaultZone(), rotations), -- cgit v1.2.3