Skip to content

[PECOBLR-399] Added connection params to DatabricksDriverPropertyUtil #822

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

Merged
saishreeeee merged 5 commits into from
May 26, 2025
Merged

[PECOBLR-399] Added connection params to DatabricksDriverPropertyUtil #822

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
081b486
Added connection params to DatabricksDriverPropertyUtil
saishreeeee May 12, 2025
96f384a
Merge remote-tracking branch 'origin/main' into PECOBLR-399
saishreeeee May 15, 2025
61fb9f3
added connection params
saishreeeee May 15, 2025
78029e0
params in driver property util
saishreeeee May 26, 2025
f66ce95
ssl related properties
saishreeeee May 26, 2025
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
43 changes: 42 additions & 1 deletion src/main/java/com/databricks/jdbc/common/util/DatabricksDriverPropertyUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ public class DatabricksDriverPropertyUtil {
DatabricksJdbcUrlParams.DIRECT_RESULT,
DatabricksJdbcUrlParams.COMPRESSION_FLAG,
DatabricksJdbcUrlParams.LZ4_COMPRESSION_FLAG,
DatabricksJdbcUrlParams.USER_AGENT_ENTRY);
DatabricksJdbcUrlParams.USER_AGENT_ENTRY,
DatabricksJdbcUrlParams.ENABLE_SQL_EXEC_HYBRID_RESULTS,
DatabricksJdbcUrlParams.ENABLE_COMPLEX_DATATYPE_SUPPORT,
DatabricksJdbcUrlParams.ROWS_FETCHED_PER_BLOCK,
DatabricksJdbcUrlParams.DEFAULT_STRING_COLUMN_LENGTH,
DatabricksJdbcUrlParams.SOCKET_TIMEOUT,
DatabricksJdbcUrlParams.ENABLE_TOKEN_CACHE);

public static List<DriverPropertyInfo> getMissingProperties(String url, Properties info)
throws DatabricksParsingException {
Expand Down Expand Up @@ -85,6 +91,31 @@ public static List<DriverPropertyInfo> buildMissingPropertiesList(
addMissingProperty(missingPropertyInfos, connectionContext, LOG_FILE_COUNT, false);
}

if (connectionContext.isPropertyPresent(SSL)) {
addMissingProperty(missingPropertyInfos, connectionContext, SSL_TRUST_STORE, false);
if (connectionContext.getSSLTrustStore() != null
&& !connectionContext.getSSLTrustStore().isEmpty()) {
addMissingProperty(missingPropertyInfos, connectionContext, SSL_TRUST_STORE_TYPE, false);
}
addMissingProperty(missingPropertyInfos, connectionContext, USE_SYSTEM_TRUST_STORE, false);
addMissingProperty(missingPropertyInfos, connectionContext, ALLOW_SELF_SIGNED_CERTS, false);
addMissingProperty(
missingPropertyInfos, connectionContext, CHECK_CERTIFICATE_REVOCATION, false);
if (connectionContext.checkCertificateRevocation()) {
addMissingProperty(
missingPropertyInfos,
connectionContext,
ACCEPT_UNDETERMINED_CERTIFICATE_REVOCATION,
false);
} else if (!connectionContext.isPropertyPresent(CHECK_CERTIFICATE_REVOCATION)) {
addMissingProperty(
missingPropertyInfos,
connectionContext,
ACCEPT_UNDETERMINED_CERTIFICATE_REVOCATION,
false);
}
}

// auth-related properties
AuthMech authMech = connectionContext.getAuthMech();
if (authMech == PAT) {
Expand Down Expand Up @@ -113,6 +144,8 @@ public static List<DriverPropertyInfo> buildMissingPropertiesList(
missingPropertyInfos, connectionContext, GOOGLE_SERVICE_ACCOUNT, true);
addMissingProperty(
missingPropertyInfos, connectionContext, GOOGLE_CREDENTIALS_FILE, true);
} else if (connectionContext.getCloud() == Cloud.AZURE) {
addMissingProperty(missingPropertyInfos, connectionContext, AZURE_TENANT_ID, false);
}
addMissingProperty(missingPropertyInfos, connectionContext, CLIENT_SECRET, true);
addMissingProperty(missingPropertyInfos, connectionContext, CLIENT_ID, true);
Expand All @@ -134,6 +167,14 @@ public static List<DriverPropertyInfo> buildMissingPropertiesList(
addMissingProperty(missingPropertyInfos, connectionContext, CLIENT_ID, false);
addMissingProperty(missingPropertyInfos, connectionContext, CLIENT_SECRET, false);
addMissingProperty(missingPropertyInfos, connectionContext, AUTH_SCOPE, false);
addMissingProperty(
missingPropertyInfos, connectionContext, OAUTH_REDIRECT_URL_PORT, false);
addMissingProperty(missingPropertyInfos, connectionContext, ENABLE_TOKEN_CACHE, false);
if (connectionContext.isPropertyPresent(ENABLE_TOKEN_CACHE)
&& connectionContext.isTokenCacheEnabled()) {
addMissingProperty(
missingPropertyInfos, connectionContext, TOKEN_CACHE_PASS_PHRASE, true);
}
break;

case AZURE_MANAGED_IDENTITIES:
Expand Down
Loading