PR feedback

microsoft · Dec 11, 2024 · d1936d6 · d1936d6
1 parent 47dd35a
commit d1936d6
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/api/src/AzExtResourceType.ts b/api/src/AzExtResourceType.ts
@@ -70,6 +70,7 @@ export enum AzExtResourceType {
     SpringApps = 'SpringApps',
     SqlDatabases = 'SqlDatabases',
     SqlServers = 'SqlServers',
+    Subscription = 'Subscription',
     VirtualMachineScaleSets = 'VirtualMachineScaleSets',
     VirtualNetworks = 'VirtualNetworks',
     WebHostingEnvironments = 'WebHostingEnvironments',

diff --git a/resources/azureIcons/Subscription.svg b/resources/azureIcons/Subscription.svg
diff --git a/src/managedIdentity/ManagedIdentityBranchDataProvider.ts b/src/managedIdentity/ManagedIdentityBranchDataProvider.ts
@@ -43,11 +43,7 @@ export class ManagedIdentityBranchDataProvider extends vscode.Disposable impleme
 
     async getChildren(element: ResourceGroupsItem): Promise<ResourceGroupsItem[] | null | undefined> {
         return (await element.getChildren?.())?.map((child) => {
-            if (child.id) {
-                return ext.azureTreeState.wrapItemInStateHandling(child, () => this.refresh(child))
-            }
-
-            return child;
+            return ext.azureTreeState.wrapItemInStateHandling(child, () => this.refresh(child))
         });
     }
 

diff --git a/src/managedIdentity/RoleDefinitionsItem.ts b/src/managedIdentity/RoleDefinitionsItem.ts
@@ -42,10 +42,19 @@ export class RoleDefinitionsItem implements ResourceGroupsItem {
             iconPath = getIconPath(getAzExtResourceType({ type: parsedAzureResourceId.provider }));
         }
         catch (error) {
-            // if this fails, then it was a resource group ID
-            parsedAzureResourceGroupId = parseAzureResourceGroupId(scope);
-            label = parsedAzureResourceGroupId.resourceGroup;
-            iconPath = getIconPath(AzExtResourceType.ResourceGroup);
+            try {
+                // if it's not a resource, then it's possibly a resource group or subscription
+                parsedAzureResourceGroupId = parseAzureResourceGroupId(scope);
+                label = parsedAzureResourceGroupId.resourceGroup;
+                iconPath = getIconPath(AzExtResourceType.ResourceGroup);
+            } catch (error) {
+                // if it's not a resource group, then it's a subscription
+                const subscriptions = await (await ext.subscriptionProviderFactory()).getSubscriptions(false);
+                const subscriptionId = scope.split('/').pop();
+                label = subscriptions.find(s => s.subscriptionId === subscriptionId)?.name ?? scope;
+                iconPath = getIconPath(AzExtResourceType.Subscription);
+            }
+
         }
 
         if (fromOtherSub) {

diff --git a/src/utils/azureUtils.ts b/src/utils/azureUtils.ts
@@ -101,7 +101,7 @@ const azExtDisplayInfo: Partial<Record<AzExtResourceType, AzExtResourceTypeDispl
     Images: { displayName: localize('images', 'Images') },
     LoadBalancers: { displayName: localize('loadBalancers', 'Load balancers') },
     LogicApp: { displayName: localize('logicApp', 'Logic App') },
-    ManagedIdentityUserAssignedIdentities: { displayName: localize('managedIdentity', 'Managed Identity (Read-Only)') },
+    ManagedIdentityUserAssignedIdentities: { displayName: localize('managedIdentity', 'User Assigned Managed Identities (Read-Only)') },
     MongoClusters: { displayName: localize('mongoclusters', 'Azure Cosmos DB for MongoDB (vCore)') },
     MysqlServers: { displayName: localize('mysqlServers', 'MySql servers') },
     NetworkInterfaces: { displayName: localize('networkInterfaces', 'Network interfaces') },