refactored code

Author: sid-acryl

metadata-ingestion/src/datahub/configuration/common.py

@@ -258,15 +258,15 @@ def allow_all(cls) -> "AllowDenyPattern":
         return AllowDenyPattern()
 
     def allowed(self, string: str) -> bool:
-        if self._denied(string):
+        if self.denied(string):
             return False
 
         return any(
             re.match(allow_pattern, string, self.regex_flags)
             for allow_pattern in self.allow
         )
 
-    def _denied(self, string: str) -> bool:
+    def denied(self, string: str) -> bool:
         for deny_pattern in self.deny:
             if re.match(deny_pattern, string, self.regex_flags):
                 return True
@@ -290,7 +290,7 @@ def get_allowed_list(self) -> List[str]:
             raise ValueError(
                 "allow list must be fully specified to get list of allowed strings"
             )
-        return [a for a in self.allow if not self._denied(a)]
+        return [a for a in self.allow if not self.denied(a)]
 
     def __eq__(self, other):  # type: ignore
         return isinstance(other, self.__class__) and self.__dict__ == other.__dict__

metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py

@@ -935,26 +935,9 @@ def _is_denied_project(self, project: TableauProject) -> bool:
         # Either project_pattern or project_path_pattern is set in a recipe
         # TableauConfig.projects_backward_compatibility ensures that at least one of these properties is configured.
 
-        # for backward compatibility check deny list of project_pattern
-        for deny_pattern in self.config.project_pattern.deny:
-            if re.match(
-                deny_pattern, project.name, self.config.project_pattern.regex_flags
-            ):
-                return True
-
-        for deny_pattern in self.config.project_path_pattern.deny:
-            if re.match(
-                deny_pattern,
-                self._get_project_path(project),
-                self.config.project_pattern.regex_flags,
-            ):
-                return True
-
-        logger.info(
-            f"project({project.name}) is not denied as per project_pattern(or project_path_pattern)"
-        )
-
-        return False
+        return self.config.project_pattern.denied(
+            project.name
+        ) or self.config.project_path_pattern.denied(self._get_project_path(project))
 
     def _init_tableau_project_registry(self, all_project_map: dict) -> None:
         list_of_skip_projects: List[TableauProject] = []
@@ -982,9 +965,11 @@ def _init_tableau_project_registry(self, all_project_map: dict) -> None:
             for project in list_of_skip_projects:
                 if (
                     project.parent_id in projects_to_ingest
-                    and self._is_denied_project(project) is False
+                    and not self._is_denied_project(project)
                 ):
-                    logger.debug(f"Project {project.name} is added in project registry")
+                    logger.debug(
+                        f"Project {project.name} is added in project registry as it's a child project and not explicitly denied in `deny` list"
+                    )
                     projects_to_ingest[project.id] = project
 
         # We rely on automatic browse paths (v2) when creating containers. That's why we need to sort the projects here.