summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2017-10-26 19:18:58 +0200
committerBjørn Christian Seime <bjorncs@oath.com>2017-10-26 19:18:58 +0200
commit7d5025e3d2c35cb64024a2a6f3f3c2244dccb66c (patch)
tree5231136f9ee84f18d8b7cfbfa0fa19813c258a49 /container-disc
parentdf0a439ce0de3a5c3c57667524a93716c64deb76 (diff)
Fix invalid ZTS url suffix
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java4
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzService.java2
2 files changed, 3 insertions, 3 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 74850af9838..483a4170dfb 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
@@ -50,7 +50,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen
this.domain = config.domain();
this.service = config.service();
String signedIdentityDocument = serviceProviderApi.getSignedIdentityDocument();
- String athenzUrl = getZtsEndpoint(signedIdentityDocument);
+ String ztsEndpoint = getZtsEndpoint(signedIdentityDocument);
this.dnsSuffix = getDnsSuffix(signedIdentityDocument);
this.providerUniqueId = getProviderUniqueId(signedIdentityDocument);
String providerServiceName = getProviderServiceName(signedIdentityDocument);
@@ -63,7 +63,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen
createCSR(keyPair),
true
);
- instanceIdentity = athenzService.sendInstanceRegisterRequest(instanceRegisterInformation, athenzUrl);
+ instanceIdentity = athenzService.sendInstanceRegisterRequest(instanceRegisterInformation, ztsEndpoint);
}
private static String getProviderUniqueId(String signedIdentityDocument) throws IOException {
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 2866a0e75eb..7468a5c40c5 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
@@ -26,7 +26,7 @@ public class AthenzService {
try(CloseableHttpClient client = HttpClientBuilder.create().build()) {
ObjectMapper objectMapper = new ObjectMapper();
HttpUriRequest postRequest = RequestBuilder.post()
- .setUri(athenzUrl + "/instance")
+ .setUri(athenzUrl + "zts/v1/instance")
.setEntity(new StringEntity(objectMapper.writeValueAsString(instanceRegisterInformation), ContentType.APPLICATION_JSON))
.build();
CloseableHttpResponse response = client.execute(postRequest);