Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ingestion/salesforce): handle the label with none value scenario #10446

Merged
merged 6 commits into from
May 8, 2024
Merged

fix(ingestion/salesforce): handle the label with none value scenario #10446

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe34a3d
fix(ingestion/salesforce): handle the lable with none value scenario
dushayntAW May 7, 2024
c28c193
fix(ingestion/salesforce): review comments
dushayntAW May 7, 2024
22ce562
fix(ingestion/salesforce): review comments
dushayntAW May 7, 2024
4a05534
fix(ingestion/salesforce): updated the conditional flow
dushayntAW May 7, 2024
fa8debe
fix(ingestion/salesforce): review comments
dushayntAW May 7, 2024
c539b36
fix(ingestion/salesforce): review comments
dushayntAW May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion metadata-ingestion/src/datahub/ingestion/source/salesforce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,11 @@ def get_profile_workunit(
# Here field description is created from label, description and inlineHelpText
def _get_field_description(self, field: dict, customField: dict) -> str:
desc = (
"\\" + field["Label"] if field["Label"].startswith("#") else field["Label"]
"\\" + field["Label"]
if field["Label"] is not None and field["Label"].startswith("#")
else field["Label"]
if field["Label"] is not None
else ""
)
dushayntAW marked this conversation as resolved.
Show resolved Hide resolved

for key in ["FieldDefinition", "InlineHelpText"]:
dushayntAW marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
36 changes: 36 additions & 0 deletions metadata-ingestion/tests/integration/salesforce/mock_files/account_fields_soql_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2545,6 +2545,42 @@
"RelationshipName": null,
"IsNillable": true
},
{
"attributes": {
"type": "EntityParticle",
"url": "/services/data/v54.0/tooling/sobjects/EntityParticle/Account.Blank_Label"
},
"QualifiedApiName": "Blank_Label",
"DeveloperName": "Blank_Label",
"Label": null,
"InlineHelpText": "# Help Text",
"FieldDefinition": {
"attributes": {
"type": "FieldDefinition",
"url": "/services/data/v54.0/tooling/sobjects/FieldDefinition/Account.Blank_Label"
},
"DataType": "Text(80)",
"LastModifiedDate": null,
"LastModifiedBy": null,
"IsIndexed": false,
"ComplianceGroup": null,
"SecurityClassification": null,
"Description": "This is the # description"
},
"DataType": "string",
"Precision": 0,
"Scale": 0,
"Length": 80,
"Digits": 0,
"IsUnique": false,
"IsCompound": false,
"IsComponent": false,
"ReferenceTo": {
"referenceTo": null
},
"RelationshipName": null,
"IsNillable": true
},
{
"attributes": {
"type": "EntityParticle",
Expand Down
59 changes: 45 additions & 14 deletions metadata-ingestion/tests/integration/salesforce/salesforce_mces_golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand Down Expand Up @@ -1368,6 +1369,23 @@
"isPartOfKey": false,
"jsonProps": "{}"
},
{
"fieldPath": "Blank_Label",
"nullable": true,
"description": "\n\nThis is the # description\n\n\\# Help Text",
"type": {
"type": {
"com.linkedin.schema.StringType": {}
}
},
"nativeDataType": "Text(80)",
"recursive": false,
"globalTags": {
"tags": []
},
"isPartOfKey": false,
"jsonProps": "{}"
},
{
"fieldPath": "Unique_Number",
"nullable": true,
Expand Down Expand Up @@ -1465,7 +1483,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -1482,7 +1501,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -1504,7 +1524,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -1526,7 +1547,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand Down Expand Up @@ -1554,7 +1576,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand Down Expand Up @@ -1951,7 +1974,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -1968,7 +1992,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -1985,7 +2010,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -2006,7 +2032,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -2021,7 +2048,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -2036,7 +2064,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -2051,7 +2080,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
},
{
Expand All @@ -2066,7 +2096,8 @@
},
"systemMetadata": {
"lastObserved": 1652353200000,
"runId": "salesforce-test"
"runId": "salesforce-test",
"lastRunId": "no-run-id-provided"
}
}
]
Loading