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

Update error for ignored tenants (#22881)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-04-28 16:19:29 -07:00
committed by GitHub
parent 29ff6ca16c
commit ed8149599c
9 changed files with 112 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/azurecore/src/azureResource/tree/accountTreeNode.ts
View File

@@ -20,6 +20,7 @@ import { AzureResourceErrorMessageUtil } from '../utils';
import { IAzureResourceTreeChangeHandler } from './treeChangeHandler';
import { IAzureResourceSubscriptionService, IAzureResourceSubscriptionFilterService } from '../../azureResource/interfaces';
import { AzureAccount, azureResource } from 'azurecore';
import { TenantIgnoredError } from '../../utils/TenantIgnoredError';
export class AzureResourceAccountTreeNode extends AzureResourceContainerTreeNodeBase {
public constructor(
@@ -75,10 +76,14 @@ export class AzureResourceAccountTreeNode extends AzureResourceContainerTreeNode
try {
token = await azdata.accounts.getAccountSecurityToken(this.account, s.tenant!, azdata.AzureResource.ResourceManagement);
} catch (err) {
errMsg = AzureResourceErrorMessageUtil.getErrorMessage(err);
if (!(err instanceof TenantIgnoredError)) {
errMsg = AzureResourceErrorMessageUtil.getErrorMessage(err);
}
}
if (!token) {
void vscode.window.showWarningMessage(localize('azure.unableToAccessSubscription', "Unable to access subscription {0} ({1}). Please [refresh the account](command:azure.resource.signin) to try again. {2}", s.name, s.id, errMsg));
if (errMsg !== '') {
void vscode.window.showWarningMessage(localize('azure.unableToAccessSubscription', "Unable to access subscription {0} ({1}). Please [refresh the account](command:azure.resource.signin) to try again. {2}", s.name, s.id, errMsg));
}
return false;
}
return true;

8
extensions/azurecore/src/azureResource/tree/flatAccountTreeNode.ts
View File

@@ -187,8 +187,12 @@ class FlatAccountTreeNodeLoader {
let tenants = this._account.properties.tenants;
// Filter out tenants that we can't authenticate to.
tenants = tenants.filter(async tenant => {
const token = await azdata.accounts.getAccountSecurityToken(this._account, tenant.id, azdata.AzureResource.ResourceManagement);
return token !== undefined;
try {
const token = await azdata.accounts.getAccountSecurityToken(this._account, tenant.id, azdata.AzureResource.ResourceManagement);
return token !== undefined;
} catch (e) {
return false;
}
});
let subscriptions: azureResource.AzureResourceSubscription[] = (await getSubscriptionInfo(this._account, this._subscriptionService, this._subscriptionFilterService)).subscriptions;