Skip to content

Commit f49ebcd

Browse files
KSDaemonKSDaemon
committed
remove databrickAcceptPolicy() flow as new OSS driver is Apache 2.0 Lic
1 parent 426a7e1 commit f49ebcd

File tree

4 files changed

+23
-90
lines changed

4 files changed

+23
-90
lines changed

‎packages/cubejs-backend-shared/src/env.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,9 +952,15 @@ const variables: Record<string, (...args: any) => any> = {
952952
* Accept Databricks policy flag. This environment variable doesn't
953953
* need to be split by the data source.
954954
*/
955-
databrickAcceptPolicy: () => (
956-
get('CUBEJS_DB_DATABRICKS_ACCEPT_POLICY').asBoolStrict()
957-
),
955+
databrickAcceptPolicy: () => {
956+
const val = get('CUBEJS_DB_DATABRICKS_ACCEPT_POLICY').asBoolStrict();
957+
958+
if (val !== undefined) {
959+
console.warn(
960+
'The CUBEJS_DB_DATABRICKS_ACCEPT_POLICY is not needed anymore. Please, remove it'
961+
);
962+
}
963+
},
958964

959965
/**
960966
* Databricks jdbc-connection url.

‎packages/cubejs-backend-shared/test/db_env_multi.test.ts‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,34 +1192,6 @@ describe('Multiple datasources', () => {
11921192
);
11931193
});
11941194

1195-
test('getEnv("databrickAcceptPolicy")', () => {
1196-
process.env.CUBEJS_DB_DATABRICKS_ACCEPT_POLICY = 'true';
1197-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'default' })).toEqual(true);
1198-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'postgres' })).toEqual(true);
1199-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'wrong' })).toEqual(true);
1200-
1201-
process.env.CUBEJS_DB_DATABRICKS_ACCEPT_POLICY = 'false';
1202-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'default' })).toEqual(false);
1203-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'postgres' })).toEqual(false);
1204-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'wrong' })).toEqual(false);
1205-
1206-
process.env.CUBEJS_DB_DATABRICKS_ACCEPT_POLICY = 'wrong';
1207-
expect(() => getEnv('databrickAcceptPolicy', { dataSource: 'default' })).toThrow(
1208-
'env-var: "CUBEJS_DB_DATABRICKS_ACCEPT_POLICY" should be either "true", "false", "TRUE", or "FALSE"'
1209-
);
1210-
expect(() => getEnv('databrickAcceptPolicy', { dataSource: 'postgres' })).toThrow(
1211-
'env-var: "CUBEJS_DB_DATABRICKS_ACCEPT_POLICY" should be either "true", "false", "TRUE", or "FALSE"'
1212-
);
1213-
expect(() => getEnv('databrickAcceptPolicy', { dataSource: 'wrong' })).toThrow(
1214-
'env-var: "CUBEJS_DB_DATABRICKS_ACCEPT_POLICY" should be either "true", "false", "TRUE", or "FALSE"'
1215-
);
1216-
1217-
delete process.env.CUBEJS_DB_DATABRICKS_ACCEPT_POLICY;
1218-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'default' })).toBeUndefined();
1219-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'postgres' })).toBeUndefined();
1220-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'wrong' })).toBeUndefined();
1221-
});
1222-
12231195
test('getEnv("athenaAwsKey")', () => {
12241196
process.env.CUBEJS_AWS_KEY = 'default1';
12251197
process.env.CUBEJS_DS_POSTGRES_AWS_KEY = 'postgres1';

‎packages/cubejs-backend-shared/test/db_env_single.test.ts‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -760,34 +760,6 @@ describe('Single datasources', () => {
760760
expect(getEnv('databricksCatalog', { dataSource: 'wrong' })).toBeUndefined();
761761
});
762762

763-
test('getEnv("databrickAcceptPolicy")', () => {
764-
process.env.CUBEJS_DB_DATABRICKS_ACCEPT_POLICY = 'true';
765-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'default' })).toEqual(true);
766-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'postgres' })).toEqual(true);
767-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'wrong' })).toEqual(true);
768-
769-
process.env.CUBEJS_DB_DATABRICKS_ACCEPT_POLICY = 'false';
770-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'default' })).toEqual(false);
771-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'postgres' })).toEqual(false);
772-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'wrong' })).toEqual(false);
773-
774-
process.env.CUBEJS_DB_DATABRICKS_ACCEPT_POLICY = 'wrong';
775-
expect(() => getEnv('databrickAcceptPolicy', { dataSource: 'default' })).toThrow(
776-
'env-var: "CUBEJS_DB_DATABRICKS_ACCEPT_POLICY" should be either "true", "false", "TRUE", or "FALSE"'
777-
);
778-
expect(() => getEnv('databrickAcceptPolicy', { dataSource: 'postgres' })).toThrow(
779-
'env-var: "CUBEJS_DB_DATABRICKS_ACCEPT_POLICY" should be either "true", "false", "TRUE", or "FALSE"'
780-
);
781-
expect(() => getEnv('databrickAcceptPolicy', { dataSource: 'wrong' })).toThrow(
782-
'env-var: "CUBEJS_DB_DATABRICKS_ACCEPT_POLICY" should be either "true", "false", "TRUE", or "FALSE"'
783-
);
784-
785-
delete process.env.CUBEJS_DB_DATABRICKS_ACCEPT_POLICY;
786-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'default' })).toBeUndefined();
787-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'postgres' })).toBeUndefined();
788-
expect(getEnv('databrickAcceptPolicy', { dataSource: 'wrong' })).toBeUndefined();
789-
});
790-
791763
test('getEnv("athenaAwsKey")', () => {
792764
process.env.CUBEJS_AWS_KEY = 'default1';
793765
expect(getEnv('athenaAwsKey', { dataSource: 'default' })).toEqual('default1');

‎packages/cubejs-databricks-jdbc-driver/src/installer.ts‎

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,6 @@ import { downloadAndExtractFile, getEnv } from '@cubejs-backend/shared';
33

44
export const OSS_DRIVER_VERSION = '1.0.2';
55

6-
function acceptedByEnv() {
7-
const acceptStatus = getEnv('databrickAcceptPolicy');
8-
if (acceptStatus) {
9-
console.log('You accepted Terms & Conditions for JDBC driver from DataBricks by CUBEJS_DB_DATABRICKS_ACCEPT_POLICY');
10-
}
11-
12-
if (acceptStatus === false) {
13-
console.log('You declined Terms & Conditions for JDBC driver from DataBricks by CUBEJS_DB_DATABRICKS_ACCEPT_POLICY');
14-
console.log('Installation will be skipped');
15-
}
16-
17-
return acceptStatus;
18-
}
19-
206
/**
217
* In the beginning of 2025 Databricks released their open-source version of JDBC driver and encourage
228
* all users to migrate to it as company plans to focus on improving and evolving it over legacy simba driver.
@@ -25,25 +11,22 @@ function acceptedByEnv() {
2511
* Java Runtime Environment (JRE) 11.0 or above. CI testing is supported on JRE 11, 17, and 21.
2612
*/
2713
export async function downloadJDBCDriver(): Promise<string | null> {
28-
const driverAccepted = acceptedByEnv();
29-
30-
if (driverAccepted) {
31-
console.log(`Downloading databricks-jdbc-${OSS_DRIVER_VERSION}-oss.jar`);
14+
// TODO: Just to throw a console warning that this ENV is obsolete and could be safely removed
15+
getEnv('databrickAcceptPolicy');
3216

33-
await downloadAndExtractFile(
34-
`https://repo1.maven.org/maven2/com/databricks/databricks-jdbc/${OSS_DRIVER_VERSION}-oss/databricks-jdbc-${OSS_DRIVER_VERSION}-oss.jar`,
35-
{
36-
showProgress: true,
37-
cwd: path.resolve(path.join(__dirname, '..', 'download')),
38-
noExtract: true,
39-
dstFileName: `databricks-jdbc-${OSS_DRIVER_VERSION}-oss.jar`,
40-
}
41-
);
17+
console.log(`Downloading databricks-jdbc-${OSS_DRIVER_VERSION}-oss.jar`);
4218

43-
console.log(`Release notes: https://mvnrepository.com/artifact/com.databricks/databricks-jdbc/${OSS_DRIVER_VERSION}-oss`);
19+
await downloadAndExtractFile(
20+
`https://repo1.maven.org/maven2/com/databricks/databricks-jdbc/${OSS_DRIVER_VERSION}-oss/databricks-jdbc-${OSS_DRIVER_VERSION}-oss.jar`,
21+
{
22+
showProgress: true,
23+
cwd: path.resolve(path.join(__dirname, '..', 'download')),
24+
noExtract: true,
25+
dstFileName: `databricks-jdbc-${OSS_DRIVER_VERSION}-oss.jar`,
26+
}
27+
);
4428

45-
return path.resolve(path.join(__dirname, '..', 'download', `databricks-jdbc-${OSS_DRIVER_VERSION}-oss.jar`));
46-
}
29+
console.log(`Release notes: https://mvnrepository.com/artifact/com.databricks/databricks-jdbc/${OSS_DRIVER_VERSION}-oss`);
4730

48-
return null;
31+
return path.resolve(path.join(__dirname, '..', 'download', `databricks-jdbc-${OSS_DRIVER_VERSION}-oss.jar`));
4932
}

0 commit comments

Comments
 (0)