ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

MSAL cache encryption + log improvements (#22335)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-03-16 16:53:16 -07:00
committed by GitHub
parent 931c44ac41
commit 4b02c26a52
19 changed files with 175 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts
View File

@@ -10,6 +10,7 @@ import { IAzureResourceService } from '../interfaces';
import { AzureResourceErrorMessageUtil } from '../utils';
import { ResourceGraphClient } from '@azure/arm-resourcegraph';
import { AzureAccount, azureResource } from 'azurecore';
import { Logger } from '../../utils/Logger';
export abstract class ResourceTreeDataProviderBase<T extends azureResource.AzureResource> implements azureResource.IAzureResourceTreeDataProvider {
public browseConnectionMode: boolean = false;
@@ -32,7 +33,7 @@ export abstract class ResourceTreeDataProviderBase<T extends azureResource.Azure
treeItem: this.getTreeItemForResource(resource, element.account)
}).sort((a, b) => (<any>a.treeItem.label).localeCompare(b.treeItem.label));
} catch (error) {
console.log(AzureResourceErrorMessageUtil.getErrorMessage(error));
Logger.error(AzureResourceErrorMessageUtil.getErrorMessage(error));
throw error;
}
}
@@ -102,7 +103,7 @@ export async function queryGraphResources<T extends GraphData>(resourceClient: R
}
} catch (err2) {
// Just log, we still want to throw the original error if something happens parsing the error
console.log(`Unexpected error while parsing error from querying resources : ${err2}`);
Logger.error(`Unexpected error while parsing error from querying resources : ${err2}`);
}
throw err;
}

17
extensions/azurecore/src/azureResource/services/terminalService.ts
View File

@@ -10,6 +10,7 @@ import * as WS from 'ws';
import { IAzureTerminalService } from '../interfaces';
import { AzureAccount, Tenant } from 'azurecore';
import { Logger } from '../../utils/Logger';
const localize = nls.loadMessageBundle();
@@ -68,8 +69,8 @@ export class AzureTerminalService implements IAzureTerminalService {
let userSettingsResult: AxiosResponse<any>;
try {
userSettingsResult = await axios.get(userSettingsUri, settings);
} catch (ex) {
console.log(ex, ex.response);
} catch (ex) {// Log as info as exception is handled
Logger.info(ex, ex.response);
await handleNeverUsed();
return;
}
@@ -85,8 +86,8 @@ export class AzureTerminalService implements IAzureTerminalService {
let provisionResult: AxiosResponse<any>;
try {
provisionResult = await axios.put(consoleRequestUri, {}, settings);
} catch (ex) {
console.log(ex, ex.response);
} catch (ex) {// Log as info as exception is handled
Logger.info(ex, ex.response);
await handleNeverUsed();
return;
}
@@ -215,7 +216,7 @@ class AzureTerminal implements vscode.Pseudoterminal {
this.socket?.ping();
}, 5000);
} catch (ex) {
console.log(ex);
Logger.error(ex);
}
}
@@ -234,7 +235,7 @@ class AzureTerminal implements vscode.Pseudoterminal {
}
});
} catch (ex) {
console.log(`Error establishing terminal. ${ex}, ${ex.response}`);
Logger.info(`Error establishing terminal. ${ex}, ${ex.response}`);
await handleNeverUsed();
return undefined;
}
@@ -246,8 +247,8 @@ class AzureTerminal implements vscode.Pseudoterminal {
}
if (!terminalUri) {
console.log(terminalResult);
throw new Error(terminalResult.data);
Logger.error(terminalResult);
throw Error(terminalResult.data);
}
return terminalUri;