diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2018-06-03 19:30:08 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2018-06-03 19:30:08 +0200 |
| commit | 2325a9d5c1a583a64368373498be8ed35a04146d (patch) | |
| tree | 32b9675b22e4830fbff6ed8c6e140de85c286078 /athenz-identity-provider-service | |
| parent | 03bb661323d0c5bb9a9d8a3375d87b1e76c3c669 (diff) | |
Revert "Add identity type to unique instance id and signed identity document"
This reverts commit cfa6d7bb63402b83c84a16411a207e946de33246.
Diffstat (limited to 'athenz-identity-provider-service')
2 files changed, 2 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 947c132167f..ffeca67645b 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,8 +75,7 @@ public class IdentityDocumentGenerator { identityDocument.configServerHostname(), identityDocument.instanceHostname(), identityDocument.createdAt(), - identityDocument.ipAddresses(), - null); // TODO Specify identity type + identityDocument.ipAddresses()); } 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 54411b424eb..1ac9ff6f83a 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,8 +147,7 @@ public class InstanceValidatorTest { identityDocument.configServerHostname, identityDocument.instanceHostname, identityDocument.createdAt, - identityDocument.ipAddresses, - null)); // TODO Remove support for legacy representation without type + identityDocument.ipAddresses)); } catch (Exception e) { throw new RuntimeException(e); } |