yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-09-15 20:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(azure AD): fix problem with missing key causing failures in ingestion (#3824)

Browse Source
This commit is contained in:
Aseem Bansal 2022-01-07 19:52:49 +05:30 committed by GitHub
parent a56f0661d5
commit c4e401ee48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
metadata-ingestion/src/datahub/ingestion/source/identity/azure_ad.py
View File

@ -270,16 +270,32 @@ class AzureADSource(Source):
self.report.report_failure("_get_azure_ad_data_", error_str) self.report.report_failure("_get_azure_ad_data_", error_str)
continue continue
def _map_identity_to_urn(self, func, id_to_extract, mapping_identifier, id_type):
result, error_str = None, None
try:
result = func(id_to_extract)
except Exception as e:
error_str = "Failed to extract DataHub {} from Azure AD {} with name {} due to '{}'".format(
id_type, id_type, id_to_extract.get("displayName"), repr(e)
)
if not result:
error_str = "Failed to extract DataHub {} from Azure AD {} with name {} due to unknown reason".format(
id_type, id_type, id_to_extract.get("displayName")
)
if error_str is not None:
logger.error(error_str)
self.report.report_failure(mapping_identifier, error_str)
return result, error_str
def _map_azure_ad_groups(self, azure_ad_groups): def _map_azure_ad_groups(self, azure_ad_groups):
for azure_ad_group in azure_ad_groups: for azure_ad_group in azure_ad_groups:
corp_group_urn = self._map_azure_ad_group_to_urn(azure_ad_group) corp_group_urn, error_str = self._map_identity_to_urn(
if not corp_group_urn: self._map_azure_ad_group_to_urn,
error_str = ( azure_ad_group,
"Failed to extract DataHub Group Name from Azure Group for group named {}. " "azure_ad_group_mapping",
"Skipping...".format(azure_ad_group.get("displayName")) "group",
) )
logger.error(error_str) if error_str is not None:
self.report.report_failure("azure_ad_group_mapping", error_str)
continue continue
group_name = self._extract_regex_match_from_dict_value( group_name = self._extract_regex_match_from_dict_value(
azure_ad_group, azure_ad_group,
@ -327,13 +343,10 @@ class AzureADSource(Source):
def _map_azure_ad_users(self, azure_ad_users): def _map_azure_ad_users(self, azure_ad_users):
for user in azure_ad_users: for user in azure_ad_users:
corp_user_urn = self._map_azure_ad_user_to_urn(user) corp_user_urn, error_str = self._map_identity_to_urn(
if not corp_user_urn: self._map_azure_ad_user_to_urn, user, "azure_ad_user_mapping", "user"
error_str = "Failed to extract DataHub Username from Azure AD User {}. Skipping...".format( )
user.get("displayName") if error_str is not None:
)
logger.error(error_str)
self.report.report_failure("azure_ad_user_mapping", error_str)
continue continue
if not self.config.users_pattern.allowed(corp_user_urn): if not self.config.users_pattern.allowed(corp_user_urn):
self.report.report_filtered(f"{corp_user_urn}.*") self.report.report_filtered(f"{corp_user_urn}.*")