Add Tenants view #869

motm32 · 2024-06-03T23:10:54Z

Completes #849

Here is how the view will look:

Detailed changes

Related to accounts:

This view will contain information related to accounts and tenants associated with those accounts. With this we also allow support users being signed into multiple accounts
If the user is not signed into any azure account the Tenants view will include a "Sign in" button similar to the Resources view.
With Multi-Account support there is the possibility that duplicate subscriptions can show up if the same subscription belongs to multiple tenants. In this case we will add in the description of the subscription item in the resources view the associated tenant so users know which tenant they are making changes under. This will look like this

Related to tenants:

Checking and unchecking tenants within the view will update the subscriptions shown in the Resources view and the subscription filter. Along with this if the checked tenants or if no tenants match any subscriptions then by default all subscriptions will be shown.
If a tenant needs further authentication the tenant will default to being unchecked and a button will appear if a user hovers over the unauthenticated tenants which users can press to authenticate the tenant. Users can also right click on the unauthenticated tenant and click Sign in to Tenant. Finally if users check an unauthenticated tenant they will automatically be prompted to sign into that tenant.

To do:

Changes to the Sign out of Azure code so the tenants view also gets refreshed
Integrate VSCode api changes to getsessions() once they are released
Add multi-account support

package.json

src/commands/registerCommands.ts

src/tree/tenants/TenantResourceTreeDataProvider.ts

alexweininger · 2024-08-29T13:30:49Z

Note for later: lets update the people in this issue once this is merged - microsoft/vscode-azure-account#901

motm32 · 2024-09-03T16:10:53Z

Also just a note for reviewing. This includes a lot of code at the moment that is from the auth tools package for testing purposes. I will remove that code once we are closer to being done.

vscode.proposed.authGetSessions.d.ts

src/commands/accounts/getSessionFromVSCode.ts

api/src/index.ts

alexweininger · 2024-09-05T20:47:32Z

src/utils/getResourceContributions.ts

Similar comment on this file: if we don't want to expose the tenants view on the api, I don't think we need this.

alexweininger · 2024-09-05T20:52:16Z

src/tree/tenants/registerTenantTree.ts

If we're not using them and it's easy to remove, I think we should remove the branch data item cache and tree item state store from the tenants tree.

I can remove it because I don't think I am using it but createTreeView requires an itemCache. I could maybe modify that or use something else but that makes that a little tricky to remove.

The item state store should be easy to remove so I will go ahead and do that.

alexweininger · 2024-09-05T22:33:43Z

src/api/ResourceGroupsExtensionManager.ts

+
+    async activateTenantResourceBranchDataProvider(type: string): Promise<void> {
+        const extensionAndContributions =
+            getInactiveExtensions()
+                .map(extension => ({ extension, contributions: getResourceContributions(extension)?.tenant?.branches?.map(resources => resources.type) ?? [] }))
+                .find(extensionAndContributions => extensionAndContributions.contributions.find(contribution => contribution === type) !== undefined);
+        if (extensionAndContributions) {
+            await extensionAndContributions.extension.activate();
+        }
+    }
+
+    async activateTenantResourceProviders(): Promise<void> {
+        const inactiveResourceContributors =
+            getInactiveExtensions()
+                .filter(extension => getResourceContributions(extension)?.tenant?.resources);
+
+        await Promise.all(inactiveResourceContributors.map(extension => extension.activate()));
+    }
 }


Again I really hope this isn't needed if we don't include the tenants view in the API

alexweininger · 2024-09-05T22:34:21Z

src/commands/accounts/selectSubscriptions.ts

@@ -19,6 +19,17 @@ export async function selectSubscriptions(context: IActionContext): Promise<void

            const allSubscriptions = await provider.getSubscriptions(false);

+            const tenantFiltedSubcriptions = getTenantFilteredSubscriptions(allSubscriptions);


Spellcheck :)

alexweininger · 2024-09-05T22:44:45Z

src/commands/accounts/selectSubscriptions.ts

@@ -19,6 +19,17 @@ export async function selectSubscriptions(context: IActionContext): Promise<void

            const allSubscriptions = await provider.getSubscriptions(false);



Can we add a comment explaining what the intended behavior is here?

In what cases do we fall back and display all subscriptions?

The intended behavior is that if no tenants are selected we would default to showing all subscriptions regardless of the tenant. At first I had it so that no subs would show but that seemed very weird to me. Not sure if you have a different opinion on that.

I'll add a comment explaining that otherwise.

That makes sense. I didn't want it changed, just clarify it with a comment.

alexweininger · 2024-09-05T22:49:47Z

src/commands/accounts/selectSubscriptions.ts

@@ -73,3 +84,15 @@ export async function getSelectedTenantAndSubscriptionIds(): Promise<string[]> {
 async function setSelectedTenantAndSubscriptionIds(tenantAndSubscriptionIds: string[]): Promise<void> {
    await settingUtils.updateGlobalSetting('selectedSubscriptions', tenantAndSubscriptionIds);
 }
+
+export function getTenantFilteredSubscriptions(allSubscriptions: AzureSubscription[]): AzureSubscription[] | undefined {


I understand what this function is doing, and why it returns undefined instead an empty array. I would either refactor or make it more clear that this actually matters later on in the UI logic.

I wouldn't want someone to refactor this based on the function name and then mess things up.

package.json

alexweininger · 2024-09-06T13:55:30Z

src/tree/azure/grouping/GroupingItem.ts

@@ -56,7 +56,7 @@ export class GroupingItem implements ResourceGroupsItem {
        } : undefined;

        if (this.context?.subscription) {
-            this.id = `/subscriptions/${this.context?.subscriptionContext.subscriptionId}/groupings/${this.label}`;
+            this.id = `/subscriptions/${this.context?.subscriptionContext.subscriptionId}/account/${this.context?.subscription.account?.id}/groupings/${this.label}`;


Have we tested reveal to make sure it still works with this change?

I have not tested it but I am pretty sure based on discussions with Nathan it would break things. I'll test it out and see.

Ok, we'll need to sort that out before merging. I can help with that too

Just tested it out by creating a storage account and clicking "click to view resource" in the activity log and nothing happened so seems to be broken. Before releasing this we definitely want to fix that.

src/tree/tenants/TenantResourceTreeDataProvider.ts

alexweininger · 2024-09-10T18:57:17Z

src/tree/tenants/TenantResourceTreeDataProvider.ts

+                const accounts = await vscode.authentication.getAccounts(getConfiguredAuthProviderId());
+                for (const account of accounts) {
+                    const session = await vscode.authentication.getSession(getConfiguredAuthProviderId(), getScopes(undefined), { account: account });
+                    const tenants = await this.getTenants(session);


See https://github.com/microsoft/vscode-azuretools/pull/1789/files#r1752557190

slavizh · 2024-11-26T07:44:22Z

One comment. Make sure it supports Lighthouse. With Lighthouse you can view the same subscriptions under different tenants. Currently it works the halfway as you can see the subscriptions twice but you can only select the same subscription once to be displayed otherwise you will get error. Also currently of course you do not know which subscription selected is under which tenant.

motm32 · 2024-11-26T20:36:43Z

One comment. Make sure it supports Lighthouse. With Lighthouse you can view the same subscriptions under different tenants. Currently it works the halfway as you can see the subscriptions twice but you can only select the same subscription once to be displayed otherwise you will get error. Also currently of course you do not know which subscription selected is under which tenant.

Hi @slavizh thanks for pointing this out! Most of these issues should be resolved by some updates we have made recently. Before we plan to release if you would like we could send you a custom build so you can try the tenants view with Lighthouse 😊

alexweininger · 2024-11-27T00:58:31Z

src/commands/accounts/selectSubscriptions.ts

+
+// This function is also used to filter subscription tree items in AzureResourceTreeDataProvider
+export function getTenantFilteredSubscriptions(allSubscriptions: AzureSubscription[]): AzureSubscription[] | undefined {
+    const tenants = ext.context.globalState.get<string[]>('unselectedTenants');


Somewhere we should store this string as a constant.

slavizh · 2024-11-27T06:49:06Z

@motm32 Yeah, no problem I will do some tests to verify.

motm32 added 3 commits May 22, 2024 09:50

initial commit

a516192

changes

54fe554

rename and small changes

24c6878

bwateratmsft reviewed Jun 4, 2024

View reviewed changes

package.json Show resolved Hide resolved

src/commands/registerCommands.ts Show resolved Hide resolved

src/tree/tenants/TenantResourceTreeDataProvider.ts Outdated Show resolved Hide resolved

motm32 added 3 commits July 9, 2024 13:52

add new auth

ec2ca42

fix bugs and add support for sovereign clouds

0ecbfb0

fix bugs

a03dbf5

alexweininger mentioned this pull request Aug 20, 2024

Azure resources not updating after signing into another account #902

Closed

add another refresh

720fb6d

motm32 added 2 commits August 29, 2024 13:46

merge main

009a943

merge conflict fix

84257f3

motm32 marked this pull request as ready for review August 29, 2024 20:51

motm32 requested a review from a team as a code owner August 29, 2024 20:51

alexweininger reviewed Sep 4, 2024

View reviewed changes

vscode.proposed.authGetSessions.d.ts Outdated Show resolved Hide resolved

src/commands/accounts/getSessionFromVSCode.ts Outdated Show resolved Hide resolved

alexweininger reviewed Sep 4, 2024

View reviewed changes

api/src/index.ts Outdated Show resolved Hide resolved

alexweininger reviewed Sep 6, 2024

View reviewed changes

motm32 mentioned this pull request Sep 9, 2024

auth: Add changes to be compatible with the new tenant view microsoft/vscode-azuretools#1789

Merged

alexweininger reviewed Sep 10, 2024

View reviewed changes

motm32 added 3 commits September 12, 2024 10:40

removed tools files and other requested changes

418d488

merge main

93bd450

change

c7d09a3

This was referenced Sep 18, 2024

I don't see all my subsciptions in plugin #925

Open

Azure Extension in VS Code does not allow switching tenants. #928

Open

alexweininger mentioned this pull request Nov 26, 2024

VSCode Azure Workspace never switch between Tenant microsoft/azcode#67

Open

alexweininger reviewed Nov 27, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Tenants view #869

Add Tenants view #869

motm32 commented Jun 3, 2024 •

edited

Loading

alexweininger commented Aug 29, 2024

motm32 commented Sep 3, 2024

alexweininger Sep 5, 2024

alexweininger Sep 5, 2024

motm32 Sep 9, 2024

alexweininger Sep 5, 2024

alexweininger Sep 5, 2024

alexweininger Sep 5, 2024

motm32 Sep 9, 2024

alexweininger Sep 9, 2024

alexweininger Sep 5, 2024

alexweininger Sep 6, 2024

motm32 Sep 9, 2024

alexweininger Sep 9, 2024

motm32 Sep 9, 2024

alexweininger Sep 10, 2024

slavizh commented Nov 26, 2024

motm32 commented Nov 26, 2024

alexweininger Nov 27, 2024

slavizh commented Nov 27, 2024

		@@ -19,6 +19,17 @@ export async function selectSubscriptions(context: IActionContext): Promise<void

		const allSubscriptions = await provider.getSubscriptions(false);

		const tenantFiltedSubcriptions = getTenantFilteredSubscriptions(allSubscriptions);

Add Tenants view #869

Are you sure you want to change the base?

Add Tenants view #869

Conversation

motm32 commented Jun 3, 2024 • edited Loading

alexweininger commented Aug 29, 2024

motm32 commented Sep 3, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

slavizh commented Nov 26, 2024

motm32 commented Nov 26, 2024

Choose a reason for hiding this comment

slavizh commented Nov 27, 2024

motm32 commented Jun 3, 2024 •

edited

Loading