1 files changed, 53 insertions, 9 deletions

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 a01bbe2fae1..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
@@ -5,11 +5,14 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 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 java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;
+import java.util.Base64;
 
 import static com.yahoo.vespa.athenz.identityprovider.api.VespaUniqueInstanceId.fromDottedString;
 
@@ -32,12 +35,29 @@ public class EntityBindingsMapper {
         }
     }
 
+    public static VespaUniqueInstanceId toVespaUniqueInstanceId(VespaUniqueInstanceIdEntity entity) {
+        return new VespaUniqueInstanceId(
+                entity.clusterIndex, entity.clusterId, entity.instance, entity.application, entity.tenant, entity.region, entity.environment, entity.type != null ? IdentityType.fromId(entity.type) : null); // TODO Remove support for legacy representation without type
+    }
+
+    public static IdentityDocument toIdentityDocument(IdentityDocumentEntity entity) {
+        return new IdentityDocument(
+                toVespaUniqueInstanceId(entity.providerUniqueId),
+                entity.configServerHostname,
+                entity.instanceHostname,
+                entity.createdAt,
+                entity.ipAddresses);
+    }
+
     public static SignedIdentityDocument toSignedIdentityDocument(SignedIdentityDocumentEntity entity) {
         return new SignedIdentityDocument(
+                entity.identityDocument != null ? toIdentityDocument(entity.identityDocument) : null,
                 entity.signature,
                 entity.signingKeyVersion,
                 fromDottedString(entity.providerUniqueId),
+                entity.dnsSuffix,
                 new AthenzService(entity.providerService),
+                entity.ztsEndpoint,
                 entity.documentVersion,
                 entity.configServerHostname,
                 entity.instanceHostname,
@@ -46,18 +66,42 @@ public class EntityBindingsMapper {
                 entity.identityType != null ? IdentityType.fromId(entity.identityType) : null); // TODO Remove support for legacy representation without type
     }
 
-    public static SignedIdentityDocumentEntity toSignedIdentityDocumentEntity(SignedIdentityDocument model) {
-        return new SignedIdentityDocumentEntity(
-                model.signature(),
-                model.signingKeyVersion(),
-                model.providerUniqueId().asDottedString(),
-                model.providerService().getFullName(),
-                model.documentVersion(),
+    public static VespaUniqueInstanceIdEntity toVespaUniqueInstanceIdEntity(VespaUniqueInstanceId model) {
+        return new VespaUniqueInstanceIdEntity(
+                model.tenant(), model.application(), model.environment(), model.region(),
+                model.instance(), model.clusterId(), model.clusterIndex(), model.type() != null ? model.type().id() : null); // TODO Remove support for legacy representation without type
+    }
+
+    public static IdentityDocumentEntity toIdentityDocumentEntity(IdentityDocument model) {
+        return new IdentityDocumentEntity(
+                toVespaUniqueInstanceIdEntity(model.providerUniqueId()),
                 model.configServerHostname(),
                 model.instanceHostname(),
                 model.createdAt(),
-                model.ipAddresses(),
-                model.identityType() != null ? model.identityType().id() : null); // TODO Remove support for legacy representation without type
+                model.ipAddresses());
+    }
+
+    public static SignedIdentityDocumentEntity toSignedIdentityDocumentEntity(SignedIdentityDocument model) {
+        try {
+            IdentityDocumentEntity identityDocumentEntity = model.identityDocument() != null ? toIdentityDocumentEntity(model.identityDocument()) : null;
+            String rawDocument = Base64.getEncoder().encodeToString(mapper.writeValueAsString(identityDocumentEntity).getBytes());
+            return new SignedIdentityDocumentEntity(
+                    rawDocument,
+                    model.signature(),
+                    model.signingKeyVersion(),
+                    model.providerUniqueId().asDottedString(),
+                    model.dnsSuffix(),
+                    model.providerService().getFullName(),
+                    model.ztsEndpoint(),
+                    model.documentVersion(),
+                    model.configServerHostname(),
+                    model.instanceHostname(),
+                    model.createdAt(),
+                    model.ipAddresses(),
+                    model.identityType() != null ? model.identityType().id() : null); // TODO Remove support for legacy representation without type
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public static SignedIdentityDocument readSignedIdentityDocumentFromFile(Path file) {