Skip to content

Commit f1723d4

Browse files
authored
Merge branch 'master' into ing-784-lookml-parameter
2 parents a0fc80b + 42d4254 commit f1723d4

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

datahub-graphql-core/src/main/resources/entity.graphql

+5
Original file line numberDiff line numberDiff line change
@@ -3838,6 +3838,11 @@ enum CorpUserStatus {
38383838
A User that has been provisioned and logged in
38393839
"""
38403840
ACTIVE
3841+
3842+
"""
3843+
A user that has been suspended
3844+
"""
3845+
SUSPENDED
38413846
}
38423847

38433848
union ResolvedActor = CorpUser | CorpGroup

metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ def generate_datajob(
522522
# Also, add datahub inputs/outputs if present in input/output metatdata.
523523
for input_def_snap in op_def_snap.input_def_snaps:
524524
job_property_bag[f"input.{input_def_snap.name}"] = str(
525-
input_def_snap._asdict()
525+
input_def_snap.__dict__
526526
)
527527
if Constant.DATAHUB_INPUTS in input_def_snap.metadata:
528528
datajob.inlets.extend(
@@ -533,7 +533,7 @@ def generate_datajob(
533533

534534
for output_def_snap in op_def_snap.output_def_snaps:
535535
job_property_bag[f"output_{output_def_snap.name}"] = str(
536-
output_def_snap._asdict()
536+
output_def_snap.__dict__
537537
)
538538
if (
539539
Constant.DATAHUB_OUTPUTS in output_def_snap.metadata

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -896,10 +896,9 @@ def dataset_browse_prefix(self) -> str:
896896
return f"/{self.config.env.lower()}{self.no_env_browse_prefix}"
897897

898898
def _re_authenticate(self):
899-
tableau_auth: Union[
900-
TableauAuth, PersonalAccessTokenAuth
901-
] = self.config.get_tableau_auth(self.site_id)
902-
self.server.auth.sign_in(tableau_auth)
899+
# Sign-in again may not be enough because Tableau sometimes caches invalid sessions
900+
# so we need to recreate the Tableau Server object
901+
self.server = self.config.make_tableau_client(self.site_id)
903902

904903
@property
905904
def site_content_url(self) -> Optional[str]:

0 commit comments

Comments
 (0)