fix defect

Author: onlyjackfrost

packages/extension-driver-canner/src/lib/cannerAdapter.ts

@@ -36,14 +36,18 @@ export class CannerAdapter {
     headers?: Record<string, string>
   ): Promise<string[]> {
     this.logger.debug(`Create async request to Canner.`);
-    let data = await this.getWorkspaceRequestData('post', '/v2/async-queries', {
-      data: {
-        sql,
-        timeout: 600,
-        noLimit: true,
+    let data = await this.getWorkspaceRequestData(
+      'post',
+      '/v2/async-queries',
+      {
+        data: {
+          sql,
+          timeout: 600,
+          noLimit: true,
+        },
       },
-      headers,
-    });
+      headers
+    );
 
     const { id: requestId } = data;
     this.logger.debug(`Wait Async request to finished.`);
@@ -70,10 +74,7 @@ export class CannerAdapter {
     await this.prepare();
     try {
       const response = await axios({
-        headers: {
-          ...headers,
-          Authorization: `Token ${this.PAT}`,
-        },
+        headers: { ...headers, Authorization: `Token ${this.PAT}` },
         params: {
           workspaceSqlName: this.workspaceSqlName,
         },
@@ -84,7 +85,9 @@ export class CannerAdapter {
       return response.data;
     } catch (error: any) {
       const message = error.response
-        ? `response status: ${error.response.status}, response data: ${error.response.data}`
+        ? `response status: ${
+            error.response.status
+          }, response data: ${JSON.stringify(error.response.data)}`
         : `remote server does not response. request ${error.toJSON()}}`;
       throw new InternalError(
         `Failed to get workspace request "${urlPath}" data, ${message}`

packages/extension-driver-canner/src/lib/cannerDataSource.ts

@@ -62,7 +62,7 @@ export class CannerDataSource extends DataSource<any, PGOptions> {
     sql,
     directory,
     profileName,
-    options: cannerpOtions,
+    options: cannerOptions,
   }: ExportOptions): Promise<void> {
     if (!this.poolMapping.has(profileName)) {
       throw new InternalError(`Profile instance ${profileName} not found`);
@@ -76,7 +76,7 @@ export class CannerDataSource extends DataSource<any, PGOptions> {
     const cannerAdapter = new CannerAdapter(connection);
     try {
       this.logger.debug('Send the async query to the Canner Enterprise');
-      const header = this.getCannerRequestHeader(properties, cannerpOtions);
+      const header = this.getCannerRequestHeader(properties, cannerOptions);
       const presignedUrls = await cannerAdapter.createAsyncQueryResultUrls(
         sql,
         header
@@ -96,7 +96,7 @@ export class CannerDataSource extends DataSource<any, PGOptions> {
     cannerOptions?: any
   ) {
     const header: Record<string, string> = {};
-    const { userId } = cannerOptions;
+    const userId = cannerOptions?.userId;
     const rootUserId = properties?.['rootUserId'];
     if (userId && rootUserId) {
       header[

packages/extension-driver-canner/test/cannerDataSource.spec.ts

@@ -55,6 +55,7 @@ it('Data source should export successfully', async () => {
       sql: 'select 1',
       directory,
       profileName: 'profile1',
+      options: {},
     } as ExportOptions)
   ).resolves.not.toThrow();
   expect(fs.readdirSync(directory).length).toBe(1);
@@ -86,6 +87,7 @@ it('Data source should throw error when fail to export data', async () => {
       sql: 'select 1',
       directory,
       profileName: 'profile1',
+      options: {},
     } as ExportOptions)
   ).rejects.toThrow();
   expect(fs.readdirSync(directory).length).toBe(0);
@@ -105,6 +107,7 @@ it('Data source should throw error when given directory is not exist', async ()
       sql: 'select 1',
       directory: directory,
       profileName: 'profile1',
+      options: {},
     } as ExportOptions)
   ).rejects.toThrow();
 }, 100000);
@@ -121,6 +124,7 @@ it('Data source should throw error when given profile name is not exist', async
       sql: 'select 1',
       directory,
       profileName: 'profile not exist',
+      options: {},
     } as ExportOptions)
   ).rejects.toThrow();
 }, 100000);

packages/extension-driver-canner/test/cannerServer.ts

@@ -20,6 +20,7 @@ export class CannerServer {
         database: process.env['CANNER_WORKSPACE_SQL_NAME'],
       } as PGOptions,
       allow: '*',
+      properties: {},
     };
   }
 }

packages/extension-store-canner/src/test/cannerProfileReader.spec.ts

@@ -98,6 +98,7 @@ describe('Test CannerProfileReader', () => {
 
       sinon.default.stub(configModule, 'getEnvConfig').returns({
         storage: sinon.stubInterface<configModule.StorageServiceOptions>(),
+        properties: {},
         profile: {
           host,
           password,
@@ -164,6 +165,7 @@ describe('Test CannerProfileReader', () => {
 
     sinon.default.stub(configModule, 'getEnvConfig').returns({
       storage: sinon.stubInterface<configModule.StorageServiceOptions>(),
+      properties: {},
       profile: {
         ...connectionInfo,
       },