fix some notes after review

Author: KSDaemon

packages/cubejs-backend-shared/src/http-utils.ts

@@ -66,11 +66,11 @@ export async function streamWithProgress(
 type DownloadAndExtractFile = {
   showProgress: boolean;
   cwd: string;
-  noExtract?: boolean;
+  skipExtract?: boolean;
   dstFileName?: string;
 };
 
-export async function downloadAndExtractFile(url: string, { cwd, noExtract, dstFileName }: DownloadAndExtractFile) {
+export async function downloadAndExtractFile(url: string, { cwd, skipExtract, dstFileName }: DownloadAndExtractFile) {
   const request = new Request(url, {
     headers: new Headers({
       'Content-Type': 'application/octet-stream',
@@ -101,11 +101,14 @@ export async function downloadAndExtractFile(url: string, { cwd, noExtract, dstF
     });
   });
 
-  if (noExtract) {
+  if (skipExtract) {
     if (dstFileName) {
       fs.copyFileSync(savedFilePath, path.resolve(path.join(cwd, dstFileName)));
     } else {
-      fs.copyFileSync(savedFilePath, cwd);
+      // We still need some name for a file
+      const tmpFileName = path.basename(savedFilePath);
+      const destPath = path.join(cwd, tmpFileName);
+      fs.copyFileSync(savedFilePath, destPath);
     }
   } else {
     await decompress(savedFilePath, cwd);

packages/cubejs-databricks-jdbc-driver/src/helpers.ts

@@ -36,9 +36,9 @@ export async function resolveJDBCDriver(): Promise<string> {
  * Extract if exist UID and PWD from URL and return UID, PWD and URL without these params
  * @param jdbcUrl
  */
-export function extractAndRemoveUidPwdFromJdbcUrl(jdbcUrl: string): [string, string, string] {
-  const uidMatch = jdbcUrl.match(/UID=([^;]*)/);
-  const pwdMatch = jdbcUrl.match(/PWD=([^;]*)/);
+export function extractAndRemoveUidPwdFromJdbcUrl(jdbcUrl: string): [uid: string, pwd: string, cleanedUrl: string] {
+  const uidMatch = jdbcUrl.match(/UID=([^;]*)/i);
+  const pwdMatch = jdbcUrl.match(/PWD=([^;]*)/i);
 
   const uid = uidMatch?.[1] || 'token';
   const pwd = pwdMatch?.[1] || '';

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

@@ -21,7 +21,7 @@ export async function downloadJDBCDriver(): Promise<string | null> {
     {
       showProgress: true,
       cwd: path.resolve(path.join(__dirname, '..', 'download')),
-      noExtract: true,
+      skipExtract: true,
       dstFileName: `databricks-jdbc-${OSS_DRIVER_VERSION}-oss.jar`,
     }
   );