diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-05-31 15:20:49 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-05-31 15:46:12 +0200 |
| commit | cfa6d7bb63402b83c84a16411a207e946de33246 (patch) | |
| tree | e02f9fbbb1a8a637b61a2e498d7c69caedb84b82 /athenz-identity-provider-service | |
| parent | 48ea96e26f4cc037f0cf81a303b4617ea8e2441d (diff) | |
Add identity type to unique instance id and signed identity document
Diffstat (limited to 'athenz-identity-provider-service')
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 ffeca67645b..947c132167f 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 @@ -75,7 +75,8 @@ public class IdentityDocumentGenerator { identityDocument.configServerHostname(), identityDocument.instanceHostname(), identityDocument.createdAt(), - identityDocument.ipAddresses()); + identityDocument.ipAddresses(), + null); // TODO Specify identity type } 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 1ac9ff6f83a..54411b424eb 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 @@ -147,7 +147,8 @@ public class InstanceValidatorTest { identityDocument.configServerHostname, identityDocument.instanceHostname, identityDocument.createdAt, - identityDocument.ipAddresses)); + identityDocument.ipAddresses, + null)); // TODO Remove support for legacy representation without type } catch (Exception e) { throw new RuntimeException(e); } |