ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix resource group query filter (#23344)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-06-07 11:29:31 -07:00
committed by GitHub
parent 9dcb7e4ee5
commit 346b207f4e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/azurecore/src/azureResource/providers/resourceTreeDataProviderBase.ts
View File

@@ -12,7 +12,7 @@ import { ResourceGraphClient } from '@azure/arm-resourcegraph';
import { AzureAccount, azureResource } from 'azurecore'; import { AzureAccount, azureResource } from 'azurecore';
import { Logger } from '../../utils/Logger'; import { Logger } from '../../utils/Logger';
import { ErrorResponse } from '@azure/arm-resourcegraph/esm/models'; import { ErrorResponse } from '@azure/arm-resourcegraph/esm/models';
import { where } from './queryStringConstants'; import { resourceGroupQuery, where } from './queryStringConstants';
export abstract class ResourceTreeDataProviderBase<S extends GraphData, T extends GraphData> implements azureResource.IAzureResourceTreeDataProvider { export abstract class ResourceTreeDataProviderBase<S extends GraphData, T extends GraphData> implements azureResource.IAzureResourceTreeDataProvider {
public browseConnectionMode: boolean = false; public browseConnectionMode: boolean = false;
@@ -114,7 +114,9 @@ export abstract class ResourceServiceBase<T extends GraphData> implements IAzure
public async getResources(subscriptions: azureResource.AzureResourceSubscription[], credential: msRest.ServiceClientCredentials, account: AzureAccount): Promise<azureResource.AzureResource[]> { public async getResources(subscriptions: azureResource.AzureResourceSubscription[], credential: msRest.ServiceClientCredentials, account: AzureAccount): Promise<azureResource.AzureResource[]> {
const convertedResources: azureResource.AzureResource[] = []; const convertedResources: azureResource.AzureResource[] = [];
const resourceClient = new ResourceGraphClient(credential, { baseUri: account.properties.providerSettings.settings.armResource.endpoint }); const resourceClient = new ResourceGraphClient(credential, { baseUri: account.properties.providerSettings.settings.armResource.endpoint });
const graphResources = await queryGraphResources<T>(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<T>(resourceClient, subscriptions, query);
const ids = new Set<string>(); const ids = new Set<string>();
graphResources.forEach((res) => { graphResources.forEach((res) => {
if (!ids.has(res.id)) { if (!ids.has(res.id)) {
@@ -130,6 +132,3 @@ export abstract class ResourceServiceBase<T extends GraphData> implements IAzure
public abstract convertServerResource(resource: T): azureResource.AzureResource | undefined; public abstract convertServerResource(resource: T): azureResource.AzureResource | undefined;
} }