Format and linting fixes

mkamalas · Aug 30, 2024 · 193a093 · 193a093
1 parent bf81623
commit 193a093
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 54 deletions.
diff --git a/...phql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/AddTagResolver.java b/...phql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/AddTagResolver.java
@@ -39,9 +39,10 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
     }
 
     if (!LabelUtils.isAuthorizedToAssociateTag(environment.getContext(), tagUrn)) {
-      throw new AuthorizationException("Only users granted permission to this tag can assign or remove it");
+      throw new AuthorizationException(
+          "Only users granted permission to this tag can assign or remove it");
     }
- 
+
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
           LabelUtils.validateResourceAndLabel(

diff --git a/...hql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/AddTagsResolver.java b/...hql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/AddTagsResolver.java
@@ -43,12 +43,14 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
                 "Unauthorized to perform this action. Please contact your DataHub administrator.");
           }
 
-          tagUrns.forEach((tagUrn) -> {
-            if (!LabelUtils.isAuthorizedToAssociateTag(environment.getContext(), tagUrn)) {
-              throw new AuthorizationException("Only users granted permission to this tag can assign or remove it");
-            }
-          });
-
+          tagUrns.forEach(
+              (tagUrn) -> {
+                if (!LabelUtils.isAuthorizedToAssociateTag(environment.getContext(), tagUrn)) {
+                  throw new AuthorizationException(
+                      "Only users granted permission to this tag can assign or remove it");
+                }
+              });
+
           LabelUtils.validateResourceAndLabel(
               context.getOperationContext(),
               tagUrns,

diff --git a/...ore/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchAddTagsResolver.java b/...ore/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchAddTagsResolver.java
@@ -15,7 +15,6 @@
 import com.linkedin.metadata.entity.EntityService;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
-import io.datahubproject.metadata.context.OperationContext;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -129,10 +128,12 @@ private Boolean attemptBatchAddTagsWithSiblings(
 
   private void validateTags(@Nonnull QueryContext context, List<Urn> tagUrns) {
     for (Urn tagUrn : tagUrns) {
-      LabelUtils.validateLabel(context.getOperationContext(), tagUrn, Constants.TAG_ENTITY_NAME, _entityService);
-
+      LabelUtils.validateLabel(
+          context.getOperationContext(), tagUrn, Constants.TAG_ENTITY_NAME, _entityService);
+
       if (!LabelUtils.isAuthorizedToAssociateTag(context, tagUrn)) {
-        throw new AuthorizationException("Only users granted permission to this tag can assign or remove it");
+        throw new AuthorizationException(
+            "Only users granted permission to this tag can assign or remove it");
       }
     }
   }

diff --git a/.../src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchRemoveTagsResolver.java b/.../src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchRemoveTagsResolver.java
@@ -63,7 +63,8 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
   private void validateTags(List<Urn> tagUrns, QueryContext context) {
     for (Urn tagUrn : tagUrns) {
       if (!LabelUtils.isAuthorizedToAssociateTag(context, tagUrn)) {
-        throw new AuthorizationException("Only users granted permission to this tag can assign or remove it");
+        throw new AuthorizationException(
+            "Only users granted permission to this tag can assign or remove it");
       }
     }
   }

diff --git a/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/RemoveTagResolver.java b/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/RemoveTagResolver.java
@@ -37,7 +37,8 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
           "Unauthorized to perform this action. Please contact your DataHub administrator.");
     }
     if (!LabelUtils.isAuthorizedToAssociateTag(environment.getContext(), tagUrn)) {
-      throw new AuthorizationException("Only users granted permission to this tag can assign or remove it");
+      throw new AuthorizationException(
+          "Only users granted permission to this tag can assign or remove it");
     }
 
     return GraphQLConcurrencyUtils.supplyAsync(

diff --git a/...hql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/LabelUtils.java b/...hql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/LabelUtils.java
@@ -261,9 +261,11 @@ public static boolean isAuthorizedToUpdateTags(
   public static boolean isAuthorizedToAssociateTag(@Nonnull QueryContext context, Urn targetUrn) {
 
     // Decide whether the current principal should be allowed to associate the tag
-    final DisjunctivePrivilegeGroup orPrivilegeGroups = new DisjunctivePrivilegeGroup(ImmutableList.of(
-        new ConjunctivePrivilegeGroup(ImmutableList.of(PoliciesConfig.ASSOCIATE_TAGS_PRIVILEGE.getType()))
-    ));
+    final DisjunctivePrivilegeGroup orPrivilegeGroups =
+        new DisjunctivePrivilegeGroup(
+            ImmutableList.of(
+                new ConjunctivePrivilegeGroup(
+                    ImmutableList.of(PoliciesConfig.ASSOCIATE_TAGS_PRIVILEGE.getType()))));
 
     return AuthorizationUtils.isAuthorized(
         context.getAuthorizer(),

diff --git a/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx b/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Link } from 'react-router-dom';
 import { Form, Select, Tag, Tooltip, Typography, Tag as CustomTag, Checkbox } from 'antd';
+import { CheckboxChangeEvent } from 'antd/lib/checkbox';
 import styled from 'styled-components/macro';
 
 import { useEntityRegistry } from '../../useEntityRegistry';
@@ -183,7 +184,12 @@ export default function PolicyPrivilegeForm({
         };
         setResources({
             ...resources,
-            filter: setFieldValues(filter, 'TYPE', [...resourceTypes, createCriterionValue(selectedResourceType)], PolicyMatchCondition.Equals),
+            filter: setFieldValues(
+                filter,
+                'TYPE',
+                [...resourceTypes, createCriterionValue(selectedResourceType)],
+                PolicyMatchCondition.Equals,
+            ),
         });
     };
 
@@ -209,15 +215,18 @@ export default function PolicyPrivilegeForm({
         };
         setResources({
             ...resources,
-            filter: setFieldValues(filter, 'URN', [
-                ...resourceEntities,
-                createCriterionValueWithEntity(
-                    resource,
-                    getEntityFromSearchResults(resourceSearchResults, resource) || null,
-                ),
-            ],
-            matchCondition,
-           ),
+            filter: setFieldValues(
+                filter,
+                'URN',
+                [
+                    ...resourceEntities,
+                    createCriterionValueWithEntity(
+                        resource,
+                        getEntityFromSearchResults(resourceSearchResults, resource) || null,
+                    ),
+                ],
+                matchCondition,
+            ),
         });
     };
 
@@ -258,13 +267,10 @@ export default function PolicyPrivilegeForm({
         };
         const domainEntity = domainObj || getEntityFromSearchResults(domainSearchResults, domainUrn);
         const updatedFilter = setFieldValues(
-          filter,
-          'DOMAIN',
-          [
-            ...domains,
-            createCriterionValueWithEntity(domainUrn, domainEntity || null),
-          ],
-          PolicyMatchCondition.Equals,
+            filter,
+            'DOMAIN',
+            [...domains, createCriterionValueWithEntity(domainUrn, domainEntity || null)],
+            PolicyMatchCondition.Equals,
         );
         setResources({
             ...resources,
@@ -412,7 +418,7 @@ export default function PolicyPrivilegeForm({
             setSelectedTags(editTags);
             setResources({
                 ...resources,
-                filter: setFieldValues(filter, 'TAG', [...(newTag as any)]),
+                filter: setFieldValues(filter, 'TAG', [...(newTag as any)], PolicyMatchCondition.Equals),
             });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -426,7 +432,7 @@ export default function PolicyPrivilegeForm({
 
         setResources({
             ...resources,
-            filter: setFieldValues(filter, 'TAG', [...tags, urn as any]),
+            filter: setFieldValues(filter, 'TAG', [...tags, urn as any], PolicyMatchCondition.Equals),
         });
         setSelectedTags([...(selectedTags as any), selectedTagOption]);
         if (inputEl && inputEl.current) {
@@ -448,6 +454,7 @@ export default function PolicyPrivilegeForm({
                 filter,
                 'TAG',
                 tags?.filter((criterionValue) => (criterionValue as any) !== urn),
+                PolicyMatchCondition.Equals,
             ),
         });
     };
@@ -540,13 +547,11 @@ export default function PolicyPrivilegeForm({
                         </Typography.Paragraph>
                         <Checkbox
                             checked={matchCondition === PolicyMatchCondition.NotEquals}
-                            onChange={(value) => {
+                            onChange={(event: CheckboxChangeEvent) => {
                                 setMatchCondition(
-                                    value?.target?.checked
-                                        ? PolicyMatchCondition.NotEquals
-                                        : PolicyMatchCondition.Equals,
+                                    event.target.checked ? PolicyMatchCondition.NotEquals : PolicyMatchCondition.Equals,
                                 );
-                                updateMatchConditionInResources(value?.target?.checked);
+                                updateMatchConditionInResources(event.target.checked);
                             }}
                         >
                             Exclude Resources
@@ -576,9 +581,9 @@ export default function PolicyPrivilegeForm({
                             )}
                         >
                             {resourceSearchResults?.map((result) => (
-                               <Select.Option key={result.entity.urn} value={result.entity.urn}>
-                                 {renderSearchResult(result)}
-                               </Select.Option>
+                                <Select.Option key={result.entity.urn} value={result.entity.urn}>
+                                    {renderSearchResult(result)}
+                                </Select.Option>
                             ))}
                         </Select>
                     </Form.Item>

diff --git a/datahub-web-react/src/app/permissions/policy/policyUtils.ts b/datahub-web-react/src/app/permissions/policy/policyUtils.ts
@@ -103,10 +103,14 @@ export const convertLegacyResourceFilter = (resourceFilter: Maybe<ResourceFilter
     }
     const criteria = new Array<PolicyMatchCriterion>();
     if (resourceFilter.type) {
-        criteria.push(createCriterion('TYPE', [createCriterionValue(resourceFilter.type)]), PolicyMatchCondition.Equals,);
+        criteria.push(
+            createCriterion('TYPE', [createCriterionValue(resourceFilter.type)], PolicyMatchCondition.Equals),
+        );
     }
     if (resourceFilter.resources && resourceFilter.resources.length > 0) {
-        criteria.push(createCriterion('URN', resourceFilter.resources.map(createCriterionValue), PolicyMatchCondition.Equals));
+        criteria.push(
+            createCriterion('URN', resourceFilter.resources.map(createCriterionValue), PolicyMatchCondition.Equals),
+        );
     }
     return {
         filter: {

diff --git a/metadata-service/auth-impl/src/main/java/com/datahub/authorization/PolicyEngine.java b/metadata-service/auth-impl/src/main/java/com/datahub/authorization/PolicyEngine.java
@@ -245,11 +245,13 @@ private boolean checkCriterion(
     }
 
     Set<String> fieldValues = resource.getFieldValues(entityFieldType);
-    //For PolicyMatchCondition.NOT_EQUALS, we need to make sure the condition is not satistified for all of the resources specified
+
+    // For PolicyMatchCondition.NOT_EQUALS, we need to make sure the condition is not satistified
+    // for all of the resources specified
     if (criterion.getCondition() == PolicyMatchCondition.NOT_EQUALS) {
-      return criterion.getValues()
-        .stream()
-        .allMatch(filterValue -> checkCondition(fieldValues, filterValue, criterion.getCondition()));
+      return criterion.getValues().stream()
+          .allMatch(
+              filterValue -> checkCondition(fieldValues, filterValue, criterion.getCondition()));
     }
     return criterion.getValues().stream()
         .anyMatch(

diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
@@ -376,10 +376,11 @@ public class PoliciesConfig {
   public static final Privilege EDIT_TAG_COLOR_PRIVILEGE =
       Privilege.of("EDIT_TAG_COLOR", "Edit Tag Color", "The ability to change the color of a Tag.");
 
-  public static final Privilege ASSOCIATE_TAGS_PRIVILEGE = Privilege.of(
-      "ASSOCIATE_TAGS_PRIVILEGE",
-      "Associate Tags",
-      "The ability to associate this tag to an asset.");
+  public static final Privilege ASSOCIATE_TAGS_PRIVILEGE =
+      Privilege.of(
+          "ASSOCIATE_TAGS_PRIVILEGE",
+          "Associate Tags",
+          "The ability to associate this tag to an asset.");
 
   // Group Privileges
   public static final Privilege EDIT_GROUP_MEMBERS_PRIVILEGE =