From 346b207f4ed214436a1c7c87b4cf8e930b067440 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com> Date: Wed, 7 Jun 2023 11:29:31 -0700 Subject: [PATCH] Fix resource group query filter (#23344) --- .../providers/resourceTreeDataProviderBase.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts b/extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts index 6f8a1039f2..786502b1bb 100644 --- a/extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts +++ b/extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts @@ -12,7 +12,7 @@ import { ResourceGraphClient } from '@azure/arm-resourcegraph'; import { AzureAccount, azureResource } from 'azurecore'; import { Logger } from '../../utils/Logger'; import { ErrorResponse } from '@azure/arm-resourcegraph/esm/models'; -import { where } from './queryStringConstants'; +import { resourceGroupQuery, where } from './queryStringConstants'; export abstract class ResourceTreeDataProviderBase implements azureResource.IAzureResourceTreeDataProvider { public browseConnectionMode: boolean = false; @@ -114,7 +114,9 @@ export abstract class ResourceServiceBase implements IAzure public async getResources(subscriptions: azureResource.AzureResourceSubscription[], credential: msRest.ServiceClientCredentials, account: AzureAccount): Promise { const convertedResources: azureResource.AzureResource[] = []; const resourceClient = new ResourceGraphClient(credential, { baseUri: account.properties.providerSettings.settings.armResource.endpoint }); - const graphResources = await queryGraphResources(resourceClient, subscriptions, where + this.queryFilter); + // Resource Group query filter uses a custom format, so we use it as it is. + const query = (this.queryFilter === resourceGroupQuery) ? this.queryFilter : where + this.queryFilter; + const graphResources = await queryGraphResources(resourceClient, subscriptions, query); const ids = new Set(); graphResources.forEach((res) => { if (!ids.has(res.id)) { @@ -130,6 +132,3 @@ export abstract class ResourceServiceBase implements IAzure public abstract convertServerResource(resource: T): azureResource.AzureResource | undefined; } - - -