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-06-07 11:02:29 +0200 |
commit | 7f046ca8efed0644a563d012ff3959457ff69d6b (patch) | |
tree | cff4750fdf350b3f385bd835634476a14fcb7cee /athenz-identity-provider-service/src | |
parent | 11e726b444abe0b4cd01d390ae1b7cee68ed6e98 (diff) |
Add identity type to unique instance id and signed identity document
Diffstat (limited to 'athenz-identity-provider-service/src')
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); } |