diff options
5 files changed, 9 insertions, 9 deletions
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java index 078ef1b7e39..578c044796f 100644 --- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java +++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java @@ -85,7 +85,7 @@ public class IdentityDocumentGeneratorTest { SignedIdentityDocument signedIdentityDocument = identityDocumentGenerator.generateSignedIdentityDocument(containerHostname, IdentityType.TENANT); // Verify attributes - assertEquals(containerHostname, signedIdentityDocument.identityDocument().instanceHostname()); + assertEquals(containerHostname, signedIdentityDocument.instanceHostname()); String environment = "dev"; String region = "us-north-1"; @@ -97,7 +97,7 @@ public class IdentityDocumentGeneratorTest { assertEquals(expectedProviderUniqueId, signedIdentityDocument.providerUniqueId()); // Validate that container ips are present - assertThat(signedIdentityDocument.identityDocument().ipAddresses(), Matchers.containsInAnyOrder("::1")); + assertThat(signedIdentityDocument.ipAddresses(), Matchers.containsInAnyOrder("::1")); SignedIdentityDocumentEntity signedIdentityDocumentEntity = EntityBindingsMapper.toSignedIdentityDocumentEntity(signedIdentityDocument); diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/EntityBindingsMapper.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/EntityBindingsMapper.java index ab127b19bf1..3bfe492a125 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/EntityBindingsMapper.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/EntityBindingsMapper.java @@ -8,7 +8,6 @@ import com.yahoo.vespa.athenz.api.AthenzService; import com.yahoo.vespa.athenz.identityprovider.api.bindings.IdentityDocumentEntity; import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocumentEntity; import com.yahoo.vespa.athenz.identityprovider.api.bindings.VespaUniqueInstanceIdEntity; -import com.yahoo.vespa.athenz.utils.AthenzIdentities; import java.io.IOException; import java.io.UncheckedIOException; @@ -52,12 +51,12 @@ public class EntityBindingsMapper { public static SignedIdentityDocument toSignedIdentityDocument(SignedIdentityDocumentEntity entity) { return new SignedIdentityDocument( - toIdentityDocument(entity.identityDocument), + entity.identityDocument != null ? toIdentityDocument(entity.identityDocument) : null, entity.signature, entity.signingKeyVersion, fromDottedString(entity.providerUniqueId), entity.dnsSuffix, - (AthenzService) AthenzIdentities.from(entity.providerService), + new AthenzService(entity.providerService), entity.ztsEndpoint, entity.documentVersion, entity.configServerHostname, @@ -84,7 +83,7 @@ public class EntityBindingsMapper { public static SignedIdentityDocumentEntity toSignedIdentityDocumentEntity(SignedIdentityDocument model) { try { - IdentityDocumentEntity identityDocumentEntity = toIdentityDocumentEntity(model.identityDocument()); + IdentityDocumentEntity identityDocumentEntity = model.identityDocument() != null ? toIdentityDocumentEntity(model.identityDocument()) : null; String rawDocument = Base64.getEncoder().encodeToString(mapper.writeValueAsString(identityDocumentEntity).getBytes()); return new SignedIdentityDocumentEntity( rawDocument, diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java index 7c64d048944..aa1dbd4dac3 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java @@ -58,6 +58,7 @@ public class SignedIdentityDocument { this.identityType = identityType; } + @Deprecated public IdentityDocument identityDocument() { return identityDocument; } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java index aa514b3caf3..3d4872549d6 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java @@ -25,7 +25,7 @@ public class SignedIdentityDocumentEntity { private static final ObjectMapper mapper = createObjectMapper(); @JsonProperty("identity-document")public final String rawIdentityDocument; - @JsonIgnore public final IdentityDocumentEntity identityDocument; + @JsonIgnore @Deprecated public final IdentityDocumentEntity identityDocument; @JsonProperty("signature") public final String signature; @JsonProperty("signing-key-version") public final int signingKeyVersion; @JsonProperty("provider-unique-id") public final String providerUniqueId; // String representation diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java index 1136106ce19..bc161290993 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java @@ -56,7 +56,7 @@ class AthenzCredentialsService { Pkcs10Csr csr = instanceCsrGenerator.generateCsr( tenantIdentity, document.providerUniqueId(), - document.identityDocument().ipAddresses(), + document.ipAddresses(), keyPair); try (com.yahoo.vespa.athenz.client.zts.ZtsClient ztsClient = @@ -79,7 +79,7 @@ class AthenzCredentialsService { Pkcs10Csr csr = instanceCsrGenerator.generateCsr( tenantIdentity, document.providerUniqueId(), - document.identityDocument().ipAddresses(), + document.ipAddresses(), newKeyPair); try (com.yahoo.vespa.athenz.client.zts.ZtsClient ztsClient = |