Add subscription ID to all graph query items (#12133)

* Add subscription ID to all graph query items

* fix machine-learning

extensions/azurecore/src/azureResource/azure-resource.d.ts

@@ -24,6 +24,7 @@ declare module 'azureResource' {
 		export interface AzureResource {
 			name: string;
 			id: string;
+			subscriptionId: string;
 			tenant?: string;
 		}
 

extensions/azurecore/src/azureResource/providers/database/databaseService.ts

@@ -51,6 +51,7 @@ export class AzureResourceDatabaseService implements IAzureResourceService<azure
 						serverName: server.name,
 						serverFullName: server.properties.fullyQualifiedDomainName,
 						loginName: server.properties.administratorLogin,
+						subscriptionId: db.subscriptionId,
 						tenant: db.tenantId
 					});
 				}

extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerService.ts

@@ -30,6 +30,7 @@ export class AzureResourceDatabaseServerService extends ResourceServiceBase<DbSe
 			fullName: resource.properties.fullyQualifiedDomainName,
 			loginName: resource.properties.administratorLogin,
 			defaultDatabaseName: 'master',
+			subscriptionId: resource.subscriptionId,
 			tenant: resource.tenantId
 		};
 	}

extensions/azurecore/src/azureResource/providers/kusto/kustoService.ts

@@ -28,7 +28,9 @@ export class KustoResourceService extends ResourceServiceBase<KustoGraphData, az
 			name: resource.name,
 			fullName: resource.properties.uri.replace('https://', ''),
 			loginName: '',
-			defaultDatabaseName: ''
+			defaultDatabaseName: '',
+			subscriptionId: resource.subscriptionId,
+			tenant: resource.tenantId
 		};
 	}
 }

extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerService.ts

@@ -27,6 +27,7 @@ export class PostgresServerArcService extends ResourceServiceBase<PostgresArcSer
 			fullName: resource.name,
 			loginName: resource.properties.admin,
 			defaultDatabaseName: 'postgres',
+			subscriptionId: resource.subscriptionId,
 			tenant: resource.tenantId
 		};
 	}

extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerService.ts

@@ -30,6 +30,7 @@ export class PostgresServerService extends ResourceServiceBase<DbServerGraphData
 			fullName: resource.properties.fullyQualifiedDomainName,
 			loginName: resource.properties.administratorLogin,
 			defaultDatabaseName: 'postgres',
+			subscriptionId: resource.subscriptionId,
 			tenant: resource.tenantId
 		};
 	}

extensions/azurecore/src/azureResource/providers/resourceGroup/resourceGroupService.ts

@@ -16,7 +16,9 @@ export class AzureResourceGroupService extends ResourceServiceBase<DbServerGraph
 	protected convertResource(resource: DbServerGraphData): azureResource.AzureResourceResourceGroup {
 		return {
 			id: resource.id,
-			name: resource.name
+			name: resource.name,
+			subscriptionId: resource.subscriptionId,
+			tenant: resource.tenantId
 		};
 	}
 }

extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts

@@ -54,6 +54,7 @@ export abstract class ResourceTreeDataProviderBase<T extends azureResource.Azure
 }
 
 export interface GraphData {
+	subscriptionId: string,
 	tenantId: string;
 	id: string;
 	name: string;

extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceService.ts

@@ -28,6 +28,7 @@ export class SqlInstanceResourceService extends ResourceServiceBase<SqlInstanceG
 			fullName: resource.properties.fullyQualifiedDomainName,
 			loginName: resource.properties.administratorLogin,
 			defaultDatabaseName: 'master',
+			subscriptionId: resource.subscriptionId,
 			tenant: resource.tenantId
 		};
 	}

extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcService.ts

@@ -27,6 +27,7 @@ export class SqlInstanceArcResourceService extends ResourceServiceBase<SqlInstan
 			fullName: resource.name,
 			loginName: resource.properties.admin,
 			defaultDatabaseName: 'master',
+			subscriptionId: resource.subscriptionId,
 			tenant: resource.tenantId
 		};
 	}

extensions/azurecore/src/azureResource/services/subscriptionService.ts

@@ -18,6 +18,7 @@ export class AzureResourceSubscriptionService implements IAzureResourceSubscript
 		subs.forEach((sub) => subscriptions.push({
 			id: sub.subscriptionId,
 			name: sub.displayName,
+			subscriptionId: sub.subscriptionId,
 			tenant: tenantId
 		}));