Skip to content

Commit acb76cd

Browse files
fix(tableau): prevents warning in case of site admin creator role (#12175)
1 parent 45ace13 commit acb76cd

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ def report_user_role(report: TableauSourceReport, server: Server) -> None:
645645
# the site-role might be different on another site
646646
logged_in_user: UserInfo = UserInfo.from_server(server=server)
647647

648-
if not logged_in_user.is_site_administrator_explorer():
648+
if not logged_in_user.has_site_administrator_explorer_privileges():
649649
report.warning(
650650
title=title,
651651
message=message,

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,6 @@
8282
SITE = "Site"
8383
IS_UNSUPPORTED_CUSTOM_SQL = "isUnsupportedCustomSql"
8484
SITE_PERMISSION = "sitePermission"
85-
SITE_ROLE = "SiteAdministratorExplorer"
85+
ROLE_SITE_ADMIN_EXPLORER = "SiteAdministratorExplorer"
86+
ROLE_SITE_ADMIN_CREATOR = "SiteAdministratorCreator"
87+
ROLE_SERVER_ADMIN = "ServerAdministrator"

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ class UserInfo:
1111
site_role: str
1212
site_id: str
1313

14-
def is_site_administrator_explorer(self):
15-
return self.site_role == c.SITE_ROLE
14+
def has_site_administrator_explorer_privileges(self):
15+
return self.site_role in [
16+
c.ROLE_SITE_ADMIN_EXPLORER,
17+
c.ROLE_SITE_ADMIN_CREATOR,
18+
c.ROLE_SERVER_ADMIN,
19+
]
1620

1721
@staticmethod
1822
def from_server(server: Server) -> "UserInfo":

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def check_user_role(
2828

2929
try:
3030
# TODO: Add check for `Enable Derived Permissions`
31-
if not logged_in_user.is_site_administrator_explorer():
31+
if not logged_in_user.has_site_administrator_explorer_privileges():
3232
capability_dict[c.SITE_PERMISSION] = CapabilityReport(
3333
capable=False,
3434
failure_reason=f"{failure_reason} Their current role is {logged_in_user.site_role}.",

0 commit comments

Comments
 (0)