diff options
6 files changed, 10 insertions, 9 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java index ae29a912c11..aeb86ae9d59 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java @@ -43,5 +43,5 @@ public interface CloudConfigOptions { Optional<Integer> numParallelTenantLoaders(); Optional<String> dockerRegistry(); Optional<String> dockerVespaBaseImage(); - Optional<String> serviceProviderEndpoint(); + Optional<String> loadBalancerAddress(); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java index fe5cd3dc029..e2c8f2e2c52 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java @@ -116,7 +116,7 @@ public class TestOptions implements CloudConfigOptions { public Optional<String> dockerVespaBaseImage() { return Optional.empty(); } @Override - public Optional<String> serviceProviderEndpoint() { return Optional.empty(); } + public Optional<String> loadBalancerAddress() { return Optional.empty(); } public TestOptions numParallelTenantLoaders(int numLoaders) { this.numParallelTenantLoaders = Optional.of(numLoaders); diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index fe71e33bb03..c13665342ef 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -43,4 +43,4 @@ dockerRegistry string default="" dockerVespaBaseImage string default="" # Athenz config -serviceProviderEndpoint string default=""
\ No newline at end of file +loadBalancerAddress string default=""
\ No newline at end of file diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java index f67afdfc458..45b08c74688 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java @@ -30,7 +30,7 @@ public final class AthenzIdentityProvider extends AbstractComponent { @Inject public AthenzIdentityProvider(IdentityConfig config, ConfigserverConfig configserverConfig) throws IOException { - this(config, new ServiceProviderApi(configserverConfig.serviceProviderEndpoint()), new AthenzService()); + this(config, new ServiceProviderApi(configserverConfig.loadBalancerAddress()), new AthenzService()); } // Test only diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/ServiceProviderApi.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/ServiceProviderApi.java index 0b417a4d440..c6c56d016d9 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/ServiceProviderApi.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/ServiceProviderApi.java @@ -8,16 +8,17 @@ import org.apache.http.util.EntityUtils; import org.eclipse.jetty.http.HttpStatus; import java.io.IOException; +import java.net.URI; /** * @author mortent */ public class ServiceProviderApi { - private final String providerEndpoint; + private final URI providerUri; - public ServiceProviderApi(String providerEndpoint) { - this.providerEndpoint = providerEndpoint; + public ServiceProviderApi(String providerAddress) { + providerUri = URI.create(String.format("https://%s:8443/athenz/v1/provider", providerAddress)); } @@ -31,7 +32,7 @@ public class ServiceProviderApi { // TODO Use client side auth to establish trusted secure channel try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) { - CloseableHttpResponse idDocResponse = httpClient.execute(RequestBuilder.get().setUri(providerEndpoint + "/identity-document").build()); + CloseableHttpResponse idDocResponse = httpClient.execute(RequestBuilder.get().setUri(providerUri + "/identity-document").build()); if (HttpStatus.isSuccess(idDocResponse.getStatusLine().getStatusCode())) { return EntityUtils.toString(idDocResponse.getEntity()); } else { diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala index 009de6fd541..fe1af676b54 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala @@ -38,7 +38,7 @@ class CloudConfigYinstVariables extends CloudConfigOptions { override val numParallelTenantLoaders = optionalYinstVar[java.lang.Integer]("num_parallel_tenant_loaders") override val dockerRegistry = optionalYinstVar[java.lang.String]("docker_registry") override val dockerVespaBaseImage = optionalYinstVar[java.lang.String]("docker_vespa_base_image") - override val serviceProviderEndpoint = optionalYinstVar[java.lang.String]("service_provider_endpoint") + override val loadBalancerAddress = optionalYinstVar[java.lang.String]("load_balancer_address") } object CloudConfigYinstVariables { |