Merge pull request #972 from gooddata/snapshot-master-ca10fe22-to-rel/dev

yenkins-admin · web-flow · commit d2f3782a30c4 · 2025-02-06T11:00:16.000+01:00
[bot] Merge master/ca10fe22 into rel/dev
diff --git a/gooddata-sdk/gooddata_sdk/catalog/data_source/declarative_model/data_source.py b/gooddata-sdk/gooddata_sdk/catalog/data_source/declarative_model/data_source.py
@@ -35,7 +35,7 @@ def _inject_base(self, credentials: dict[str, Any]) -> DeclarativeDataSources:
                     token = TokenCredentialsFromFile.token_from_file(credentials[data_source.id])
                     data_sources.append(data_source.to_api(token=token))
                 elif data_source.type == DATABRICKS_TYPE:
-                    if data_source.client_id is not None:
+                    if data_source.client_id and data_source.client_id.strip():
                         client_secret = ClientSecretCredentialsFromFile.client_secret_from_file(
                             credentials[data_source.id]
                         )
diff --git a/gooddata-sdk/gooddata_sdk/catalog/data_source/service.py b/gooddata-sdk/gooddata_sdk/catalog/data_source/service.py
@@ -476,7 +476,7 @@ def test_data_sources_connection(
                         declarative_data_source.to_test_request(token=token)
                     )
                 elif declarative_data_source.type == DATABRICKS_TYPE:
-                    if declarative_data_source.client_id is not None:
+                    if declarative_data_source.client_id and declarative_data_source.client_id.strip():
                         client_secret = ClientSecretCredentialsFromFile.client_secret_from_file(
                             credentials[declarative_data_source.id]
                         )

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ def _inject_base(self, credentials: dict[str, Any]) -> DeclarativeDataSources:`
`35`	`35`	`token = TokenCredentialsFromFile.token_from_file(credentials[data_source.id])`
`36`	`36`	`data_sources.append(data_source.to_api(token=token))`
`37`	`37`	`elif data_source.type == DATABRICKS_TYPE:`
`38`		`- if data_source.client_id is not None:`
	`38`	`+ if data_source.client_id and data_source.client_id.strip():`
`39`	`39`	`client_secret = ClientSecretCredentialsFromFile.client_secret_from_file(`
`40`	`40`	`credentials[data_source.id]`
`41`	`41`	`)`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ def test_data_sources_connection(`
`476`	`476`	`declarative_data_source.to_test_request(token=token)`
`477`	`477`	`)`
`478`	`478`	`elif declarative_data_source.type == DATABRICKS_TYPE:`
`479`		`- if declarative_data_source.client_id is not None:`
	`479`	`+ if declarative_data_source.client_id and declarative_data_source.client_id.strip():`
`480`	`480`	`client_secret = ClientSecretCredentialsFromFile.client_secret_from_file(`
`481`	`481`	`credentials[declarative_data_source.id]`
`482`	`482`	`)`