Merge pull request #7313 from vespa-engine/mpolden/allow-custom-hostname-verifier

Allow custom hostname verifier

1 files changed, 15 insertions, 2 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java
index 3a9fa3d2533..6d97b64c441 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java
@@ -58,19 +58,32 @@ public class ConfigServerApiImpl implements ConfigServerApi {
 
     private final CloseableHttpClient client;
 
+    // TODO: Remove after 2018-12-01
     public static ConfigServerApiImpl create(ConfigServerInfo info, SiaIdentityProvider provider) {
+        return create(info, provider, new AthenzIdentityVerifier(singleton(info.getConfigServerIdentity())));
+    }
+
+    public static ConfigServerApiImpl create(ConfigServerInfo info, SiaIdentityProvider provider, HostnameVerifier hostnameVerifier) {
         return new ConfigServerApiImpl(
                 info.getConfigServerUris(),
-                new AthenzIdentityVerifier(singleton(info.getConfigServerIdentity())),
+                hostnameVerifier,
                 provider);
     }
 
+    // TODO: Remove after 2018-12-01
+    public static ConfigServerApiImpl createFor(ConfigServerInfo info,
+                                                SiaIdentityProvider provider,
+                                                HostName configServerHostname) {
+        return createFor(info, provider, new AthenzIdentityVerifier(singleton(info.getConfigServerIdentity())), configServerHostname);
+    }
+
     public static ConfigServerApiImpl createFor(ConfigServerInfo info,
                                                 SiaIdentityProvider provider,
+                                                HostnameVerifier hostnameVerifier,
                                                 HostName configServerHostname) {
         return new ConfigServerApiImpl(
                 Collections.singleton(info.getConfigServerUri(configServerHostname.value())),
-                new AthenzIdentityVerifier(singleton(info.getConfigServerIdentity())),
+                hostnameVerifier,
                 provider);
     }