summaryrefslogtreecommitdiffstats
path: root/athenz-identity-provider-service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-04-19 15:49:29 +0200
committerBjørn Christian Seime <bjorncs@oath.com>2018-04-19 15:49:29 +0200
commitca7e9491725b8dd7cb511e12d2ea25034e8171ce (patch)
treec59c4e61b61d6a7255cead81af6af05d6dcd529e /athenz-identity-provider-service
parenta17b034ae224f67c8b47a6a70b34078b41efdd4a (diff)
Change type of 'zts-endpoint' to URI
Diffstat (limited to 'athenz-identity-provider-service')
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java3
-rw-r--r--athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java
index 2e4ecf475bc..01b797a54a5 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java
@@ -15,6 +15,7 @@ import com.yahoo.vespa.hosted.provision.NodeRepository;
import com.yahoo.vespa.hosted.provision.node.Allocation;
import java.net.InetAddress;
+import java.net.URI;
import java.security.PrivateKey;
import java.security.Signature;
import java.time.Instant;
@@ -64,7 +65,7 @@ public class IdentityDocumentGenerator {
identityDocument.providerUniqueId.toVespaUniqueInstanceId().asDottedString(),
toZoneDnsSuffix(zone, zoneConfig.certDnsSuffix()),
zoneConfig.domain() + "." + zoneConfig.serviceName(),
- zoneConfig.ztsUrl(),
+ URI.create(zoneConfig.ztsUrl()),
SignedIdentityDocument.DEFAULT_DOCUMENT_VERSION);
} catch (Exception e) {
throw new RuntimeException("Exception generating identity document: " + e.getMessage(), e);
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java
index e7d8ef57a69..091d309a593 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java
@@ -17,6 +17,7 @@ import com.yahoo.vespa.athenz.identityprovider.api.bindings.ProviderUniqueId;
import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocument;
import org.junit.Test;
+import java.net.URI;
import java.security.PrivateKey;
import java.security.Signature;
import java.time.Instant;
@@ -138,7 +139,7 @@ public class InstanceValidatorTest {
identityDocument.providerUniqueId.toVespaUniqueInstanceId().asDottedString(),
"dnssuffix",
"service",
- "localhost/zts",
+ URI.create("http://localhost/zts"),
1));
} catch (Exception e) {
throw new RuntimeException(e);