[FIXUP] stricter types around config

Author: mcheshkov

packages/cubejs-clickhouse-driver/src/ClickHouseDriver.ts

@@ -69,7 +69,7 @@ export interface ClickHouseDriverOptions {
   database?: string,
   readOnly?: boolean,
   // TODO how to treat this in a BC way?
-  queryOptions?: object,
+  // queryOptions?: object,
 
   /**
    * Data source name.
@@ -95,13 +95,25 @@ interface ClickhouseDriverExportRequiredAWS {
 }
 
 interface ClickhouseDriverExportKeySecretAWS extends ClickhouseDriverExportRequiredAWS {
-  keyId?: string,
-  secretKey?: string,
+  keyId: string,
+  secretKey: string,
 }
 
 interface ClickhouseDriverExportAWS extends ClickhouseDriverExportKeySecretAWS {
 }
 
+type ClickHouseDriverConfig = {
+  url: string,
+  username: string,
+  password: string,
+  readOnly: boolean,
+  // TODO why separate object?
+  queryOptions: {
+    database: string,
+  },
+  exportBucket: ClickhouseDriverExportAWS | null,
+};
+
 export class ClickHouseDriver extends BaseDriver implements DriverInterface {
   /**
    * Returns default concurrency value.
@@ -116,7 +128,7 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
 
   protected readonly readOnlyMode: boolean;
 
-  protected readonly config: any;
+  protected readonly config: ClickHouseDriverConfig;
 
   /**
    * Class constructor.
@@ -146,6 +158,9 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
 
     const username = getEnv('dbUser', { dataSource });
     const password = getEnv('dbPass', { dataSource });
+    const database = (getEnv('dbName', { dataSource }) as string) ||
+      config && config.database ||
+      'default';
     this.config = {
       // host: getEnv('dbHost', { dataSource }),
       // port: getEnv('dbPort', { dataSource }),
@@ -163,12 +178,10 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
       password,
       // protocol: getEnv('dbSsl', { dataSource }) ? 'https:' : 'http:',
       queryOptions: {
-        database:
-          getEnv('dbName', { dataSource }) ||
-          config && config.database ||
-          'default'
+        database,
       },
       exportBucket: this.getExportBucket(dataSource),
+      readOnly: !!config.readOnly,
       ...config
     };
 
@@ -581,7 +594,7 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
 
   protected getExportBucket(
     dataSource: string,
-  ): ClickhouseDriverExportAWS | undefined {
+  ): ClickhouseDriverExportAWS | null {
     const supportedBucketTypes = ['s3'];
 
     const requiredExportBucket: ClickhouseDriverExportRequiredAWS = {
@@ -593,7 +606,7 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
       region: getEnv('dbExportBucketAwsRegion', { dataSource }),
     };
 
-    const exportBucket: Partial<ClickhouseDriverExportAWS> = {
+    const exportBucket: ClickhouseDriverExportAWS = {
       ...requiredExportBucket,
       keyId: getEnv('dbExportBucketAwsKey', { dataSource }),
       secretKey: getEnv('dbExportBucketAwsSecret', { dataSource }),
@@ -615,10 +628,10 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
         );
       }
 
-      return exportBucket as ClickhouseDriverExportAWS;
+      return exportBucket;
     }
 
-    return undefined;
+    return null;
   }
 
   public async isUnloadSupported() {