Model ztsEndpoint as URI

3 files changed, 12 insertions, 10 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java
index d2c914fc209..478f7ee8759 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java
@@ -8,6 +8,7 @@ import com.yahoo.container.core.identity.IdentityConfig;
 import com.yahoo.container.jdisc.athenz.AthenzIdentityProvider;
 
 import java.io.IOException;
+import java.net.URI;
 import java.security.KeyPair;
 
 /**
@@ -49,7 +50,8 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen
                 CryptoUtils.toPem(CryptoUtils.createCSR(domain, service, dnsSuffix, providerUniqueId, keyPair)),
                 true
         );
-        instanceIdentity = athenzService.sendInstanceRegisterRequest( instanceRegisterInformation, document.ztsEndpoint);
+        instanceIdentity = athenzService.sendInstanceRegisterRequest(instanceRegisterInformation,
+                                                                     URI.create(document.ztsEndpoint));
     }
 
     @Override
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzService.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzService.java
index dc1f8956def..12df7e3d5a6 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzService.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzService.java
@@ -17,6 +17,7 @@ import org.eclipse.jetty.http.HttpStatus;
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.net.URI;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -41,10 +42,10 @@ public class AthenzService {
      * Send instance register request to ZTS, get InstanceIdentity
      */
      public InstanceIdentity sendInstanceRegisterRequest(InstanceRegisterInformation instanceRegisterInformation,
-                                                         String ztsEndpoint) {
+                                                         URI uri) {
         try(CloseableHttpClient client = HttpClientBuilder.create().build()) {
             HttpUriRequest postRequest = RequestBuilder.post()
-                    .setUri(ztsEndpoint + INSTANCE_API_PATH)
+                    .setUri(uri.resolve(INSTANCE_API_PATH))
                     .setEntity(toJsonStringEntity(instanceRegisterInformation))
                     .build();
             return getInstanceIdentity(client, postRequest);
@@ -58,15 +59,15 @@ public class AthenzService {
                                                        String instanceServiceName,
                                                        String instanceId,
                                                        InstanceRefreshInformation instanceRefreshInformation,
-                                                       String ztsEndpoint,
+                                                       URI ztsEndpoint,
                                                        X509Certificate certicate,
                                                        PrivateKey privateKey) {
         try (CloseableHttpClient client = createHttpClientWithTlsAuth(certicate, privateKey)) {
-            String uri = String.format("%s/%s/%s/%s/%s",
-                                       ztsEndpoint + INSTANCE_API_PATH,
-                                       providerService, instanceDomain, instanceServiceName, instanceId);
+            String uriPath = String.format(
+                    "%s/%s/%s/%s/%s",
+                    INSTANCE_API_PATH, providerService, instanceDomain, instanceServiceName, instanceId);
             HttpUriRequest postRequest = RequestBuilder.post()
-                    .setUri(uri)
+                    .setUri(ztsEndpoint.resolve(uriPath))
                     .setEntity(toJsonStringEntity(instanceRefreshInformation))
                     .build();
             return getInstanceIdentity(client, postRequest);
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java
index 1f64fb0d379..f315e602ab8 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImplTest.java
@@ -9,7 +9,6 @@ import org.junit.Test;
 import java.io.IOException;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -25,7 +24,7 @@ public class AthenzIdentityProviderImplTest {
         AthenzService athenzService = mock(AthenzService.class);
 
         when(serviceProviderApi.getSignedIdentityDocument()).thenReturn(getIdentityDocument());
-        when(athenzService.sendInstanceRegisterRequest(any(), anyString())).thenReturn(
+        when(athenzService.sendInstanceRegisterRequest(any(), any())).thenReturn(
                 new InstanceIdentity(null, null, null, null, null, null, null, null, "TOKEN"));
 
         AthenzIdentityProvider identityProvider = new AthenzIdentityProviderImpl(config, serviceProviderApi, athenzService);