summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2023-06-02 09:22:31 +0200
committerGitHub <noreply@github.com>2023-06-02 09:22:31 +0200
commitef6f0db67a5da3d66c1a23b01364ca08cc3e2f71 (patch)
treedd90ce6a302fbf19cd07451ed3f89913e2ec383f
parentbf334c701a75ed51edd10a214336928ed3f47b6e (diff)
parent46dede20dffb9381d626f40743d08c5dd6c65fd0 (diff)
Merge pull request #27263 from vespa-engine/freva/fix-port
Allow creating client for given URI
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java11
1 files changed, 3 insertions, 8 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 6e6a6dec9d3..d66e9ea7937 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
@@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.node.admin.configserver;
import ai.vespa.util.http.hc4.SslConnectionSocketFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.yahoo.config.provision.HostName;
import com.yahoo.vespa.athenz.identity.ServiceIdentityProvider;
import com.yahoo.vespa.athenz.identity.ServiceIdentitySslSocketFactory;
import com.yahoo.vespa.hosted.node.admin.component.ConfigServerInfo;
@@ -73,14 +72,10 @@ public class ConfigServerApiImpl implements ConfigServerApi {
provider);
}
- public static ConfigServerApiImpl createFor(ConfigServerInfo info,
+ public static ConfigServerApiImpl createFor(URI uri,
ServiceIdentityProvider provider,
- HostnameVerifier hostnameVerifier,
- HostName configServerHostname) {
- return new ConfigServerApiImpl(
- List.of(info.getConfigServerUri(configServerHostname.value())),
- hostnameVerifier,
- provider);
+ HostnameVerifier hostnameVerifier) {
+ return new ConfigServerApiImpl(List.of(uri), hostnameVerifier, provider);
}
private ConfigServerApiImpl(Collection<URI> configServers,