feat(auth): Add backwards compatible field resolver

datahub-project · Oct 24, 2023 · 62b8f6a · 62b8f6a
1 parent c849246
commit 62b8f6a
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 10 deletions.
diff --git a/metadata-auth/auth-api/src/main/java/com/datahub/authorization/EntityFieldType.java b/metadata-auth/auth-api/src/main/java/com/datahub/authorization/EntityFieldType.java
@@ -4,6 +4,19 @@
  * List of entity field types to fetch for a given entity
  */
 public enum EntityFieldType {
+
+  /**
+   * Type of the entity (e.g. dataset, chart)
+   * @deprecated
+   */
+  @Deprecated
+  RESOURCE_URN,
+  /**
+   * Urn of the entity
+   * @deprecated
+   */
+  @Deprecated
+  RESOURCE_TYPE,
   /**
    * Type of the entity (e.g. dataset, chart)
    */

diff --git a/...-service/auth-impl/src/main/java/com/datahub/authorization/DefaultEntitySpecResolver.java b/...-service/auth-impl/src/main/java/com/datahub/authorization/DefaultEntitySpecResolver.java
@@ -1,15 +1,16 @@
 package com.datahub.authorization;
 
-import com.datahub.authorization.fieldresolverprovider.DataPlatformInstanceFieldResolverProvider;
-import com.datahub.authorization.fieldresolverprovider.EntityTypeFieldResolverProvider;
-import com.datahub.authorization.fieldresolverprovider.OwnerFieldResolverProvider;
 import com.datahub.authentication.Authentication;
+import com.datahub.authorization.fieldresolverprovider.DataPlatformInstanceFieldResolverProvider;
 import com.datahub.authorization.fieldresolverprovider.DomainFieldResolverProvider;
-import com.datahub.authorization.fieldresolverprovider.EntityUrnFieldResolverProvider;
 import com.datahub.authorization.fieldresolverprovider.EntityFieldResolverProvider;
+import com.datahub.authorization.fieldresolverprovider.EntityTypeFieldResolverProvider;
+import com.datahub.authorization.fieldresolverprovider.EntityUrnFieldResolverProvider;
 import com.datahub.authorization.fieldresolverprovider.GroupMembershipFieldResolverProvider;
+import com.datahub.authorization.fieldresolverprovider.OwnerFieldResolverProvider;
 import com.google.common.collect.ImmutableList;
 import com.linkedin.entity.client.EntityClient;
+import com.linkedin.util.Pair;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -34,7 +35,7 @@ public ResolvedEntitySpec resolve(EntitySpec entitySpec) {
 
   private Map<EntityFieldType, FieldResolver> getFieldResolvers(EntitySpec entitySpec) {
     return _entityFieldResolverProviders.stream()
-        .collect(Collectors.toMap(EntityFieldResolverProvider::getFieldType,
-            hydrator -> hydrator.getFieldResolver(entitySpec)));
+        .flatMap(resolver -> resolver.getFieldTypes().stream().map(fieldType -> Pair.of(fieldType, resolver)))
+        .collect(Collectors.toMap(Pair::getKey, pair -> pair.getValue().getFieldResolver(entitySpec)));
   }
 }
diff --git a/...atahub/authorization/fieldresolverprovider/DataPlatformInstanceFieldResolverProvider.java b/...atahub/authorization/fieldresolverprovider/DataPlatformInstanceFieldResolverProvider.java
@@ -1,8 +1,5 @@
 package com.datahub.authorization.fieldresolverprovider;
 
-import static com.linkedin.metadata.Constants.DATA_PLATFORM_INSTANCE_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.DATA_PLATFORM_INSTANCE_ENTITY_NAME;
-
 import com.datahub.authentication.Authentication;
 import com.datahub.authorization.EntityFieldType;
 import com.datahub.authorization.EntitySpec;
@@ -14,10 +11,13 @@
 import com.linkedin.entity.EnvelopedAspect;
 import com.linkedin.entity.client.EntityClient;
 import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import static com.linkedin.metadata.Constants.*;
+
 /**
  * Provides field resolver for domain given resourceSpec
  */
@@ -33,6 +33,11 @@ public EntityFieldType getFieldType() {
     return EntityFieldType.DATA_PLATFORM_INSTANCE;
   }
 
+  @Override
+  public List<EntityFieldType> getFieldTypes() {
+    return Collections.singletonList(EntityFieldType.DATA_PLATFORM_INSTANCE);
+  }
+
   @Override
   public FieldResolver getFieldResolver(EntitySpec entitySpec) {
     return FieldResolver.getResolverFromFunction(entitySpec, this::getDataPlatformInstance);

diff --git a/...ain/java/com/datahub/authorization/fieldresolverprovider/DomainFieldResolverProvider.java b/...ain/java/com/datahub/authorization/fieldresolverprovider/DomainFieldResolverProvider.java
@@ -14,6 +14,7 @@
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -41,6 +42,11 @@ public EntityFieldType getFieldType() {
     return EntityFieldType.DOMAIN;
   }
 
+  @Override
+  public List<EntityFieldType> getFieldTypes() {
+    return Collections.singletonList(EntityFieldType.DOMAIN);
+  }
+
   @Override
   public FieldResolver getFieldResolver(EntitySpec entitySpec) {
     return FieldResolver.getResolverFromFunction(entitySpec, this::getDomains);

diff --git a/...ain/java/com/datahub/authorization/fieldresolverprovider/EntityFieldResolverProvider.java b/...ain/java/com/datahub/authorization/fieldresolverprovider/EntityFieldResolverProvider.java
@@ -3,6 +3,7 @@
 import com.datahub.authorization.FieldResolver;
 import com.datahub.authorization.EntityFieldType;
 import com.datahub.authorization.EntitySpec;
+import java.util.List;
 
 
 /**
@@ -15,6 +16,12 @@ public interface EntityFieldResolverProvider {
    */
   EntityFieldType getFieldType();
 
+  /**
+   * List of fields that this hydrator is hydrating.
+   * @return
+   */
+  List<EntityFieldType> getFieldTypes();
+
   /**
    * Return resolver for fetching the field values given the entity
    */

diff --git a/...java/com/datahub/authorization/fieldresolverprovider/EntityTypeFieldResolverProvider.java b/...java/com/datahub/authorization/fieldresolverprovider/EntityTypeFieldResolverProvider.java
@@ -3,7 +3,9 @@
 import com.datahub.authorization.FieldResolver;
 import com.datahub.authorization.EntityFieldType;
 import com.datahub.authorization.EntitySpec;
+import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
 import java.util.Collections;
+import java.util.List;
 
 
 /**
@@ -12,7 +14,12 @@
 public class EntityTypeFieldResolverProvider implements EntityFieldResolverProvider {
   @Override
   public EntityFieldType getFieldType() {
-    return EntityFieldType.TYPE;
+    return getFieldTypes().get(0);
+  }
+
+  @Override
+  public List<EntityFieldType> getFieldTypes() {
+    return ImmutableList.of(EntityFieldType.RESOURCE_TYPE, EntityFieldType.TYPE);
   }
 
   @Override

diff --git a/.../java/com/datahub/authorization/fieldresolverprovider/EntityUrnFieldResolverProvider.java b/.../java/com/datahub/authorization/fieldresolverprovider/EntityUrnFieldResolverProvider.java
@@ -3,7 +3,9 @@
 import com.datahub.authorization.FieldResolver;
 import com.datahub.authorization.EntityFieldType;
 import com.datahub.authorization.EntitySpec;
+import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
 import java.util.Collections;
+import java.util.List;
 
 
 /**
@@ -15,6 +17,11 @@ public EntityFieldType getFieldType() {
     return EntityFieldType.URN;
   }
 
+  @Override
+  public List<EntityFieldType> getFieldTypes() {
+    return ImmutableList.of(EntityFieldType.RESOURCE_URN, EntityFieldType.URN);
+  }
+
   @Override
   public FieldResolver getFieldResolver(EntitySpec entitySpec) {
     return FieldResolver.getResolverFromValues(Collections.singleton(entitySpec.getEntity()));

diff --git a/...com/datahub/authorization/fieldresolverprovider/GroupMembershipFieldResolverProvider.java b/...com/datahub/authorization/fieldresolverprovider/GroupMembershipFieldResolverProvider.java
@@ -13,6 +13,7 @@
 import com.linkedin.identity.NativeGroupMembership;
 import com.linkedin.metadata.Constants;
 import com.linkedin.identity.GroupMembership;
+import java.util.Collections;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -39,6 +40,11 @@ public EntityFieldType getFieldType() {
     return EntityFieldType.GROUP_MEMBERSHIP;
   }
 
+  @Override
+  public List<EntityFieldType> getFieldTypes() {
+    return Collections.singletonList(EntityFieldType.GROUP_MEMBERSHIP);
+  }
+
   @Override
   public FieldResolver getFieldResolver(EntitySpec entitySpec) {
     return FieldResolver.getResolverFromFunction(entitySpec, this::getGroupMembership);

diff --git a/...main/java/com/datahub/authorization/fieldresolverprovider/OwnerFieldResolverProvider.java b/...main/java/com/datahub/authorization/fieldresolverprovider/OwnerFieldResolverProvider.java
@@ -12,6 +12,7 @@
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.Constants;
 import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,11 @@ public EntityFieldType getFieldType() {
     return EntityFieldType.OWNER;
   }
 
+  @Override
+  public List<EntityFieldType> getFieldTypes() {
+    return Collections.singletonList(EntityFieldType.OWNER);
+  }
+
   @Override
   public FieldResolver getFieldResolver(EntitySpec entitySpec) {
     return FieldResolver.getResolverFromFunction(entitySpec, this::getOwners);