diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-18 12:30:55 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-18 13:25:23 +0200 |
| commit | 142f82353c20d64cc00fb5c58a3e1cf874ee6678 (patch) | |
| tree | 0e00f2c899cb40098d805e2df8fa3d455f30ba87 /athenz-identity-provider-service | |
| parent | 631171a987081467d7d4fe9c8cbd6f46fdb1f31a (diff) | |
Add type for provider unique instance id
Diffstat (limited to 'athenz-identity-provider-service')
3 files changed, 5 insertions, 4 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 8ce13111536..95e9713f335 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 @@ -57,7 +57,7 @@ public class IdentityDocumentGenerator { encodedIdentityDocument, signature, SignedIdentityDocument.DEFAULT_KEY_VERSION, - identityDocument.providerUniqueId.asString(), + identityDocument.providerUniqueId.toVespaUniqueInstanceId().asDottedString(), toZoneDnsSuffix(zone, zoneConfig.certDnsSuffix()), zoneConfig.domain() + "." + zoneConfig.serviceName(), zoneConfig.ztsUrl(), diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/ProviderUniqueId.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/ProviderUniqueId.java index 9736b9d48a9..c956ead5f8c 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/ProviderUniqueId.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/ProviderUniqueId.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.hosted.athenz.instanceproviderservice.identitydocument; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yahoo.vespa.athenz.identityprovider.api.VespaUniqueInstanceId; import java.util.Objects; @@ -41,8 +42,8 @@ public class ProviderUniqueId { this.clusterIndex = clusterIndex; } - public String asString() { - return String.format("%d.%s.%s.%s.%s.%s.%s", clusterIndex, clusterId, instance, application, tenant, region, environment); + public VespaUniqueInstanceId toVespaUniqueInstanceId() { + return new VespaUniqueInstanceId(clusterIndex, clusterId, instance, application, tenant, region, environment); } @Override 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 84105c5b551..ffd3265957f 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 @@ -135,7 +135,7 @@ public class InstanceValidatorTest { new SignedIdentityDocument(encodedIdentityDocument, Base64.getEncoder().encodeToString(sigGenerator.sign()), 0, - identityDocument.providerUniqueId.asString(), + identityDocument.providerUniqueId.toVespaUniqueInstanceId().asDottedString(), "dnssuffix", "service", "localhost/zts", |